From nobody Mon Feb 16 00:24: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 4fDk6K39S7z6RkBq for ; Mon, 16 Feb 2026 00:24: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDk6K1XhGz3kVk for ; Mon, 16 Feb 2026 00:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771201449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlhOG5nv1qibdUGF6CHHnrRONpXj7ItqBqmefga3HVQ=; b=fbEuxxmzgLKsVrlDoLbQ6IRAp+7mQk6vnrxGt3vDXhRtzKVKuqWDjNOoW+0vWXHOBizZqV LL7dy0x5s4XF32lfg0Mwz9p0YFqDX4cCrxOs/ltkd+Dh37ogoeUDiNGT2g7FWyds04Oybn QjC+FQMzVA4ei80xJCy0vnQmg3q/+cUtPAK/MIqcq6mokFoWtyU83hxKRIYIzzmFXfHh7q Q8cZGiCdiui54WjMPEzlf1IJxxOj1hItEpmCDVdU7lz10GvLtLlsxnFbS5oV5oPemFwZxa Eee7iiiz/s4NwHJiUe4YzU9ySYLxCSFWRJC6bSyTLXmGxM2fd6q/Owjr1eJ33g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771201449; a=rsa-sha256; cv=none; b=gPAPfIDJDeSGg+JZwB8nL5DiiGhBjrp82NUvBCMtMUIk97xe0J+sIsPnXaY0LKDgT5nmg3 te0WcmG4VFCnshsuzaF6rJCY5JgVC25uTuMgWeQLx7sKw4cGdoUwsmwPvn1hHs0PrRHSZ6 gXMFiaTjR5ITzc3OwOvIuboJyEd5p5sFFtqLpSrWGtwJXptAAFRJ1VrbYi/imFiHvmCO0q RbL/dONxg37NMXjApVl1TO4zWaGLA0Gz+5U96xhwziQ2s546/e+u7eRAMOtO0vyhRgZZ2s cvEXRfoUaXjs7lTmvtZtVUlw8prF2xYBCzswJYjGHzEIYR3homg4LfU3HMrc1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771201449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlhOG5nv1qibdUGF6CHHnrRONpXj7ItqBqmefga3HVQ=; b=UWJNfkCIO7ZSo58xZiID4I79DJ/w8uAh0eaN7iWZHyteRb92XX+X9sNW22fNugoFTlFMq1 HR/Q5nsNvcpH9R68TFGVmV8XNBl2K7nkoKt1YpMgzQT/OnkeCcPIu8lUWPWElDo5eQlNMN boIYxj+wY77rZYwzwO0+EbzcS9stRVyBRpxii111Ttd+pnAi0t1pBb+9uRKAJomxUMsxS8 iXrFoyuWKTpVVgOeObmhNCjxd0KN9O2D54OqyqKWuvN/WBpLC4DlWG6QPsmfSCi6hxJP5Z eBdU9Rq6oigAvLJzzpojOVDjmpoep+A1hGOSjFXiaBXgAPsqINn44+tbmF+cRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDk6K15Ycz1Fqw for ; Mon, 16 Feb 2026 00:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3701d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 00:24:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 817f0b88ff3f - stable/15 - newsyslog.conf.5: Add a CAVEAT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 817f0b88ff3f03d580e187d2c5910c21c88c33c9 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 00:24:09 +0000 Message-Id: <699263a9.3701d.2a7abfaa@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=817f0b88ff3f03d580e187d2c5910c21c88c33c9 commit 817f0b88ff3f03d580e187d2c5910c21c88c33c9 Author: Alexander Ziaee AuthorDate: 2026-02-12 14:14:47 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-16 00:23:30 +0000 newsyslog.conf.5: Add a CAVEAT PR: 282639 MFC after: 3 days Reviewed by: michaelo Differential Revision: https://reviews.freebsd.org/D55122 (cherry picked from commit 64e612b46290617ec753b4ee6ec633a3724940e3) --- usr.sbin/newsyslog/newsyslog.conf.5 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index d94c39332597..a6c0e75b209d 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -18,7 +18,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd September 1, 2025 +.Dd February 4, 2026 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -497,3 +497,6 @@ entry: .Sh HISTORY This manual page first appeared in .Fx 4.10 . +.Sh CAVEATS +If a line is specified multiple times, +the file will be rotated multiple times. From nobody Mon Feb 16 00:52: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 4fDkkZ4X9nz6RmT7 for ; Mon, 16 Feb 2026 00:52: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDkkZ2Knyz3my5 for ; Mon, 16 Feb 2026 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771203126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqCECwy/ChsHdOjPTsaP1FduY9c0DdUZFoSp+bwxolg=; b=Ez8X7KwgJXfx/oOcytTmVWfUU1Yt677uov3FOpAXe42hMEfcEiR4xRUp1VPAhqhrCgoGO3 qbBEXh5JJr8pFPUmrmWsqxq1aZ8je0eeaftellkXQG4Ndxv0inohndZWY1j9fddGm9iqsr yZRWDpUKgOkstwSn/VQVdelM/XuDXsui7zYl87MmNH5sUjGSZIcRNb+mOJT7NDHo57+kk+ R466J+eQ9kQKtPqizzNNeOHpPTgfTQd8Qt7m9N7OyBQEIT6ZgAC1bWkfqhqDFTVPETEeGz luUrwKCtqg/53RdYDSuUgX746UVtwia2jKM6qKySSQTsUcbtCPFROiX0QiqcqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771203126; a=rsa-sha256; cv=none; b=GCUPfDM0idirxu/ivG9MCCr/WuTnCQV2wpaibfhgZ3JNU2lPQ/2k1ubvzVcfK0rgBV16FC EfGUS8xGZAbHXbJ0ctkk9RXWk+1ddqkwpL4zQ4btzwYvz5FHZFnSsdnQG4LamN1eBYE/Fq Ce4vcV/JJ6/kdLYOZaXGnMhjsJzDDrFsN+6Mlk5TiMmd5nX/Ttwssy7W7GIcVrV8GWCxp9 xuC9N7kr/MVZdsAQdS6enW4FVMtF8ZDQx2uv10+/uu+zT3ewX6tLgKbcIYg2WA+E8cQq1S i5HFiXDx6TsPXGhRKCUCHkorQ7CM3mAbV9pYZcLx9wZcaFIPUMfahh4FIBXKkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771203126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqCECwy/ChsHdOjPTsaP1FduY9c0DdUZFoSp+bwxolg=; b=hMPGQwUnG44QvcqV9yIQrMoXgjQ+xF4EBfFqGx9tE4r6Li6lSUzGbh72UHnfjdG9kWFOZg EFo2cu8bi+bVwGlvqxTyOtCIlJFNRuOaOw1N+uNBlpwO4HTuHkBdVmaZ1fAiMybkU5odoW HQeiJTR0eI+oBFQ8CGKPlbe9/Em/YbPlHiKPKdD8jAUS4MQY5H+19/BKbuVWAFFyZ66QL6 3tXmzGsoKceAwxni4Rag3xkvTn6Z/WXi6mS9b6jFXPTa8qOHLoWhaOtcgAo/YVS8lNh5YH JHOmuuBKVfU2CiX7SxuNyTgO7gOspmz27gjJIuBV+/qADMUoBOE7ZcxUo3AdYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDkkZ1v6Zz1GGk for ; Mon, 16 Feb 2026 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 00:52:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: b45447c6cc21 - stable/15 - runat: Add -h to manipulate a symlink's named attribute dir List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: b45447c6cc21d771c41883a1c4ecc6008f221779 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 00:52:06 +0000 Message-Id: <69926a36.38e4f.7681543e@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b45447c6cc21d771c41883a1c4ecc6008f221779 commit b45447c6cc21d771c41883a1c4ecc6008f221779 Author: Rick Macklem AuthorDate: 2026-02-02 22:38:13 +0000 Commit: Rick Macklem CommitDate: 2026-02-16 00:50:04 +0000 runat: Add -h to manipulate a symlink's named attribute dir Lionel Cons requested that a new option be added to runat(1) so that it could be used to manipulate named attributes associated with a symbolic link and not the file the symbolic link refers to). This patch adds the option -h/--nofollow to do this. (cherry picked from commit 4bfb7cfb70e62bc316de9e73cfd63a5c85541154) --- usr.bin/runat/runat.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/usr.bin/runat/runat.c b/usr.bin/runat/runat.c index 99437f3472f4..eb30ef87f2f9 100644 --- a/usr.bin/runat/runat.c +++ b/usr.bin/runat/runat.c @@ -8,17 +8,25 @@ #include #include #include +#include #include #include +#include #include #include #include #include +static struct option longopts[] = { + { "nofollow", no_argument, NULL, 'h' }, + { "-", no_argument, NULL, '-' }, + { NULL, 0, NULL, 0} +}; + static void usage(void) { - (void)fprintf(stderr, "usage: runat " + (void)fprintf(stderr, "usage: runat [-h/--nofollow] [--] " "\n"); exit(1); } @@ -26,15 +34,28 @@ usage(void) int main(int argc, char *argv[]) { - int i, file_fd, nameddir_fd, outsiz; + int ch, file_fd, flags, i, longindex, nameddir_fd, outsiz; char *buf; long named_enabled; size_t pos, siz; + bool done_args; - if (argc <= 2) - usage(); - argv++; - argc--; + flags = O_RDONLY | O_CLOEXEC | O_PATH; + done_args = false; + while (!done_args && (ch = getopt_long(argc, argv, "h-", longopts, + &longindex)) != -1) + switch (ch) { + case 'h': + flags |= O_NOFOLLOW; + break; + case '-': + done_args = true; + break; + default: + usage(); + } + argv += optind; + argc -= optind; if (argc < 2) usage(); @@ -61,7 +82,7 @@ main(int argc, char *argv[]) } buf[pos - 1] = '\0'; - file_fd = open(argv[0], O_RDONLY | O_CLOEXEC, 0); + file_fd = open(argv[0], flags, 0); if (file_fd < 0) err(1, "Cannot open %s", argv[0]); nameddir_fd = openat(file_fd, ".", O_RDONLY | O_CLOEXEC | O_NAMEDATTR, From nobody Mon Feb 16 01:04: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 4fDl1S1QpLz6RnQB for ; Mon, 16 Feb 2026 01:05: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDl1R6WMPz3pnY for ; Mon, 16 Feb 2026 01:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771203899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25hKCazEB5xSTfcsgZTKV0ygClQkXlZvQGm8MROcEIE=; b=TWqqjSjmHqzkqwTUwZ6jVQlD49wMYuMlSQxYcrjStVD12b96CsHYzQ1B5HSEiyidJ5ZUMd UAHOMNswYvjypqkvKO4RToX++NJUomDYVeeBIVQcJIjs9F5Vwz+ydd1VWVLil2iMrfcdhg FzseP8GZed3rLs3C4YnxcT6UakIlUO+W372sOiaZO8pFXecioVv0WElll3ISqXbVn5VPkW 8fUFy8k5KBiAo+udyBn4ArzznevIyxYFJVC8exkbuSHqK0JEAMAZHQS0QAaxDvSwwPim1V BomyOUqZ0h+0uXkhT2/8SpZt9y1i+y/FiaywHCwLAGy+nbYFIGQQ7uNVzShFGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771203899; a=rsa-sha256; cv=none; b=Mq2oRlIVF/BA/o9ggD4XkGFPvXtojp40X1SH5YhoMXcvURUf/KhjFV1P0FWfkWENRunxn+ wCUJ+fTdt4NWnp4TmguqzGrguWFRUS4m72KFI2P++7AbU4cnfhYijwYFaeDJAQbUeTYDys sAIfUnJx6NyjTHQkxg2sM6yBxMWlDiM+EVZcdDS4XyrjMmbXIBlCJnlNlYWZ7whyfYKP+B xizb6lkOQvzoTX3cPA+XclwvYz64dgkT9JEeqRUe6STVzLcTEZ+xPupzeaF7rvRSB/QrL4 IJtf/oOb5M489kuwqMT/MzRbf3wAz6CL0bnbUXKCbnuAMYvDqtN1+cgbxqpAjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771203899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25hKCazEB5xSTfcsgZTKV0ygClQkXlZvQGm8MROcEIE=; b=C/TMB7A/93Rh0i6WttSxJXBdLBWL1PZsy9BH+NRoB7RSWTu6aXfeNKNV66NKUTyzQyyTR7 Xo/f84ICaLZKGQYS7siQFn89wfaUwBnZkkKM27jfM1tZxhayiRUxpb1bzdGGkF/PCaGLt1 OEm/QCo3xvn0hF6YY4TisWdfQ+PTiQrrzIml71Wifl2AQV/3N7DUnxj+lplNK1L8myaQJV IMIiGMmnriegE2OeS6xhbd65xqmT9PYNq2pj6BEVNK029Uwgwz2mPGepDofiWCMsNUWWwA AGT7qoZfJ9G9br3ZgC7bIT/h5MX5d5b7lmtmmPTkitkL3M2W9V7LTxS6QNI30Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDl1R5NlBz1GqC for ; Mon, 16 Feb 2026 01:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f38 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 01:04:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 17da2d24b7af - stable/14 - newsyslog.conf.5: Add a CAVEAT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17da2d24b7af843739be6b3d9ce244f511cde2ee Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 01:04:59 +0000 Message-Id: <69926d3b.39f38.27d56e20@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=17da2d24b7af843739be6b3d9ce244f511cde2ee commit 17da2d24b7af843739be6b3d9ce244f511cde2ee Author: Alexander Ziaee AuthorDate: 2026-02-12 14:14:47 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-16 01:03:29 +0000 newsyslog.conf.5: Add a CAVEAT PR: 282639 MFC after: 3 days (resolved merge conflicts) Reviewed by: michaelo Differential Revision: https://reviews.freebsd.org/D55122 (cherry picked from commit 64e612b46290617ec753b4ee6ec633a3724940e3) --- usr.sbin/newsyslog/newsyslog.conf.5 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index 92ccf54732e0..806b118c5bec 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -20,7 +20,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd November 11, 2024 +.Dd February 4, 2026 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -436,3 +436,6 @@ entry: .Sh HISTORY This manual page first appeared in .Fx 4.10 . +.Sh CAVEATS +If a line is specified multiple times, +the file will be rotated multiple times. From nobody Mon Feb 16 06:18: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 4fDszM2mKHz6SLM2 for ; Mon, 16 Feb 2026 06:18: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDszM1pZqz3N2m for ; Mon, 16 Feb 2026 06:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfYR1fnJMmIfakWJiT7FNjxBGyWOZlsktYTzj6m2gww=; b=SljOgxO+/9nS4JJ8Rf0kxc7F+0XttxP11oq54saCZY33471bxaSSqwbZ8w7wEBHSyiUlrK NIZ8Wq7V2k+tt51r3qqPgpg6kn+Euk4J3sj90/pQrNvllR0v+D4mAWbTsi+r81cgPETfuJ AuxG1WH+Tw9fRNwEU0Jqozkl2umL4vQ0bnG5dotLsYKnb7R2A/6MthjlGwj+lNBBUufUqS dJXfOfEMrzLNH9o3puWQDN/7mLmWRRQ7/4JRYwKOE5d9d4TPbPjWwnQLF8X2cdHrT9S4w6 in4OsfjryYQaRFKxO2OWJA3O8dopiA6rQ7uoH/grtshcoegnWUWxPZHhlLO6mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222719; a=rsa-sha256; cv=none; b=YzbuFPBZ0i8Tl/jLHI7173rpTg6gJLxvQUakkhdUVI3rG3wVy4O0cLMKgqLnw5fCOVJZy+ +QDJiWqanG4eESma3VTPR84cEcoQCX3DnQUhq3eI3TUuoCvc492zhO7YOy+LH7QoPN6T4A Ba1pwBWKC+lgy/860/9BfMDJ0eRdW/h68AGUaZJxXnF+tLFfUCAOwvZIIz+Q1TKnd4DUfS ieqxGy/qsTl5IUhzU803CGAMV7LSV3Rf3IdJIffaxdnSSFmt6fkMt4AS3ekzHbEWATOMlX zu4KMs3rU0I3Ra+WPJ5ombiaykBrc/TtKAJMh6JNGOT1pjbVVxdC+DEmpUNwLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfYR1fnJMmIfakWJiT7FNjxBGyWOZlsktYTzj6m2gww=; b=DKlLVCJ27TEulQA8gz0XYLRZE/FLij12bimJF743+6ZC6/uQn+skenYtneeVuYm99Oatxs VkOYfEAeik+/JsSgIAFAM0DOI4B1Ynblvp8EZoe0D1Divuf6/0pVoQJ5lSoK/8TBDVf6uo KyiaXarL9ylnkcL5gN9SKrsbiXGT9VETSEUsTe6bNhzpo8thwpYuQWlThp4lVn/X9V6rNV p9IvVCX17oErWqrNZnu7XJqdHXpRI2bO5NLZTRaasXkYozpSVsxWbb8DaRxgDA7NNew9aj CquVfaJMfWWyou1t3/H11VZW82pJv6S+kwQrAx1N5Yqdd6TVgYXsZCuQ70oONw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDszM0h0Xz1PrS for ; Mon, 16 Feb 2026 06:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:18:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: daa5f78c691b - stable/15 - kern/vfs_unmount.c: promote flags to uint64_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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: daa5f78c691b1a1d1ee5b17c63cc3548dac21d74 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:18:39 +0000 Message-Id: <6992b6bf.3bf9b.641e58d3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=daa5f78c691b1a1d1ee5b17c63cc3548dac21d74 commit daa5f78c691b1a1d1ee5b17c63cc3548dac21d74 Author: Konstantin Belousov AuthorDate: 2026-02-09 03:11:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:12:28 +0000 kern/vfs_unmount.c: promote flags to uint64_t (cherry picked from commit 8066b8923ebfd438dc8cb840d2f57066f4daa45d) --- sys/compat/linux/linux_file.c | 2 +- sys/kern/vfs_mount.c | 4 ++-- sys/sys/syscallsubr.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index daddafa325ad..8413a481c5a9 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1171,7 +1171,7 @@ linux_oldumount(struct thread *td, struct linux_oldumount_args *args) int linux_umount(struct thread *td, struct linux_umount_args *args) { - int flags; + uint64_t flags; flags = 0; if ((args->flags & LINUX_MNT_FORCE) != 0) { diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 240bf5451a84..2237fcc6b423 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1720,11 +1720,11 @@ int sys_unmount(struct thread *td, struct unmount_args *uap) { - return (kern_unmount(td, uap->path, uap->flags)); + return (kern_unmount(td, uap->path, (unsigned)uap->flags)); } int -kern_unmount(struct thread *td, const char *path, int flags) +kern_unmount(struct thread *td, const char *path, uint64_t flags) { struct nameidata nd; struct mount *mp; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index d169481fe13b..908a3b89259b 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -402,7 +402,7 @@ int kern_wait6(struct thread *td, enum idtype idtype, id_t id, int *status, int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); -int kern_unmount(struct thread *td, const char *path, int flags); +int kern_unmount(struct thread *td, const char *path, uint64_t flags); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */ From nobody Mon Feb 16 06:18: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 4fDszN3r63z6SLPh for ; Mon, 16 Feb 2026 06:18: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDszN1Nhnz3N1M for ; Mon, 16 Feb 2026 06:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dhJUe+BfCWw8bGQLwD/iyIqp5PHGG6XC50/koJFxcMk=; b=ovXwBmqtdYUfAmoVdBOxEmKSs0Cr+IS6TDdPMCcui67wtMlVqOjj9oB084qz4oFGXP3hmR iJB7f40ApKME+o6KvXaB34dKSMC6xIWB4gtGWb6cGUx8FPnEiKnJ+eOHhp+NF7QahvLG0w qvZ3nGIj/I5QfZuDe1Jc1w4qqqw9jIgejBETPCxUgHWDHmnoGxb/Azd/kad07e98CXFwip aVU72anKve74HRM9jmDmrDNrTht0bIk81DXqyFZs0rBRvtuyw5sUqzjglvdCvBINzDFXv8 kkqiNH+ALdTikFZxOUUmUOsyoj77Cz7Ba1FhSHCntryTyY2DHzPjlQzRS5Y3wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222720; a=rsa-sha256; cv=none; b=JhfOYSTgqMRA+r7nQiQU7MZlg1CWe/2Iuny6a5vs53X9SWWYdmdIFiJqvsBRncvuV5/uKC gof2Iv6Z1oYdSWX+xghQs8kKvZUyu4SFv0jlRp6M1v64TQBZFQ+zG/5cie/GzdhJlnT+EM z2WDqDzMuD8gS1RK9GKPPGBVpdmRNFGvXWSp45NIUETe0EG+NsSWzyjqAyLqdCILDYBgyL l68QE2klJ2qWOsp214Jnc+6O+PckigNDRr8gcYQB/PrOTDZv93j1/gEYEqj/JKMF5Gbi/K D85T8KH6SdnNSwWMn/FXmJEMG5g+LHcUin3xkYw9arPMqzVc6PwG5+l1TchTkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dhJUe+BfCWw8bGQLwD/iyIqp5PHGG6XC50/koJFxcMk=; b=OQc97l1NwZQRmJ+fwbU4ACShHsAeDNSz73/mCZVX10n7kxuIbzJxuHT6Xq4tJOx7RmH9EH w+PVaSvypYITGtKWyR3PUQDeK3/OWuNBzn81qYq/v4WQh3n6w15aITDSsmYzOjVALdRE+k qITd+eMYrSDjR7wvC/oVTQYBQLX470R/3snxaOTIheceh37T1pCexHChz5a63ESeAFovQr JMmr8jiemkchSdQ9Xz1/GpGqoiIz8mGzc7xPlDs35Wg7WlZbDgHPz4QJa1fp7LZbIexNej 9G7fmg46Gk4+nSWxrYmeJiRuL076OQwpXW60pIhMahWyw11ZfP8Aj2kxMzRoRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDszN0hdpz1QFG for ; Mon, 16 Feb 2026 06:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b433 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:18:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a6c0d8bf434a - stable/15 - amd64/acpica/acpi_wakeup.c: do not store to WARMBOOT_OFF in efi_boot case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a6c0d8bf434a22fe81c029606d4241efb4adce5a Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:18:40 +0000 Message-Id: <6992b6c0.3b433.27da10df@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c0d8bf434a22fe81c029606d4241efb4adce5a commit a6c0d8bf434a22fe81c029606d4241efb4adce5a Author: Konstantin Belousov AuthorDate: 2026-02-10 01:37:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:12:28 +0000 amd64/acpica/acpi_wakeup.c: do not store to WARMBOOT_OFF in efi_boot case (cherry picked from commit 5f3192b3fddd974db36af0279403aba1371c68ec) --- sys/amd64/acpica/acpi_wakeup.c | 59 ++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 99565fbb69ca..54fe1e47a502 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -76,9 +76,6 @@ static cpuset_t suspcpus; static void acpi_stop_beep(void *); -static int acpi_wakeup_ap(struct acpi_softc *, int); -static void acpi_wakeup_cpus(struct acpi_softc *); - #define ACPI_WAKEPT_PAGES 7 #define WAKECODE_FIXUP(offset, type, val) do { \ @@ -129,24 +126,22 @@ acpi_wakeup_ap(struct acpi_softc *sc, int cpu) #define BIOS_WARM (0x0a) static void -acpi_wakeup_cpus(struct acpi_softc *sc) +acpi_wakeup_cpus_bios(struct acpi_softc *sc) { uint32_t mpbioswarmvec; int cpu; u_char mpbiosreason; - if (!efi_boot) { - /* save the current value of the warm-start vector */ - mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); - outb(CMOS_REG, BIOS_RESET); - mpbiosreason = inb(CMOS_DATA); - - /* setup a vector to our boot code */ - *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; - *((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4; - outb(CMOS_REG, BIOS_RESET); - outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ - } + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ /* Wake up each AP. */ for (cpu = 1; cpu < mp_ncpus; cpu++) { @@ -160,12 +155,26 @@ acpi_wakeup_cpus(struct acpi_softc *sc) } } - if (!efi_boot) { - /* restore the warmstart vector */ - *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} + +static void +acpi_wakeup_cpus_efi(struct acpi_softc *sc) +{ + int cpu; - outb(CMOS_REG, BIOS_RESET); - outb(CMOS_DATA, mpbiosreason); + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + if (!CPU_ISSET(cpu, &suspcpus)) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } } } @@ -264,8 +273,12 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); lapic_xapic_mode(); - if (!CPU_EMPTY(&suspcpus)) - acpi_wakeup_cpus(sc); + if (!CPU_EMPTY(&suspcpus)) { + if (efi_boot) + acpi_wakeup_cpus_efi(sc); + else + acpi_wakeup_cpus_bios(sc); + } } if (!CPU_EMPTY(&suspcpus)) From nobody Mon Feb 16 06:18: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 4fDszQ0HZhz6SLHL for ; Mon, 16 Feb 2026 06:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDszP49DVz3MnW for ; Mon, 16 Feb 2026 06:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/l/MzzY5PIiIGmgtyMSw2sKB41zzU2BveIYYFVTbHAc=; b=U8laJS1oGSjSw9rwA1evHFB2TFEL4AoibKWPOfNgWO5fb0Ah4Arg8hteCv625YEnXk0JKc PAhoyDkP6Ceja+n3zBDM/7++GDh1M5mjWq8lywgyVEOv2LyZrRjF+dFXhxv3AYaPIxzK1r e/Y508CyUOrVYlJKs7U1NZY/W2WmP65sJ09LO4BRM08OH33DVro4iWeXtwnO3baCjy1yJV 6KvNyRKEmgskZGdlI94QRRmuOXrWlQTwyHVUjBMm4ajuTD3rHmW0hFyLGQT6rtSfWi7qe3 o60YSHbl4D6NW6RlQv74U2741HAoum24dP/6v+baOcj/cNfYZft/i8puZbXeyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222721; a=rsa-sha256; cv=none; b=iWntmnmEDf2N1b+nkFhW7To/Q/nTdKAdRxhTls0+ckPm8V6erLhnZGFYvL3t8+v0lcwS1v w5RTos1d0Zim8RYXB+CVIWtzKSKaDQBUnkjNrN1JRlc9Lb5nzmno0nwKdtsp3cScsDe1Q5 7YQ2dd08wlIqhA5FslkX1C7jrabTmLocyyMMrpKYnncavVkvClr3tex9BptabjC270yK08 Ul86vOWsDWn0lcW2g7QYhMvpt83XwknzVyWQQp0TqHzPEvF3+2AXB2PiZocGbugNUJb2QV TLHLm5AM/4j+oGdnAEn6pat6FaTDJDhAe2TE/ws7dGuDRqMMgPXPVsMeEqD5Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/l/MzzY5PIiIGmgtyMSw2sKB41zzU2BveIYYFVTbHAc=; b=kRItJ1BiE5RsyBqKFlKsEjT/6XGLXVuQuCdgt3bGPkfE+IR/wT15/KBvP6cW8urkmJ99dh lI7e9EScmisz/g9dQLpyPWaVIfJ34gNIwzPTjYCR/1cC3aLQ6pw7JvS14uk+JCLx3SKCyx u49TGa2DDEFcwAsg/VNv5sAbnSgfEw2AEcYJWx2FklQYeJCR9eko9OekecN7qUeXcDnLlg 9kZU6ssVeR90X3cxStMLD6A4NCcFde97snhx1vl7PYWJSp0yxY9FvkGLwNpgBafrdLszsG i1Z5/XFeVWfNMwZ18b8vdmguKFZ7KL6MM/O6U2Vt1qK5c3FaIDeMZkXgzVleaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDszP1Yrwz1QbF for ; Mon, 16 Feb 2026 06:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3beaa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:18:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 22bf122dceb7 - stable/15 - filt_timerexpire_l(): re-insert restarted timer into head instead of tail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 22bf122dceb73f194c258b32d657088e3e02fe3b Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:18:41 +0000 Message-Id: <6992b6c1.3beaa.4b492baa@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=22bf122dceb73f194c258b32d657088e3e02fe3b commit 22bf122dceb73f194c258b32d657088e3e02fe3b Author: Konstantin Belousov AuthorDate: 2026-02-12 20:24:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:13:59 +0000 filt_timerexpire_l(): re-insert restarted timer into head instead of tail PR: 293141 (cherry picked from commit 75a30ea09f4e75480743fae5c2369d50a6d8526c) --- sys/kern/kern_event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index a48408fd482a..85b7b6c953af 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -873,8 +873,13 @@ filt_timerexpire_l(struct knote *kn, bool proc_locked) PROC_LOCK(p); if (P_SHOULDSTOP(p) || P_KILLED(p)) { if ((kc->flags & KQ_TIMER_CB_ENQUEUED) == 0) { + /* + * Insert into head so that + * kqtimer_proc_continue() does not + * iterate into us again. + */ kc->flags |= KQ_TIMER_CB_ENQUEUED; - TAILQ_INSERT_TAIL(&p->p_kqtim_stop, kc, link); + TAILQ_INSERT_HEAD(&p->p_kqtim_stop, kc, link); } if (!proc_locked) PROC_UNLOCK(p); From nobody Mon Feb 16 06:18: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 4fDszS041jz6SKtc for ; Mon, 16 Feb 2026 06:18: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDszR3wQDz3N8B for ; Mon, 16 Feb 2026 06:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222723; 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=c/PMvmLyREPk0U3UGmO/slQurCUnpUZhhILY9r2XHZQ=; b=jn7/Tamb5Uw5/IxNehYgVaqJ6l/tHEeiLzNtCCx1ZbRB9aqsPLwJqCPneV3W4GFZklYpGq S/x1wJzBYeVI3ZCs60y1YCqr7a5Kd9WXQ6n0UppHwh+6irCGQaZ2LwXJ4RMT61upR2oafz 8/yZpj8R3fmZm0DDjY2OGkVScTEgKgHWbOvjcC7MaYF3wKpNIKcNo7ma0IFBDj2CFT1Nvn mIwPQXay6V5wacsTQiHn47i9xCShIQ1imVOgwbKFjMXTmB4UktMWqpQ0I7KUltTCm+4ekX YL7Uqra2nBWfTt1aOmapVIEz5GFyDA2EoayimkANnl3Izo2tsvoHwnTd1bva5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222723; a=rsa-sha256; cv=none; b=EkYHL6/Nn61mdBIAk0nznXAhjswcMjDz3vhm8glptC22obPpeQqhSUE2pb6JMeer7db2uz fNnZEH405NkAn27hHlJScHY3OBd8sKr00Zt/QlmPrrjv6ekBcRbnf141p9IAio72n4I9qd zHN1JwavbxKj/FI5YKREop9IVSW+GzCLOjtnSa4BRp6jmfYZy6NDvegx/2Sl9uYqWkgt1n K1vDWlpHwFqhm90TDZsuw615IOfGGdJMH/5LyODkQhXnBBiByO8nlZGm7uuO26TVEfcWDJ MItYL3OuFUD2VVTklRyB9usLmLBneJMhIP5L9hqp7AkVJrZ2X5KOZL3q1kRAlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222723; 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=c/PMvmLyREPk0U3UGmO/slQurCUnpUZhhILY9r2XHZQ=; b=GPhRzOxVrpAsDrlBXYFsIQNIIh/3ibivOSBpYUz7l73CBJFprCs2uZKEe+BusdGdcUu+hF 0EGS+c++ErobQ8Km/04+M3QJkct6pvbBMYUvhkdRrdp2ak9VYRCLb40Y/5ymtxNasWSkd7 Nghfsd8gfVnZkhxsKsqceQi8TcoDfw62BExsQKFogL6VTl+Md90btE0WaBN/hNqwe6Qz37 MgKTNdWd7mpMh23frlpgY4T6zCGx3mtA92pAJPZYGTZR1ld8kFgfOB7DPfRZe5SIDLhE60 +5XZ/uZBqi2ANb42QpiYH4SSl3dkiLl9ESHJcSuae0JPpIJ0meEA4Z+vbcNagA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDszR3DQWz1QbH for ; Mon, 16 Feb 2026 06:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b876 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:18:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Minsoo Choo From: Konstantin Belousov Subject: git: 203819ee8407 - stable/15 - x86: Note that trapframe is used by kernel debuggers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 203819ee8407b9141153414a1c6e28bf9d7cf86f Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:18:43 +0000 Message-Id: <6992b6c3.3b876.5c0d4c21@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=203819ee8407b9141153414a1c6e28bf9d7cf86f commit 203819ee8407b9141153414a1c6e28bf9d7cf86f Author: Minsoo Choo AuthorDate: 2026-02-09 01:21:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:14:40 +0000 x86: Note that trapframe is used by kernel debuggers (cherry picked from commit 2088e742013bb1b9ca237a79767362efe92d9da8) --- sys/x86/include/frame.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h index 994e19b979fc..feef41ac7bfe 100644 --- a/sys/x86/include/frame.h +++ b/sys/x86/include/frame.h @@ -38,6 +38,7 @@ /* * System stack frames. + * struct trapframe is known to and used by kernel debuggers. */ #ifdef __i386__ From nobody Mon Feb 16 06:18: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 4fDszQ73BGz6SLBg for ; Mon, 16 Feb 2026 06:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDszQ4qtxz3N8y for ; Mon, 16 Feb 2026 06:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZ7KOC2swqmhUcu5+J4v7i0NSpN/l6BjVfCW7IoJVw4=; b=uWMOXtRNfhjgpGPndE49EYpALJizYAjbfIMzUgh+ZO7p/chN+OoSc4ebEEA9uCdWiQrNAB Ps4p4bSXkV7HmJidSxVHbE/b6cNX3H+eXZu3dRwy/+E2a+5e9XpSkOBbgh39z5YaIKJZyL 4SkwouLrYlT/VFZHdwshOMYnwPLIZYBAhP5ekLvG0HA0oFh3qesUDt7YxaV/6CMkhdUxGY EM536ibkAl5cmj0w8ORuoou897wxSEoUtA5VmCpya5LvnxH4glnbxSCn0zAMe7TBtHpXcf YNxzuNmmwN2C+sNXmLo/pgWt1w9ArQHvUDcFFX7zpvcSAyAZeO3GaPfO6y/a7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222722; a=rsa-sha256; cv=none; b=EQJG4yHD/XaLoTQ87IVZn3GJk9BEDGpbnlsG2kk/QsTVPTubZYTENtklwkPX7lHZRe8CzV 7qWGGAel7dbLXgpbvi7RPh/CkZgY+T2HhpWY4jt2iOywXfebLZMmki9v2ZZoN7fRqF5JTe DjJNn2K0B/Hb5MD3oTL8/+rZEGQ8nlgluFITRJlYyYxMxgb8HOJT7Ahgsi4JCkb+7Olpnq TkBuiCuBpgTHsy74i735RYyfaVRPKX9xwXlIcQyg/Wj4Sy2RxiWroHwhml88zCGsB2XzpF pXdpAy0j7A5hgYdcAIlz1KlNwXFZXquRpAjS2Ba9LZVKASHCbWk5WmCsJlw55Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZ7KOC2swqmhUcu5+J4v7i0NSpN/l6BjVfCW7IoJVw4=; b=mfAoOSBUQrO+Byg2E4l7t0djJLPhJhAXO1my8qAvmK6z3FfuK3IST7g84nMy2Sc9SHd+j/ K7vAi3XXh5aW0mmKol6W+DpVwS4li7KqKc1aYS76bfSVm5XGubkjP0/4J8HbZR6XRgsUYA iyRlTubJKKWZAxC4aj8K5h6MlczzuLvPCbqerGgp79jQx1xMlTl1vtJxaQr4aLGWyMmoii sMiajNc6duU9/c5K5q5SsgUTJ16kgwxQSo/ElIRCn2pyWAPxXnwc5W4FC7DCj5bycXzMgZ Np76MRu63VU2cj2QxVbrbpA8NHY8aXzIZQauxXYG0j6jlX1+PjNDCOPa3icKgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDszQ2PbSz1QKJ for ; Mon, 16 Feb 2026 06:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b021 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:18:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 71cc31c18d1e - stable/15 - kqtimer_proc_continue(): correct calculation of 'now' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 71cc31c18d1e92840920a344937f2889ca94d08b Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:18:42 +0000 Message-Id: <6992b6c2.3b021.64f4b749@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=71cc31c18d1e92840920a344937f2889ca94d08b commit 71cc31c18d1e92840920a344937f2889ca94d08b Author: Konstantin Belousov AuthorDate: 2026-02-13 15:32:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:13:59 +0000 kqtimer_proc_continue(): correct calculation of 'now' PR: 293141 (cherry picked from commit e7f86f8b1383d278fff1d973230972325072ead6) --- sys/kern/kern_event.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 85b7b6c953af..a1cd409c53d9 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -814,14 +814,11 @@ void kqtimer_proc_continue(struct proc *p) { struct kq_timer_cb_data *kc, *kc1; - struct bintime bt; sbintime_t now; PROC_LOCK_ASSERT(p, MA_OWNED); - getboottimebin(&bt); - now = bttosbt(bt); - + now = sbinuptime(); TAILQ_FOREACH_SAFE(kc, &p->p_kqtim_stop, link, kc1) { TAILQ_REMOVE(&p->p_kqtim_stop, kc, link); kc->flags &= ~KQ_TIMER_CB_ENQUEUED; From nobody Mon Feb 16 06:23: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 4fDt4Q2xK8z6SLdJ for ; Mon, 16 Feb 2026 06:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDt4Q1TRcz3Q5R for ; Mon, 16 Feb 2026 06:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GjDdnR6D4tT1QHIXjLGd0Jcd7jpSiCu+C4R+T02z4E=; b=Yj73tUZi3OgzlfxOlvzj84VAVDzODf0fCMIQg7HeAWwIxNY+XXO9Z9tT6niLk6muZh/tXS IUUQeKs3c1K742d+q4Sk0yIlcb7WTpukA876ca3EC4JQznBrtav/MO5bl6lUfz+J18ulaL taI/KxHCrLSVvXIpG8IikdazlyfoeX/5mmQEXN/SiY0Fso3TE7aYvFTsGMRfD92qpIsHNU /qXcX1ptaa10H8zo0Lj7CpTBqsTnWJdRO81ed9yprKHBcP0Km5EY6JB3q/HsRK9D1d/Po4 lUhMi8/HatSE52MYKuhNW7VL6FItZ+XmugGBW5EhoeL0aPsy1QG4ZUHvlc3E8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222982; a=rsa-sha256; cv=none; b=Ag8sxxHDelVgs6nWaR5GqLGG5wsyo5ikecq8hK/X8/E3uwQglWB4rOKBQ7dbRc4B0aLYg4 Fqzp+2TceO33wYgBvNPn6yFOlrZoea1dBdIQk5JkJU+HaAuHU2B39FZadQDDlTdN4Uy1pv gR84G8K7Ze40x2irW+iBAFemuhWFbe8RX1PWJiVnF8eXQnEYry9g5qkTUuigB6eaPGmwm7 izBaC/1iAJrpi5wlJnQdyJ2Ym/5WnSQ4V2wnMko7cFSOjO6xUNrK/70SzbPWnQ3bicp+Wl E0xuS4YBPSmnckD7352x5sKb4imoU27F51dDmxK6/whEDe3yGeWJ02jz2NsY+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=1771222982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GjDdnR6D4tT1QHIXjLGd0Jcd7jpSiCu+C4R+T02z4E=; b=rg4RVTbwRS27zqV4uwo0S/3JsOZBAcR0KioBUg9FrjH7EqEkoDhC/c0237sz/2CouDODvl 0BqQD7EZbn1MOoEFMTKXOPvN7N9wv4u7LmAIJHXNL1OSem5dQ0SsXOcpl9SKi4MyEVJtgY LdTyVTmxMI+9rSg780AdsDQHL7VtDs5/O1KccvBTxpyYeFowEtpGJerLSxiG8zeqdwV704 cUKBOMDb4FD+MOj54Gr+7KFxcXfL247z8llPMC7N1e8Mo824f0nlo9Le/NPi0qyX0r4sx5 UbG8lK+RrhCzgyowzkaY/I5O3kZ7DgC9cuUrtGd4D2o58WBk5OXoDzbdLvaSNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDt4Q14Lrz1Qxr for ; Mon, 16 Feb 2026 06:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c040 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:23:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 119af90d483a - stable/14 - filt_timerexpire_l(): re-insert restarted timer into head instead of tail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 119af90d483aee79bf549b3d63e1093bb59e1092 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:23:02 +0000 Message-Id: <6992b7c6.3c040.c6178f8@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=119af90d483aee79bf549b3d63e1093bb59e1092 commit 119af90d483aee79bf549b3d63e1093bb59e1092 Author: Konstantin Belousov AuthorDate: 2026-02-12 20:24:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:19:30 +0000 filt_timerexpire_l(): re-insert restarted timer into head instead of tail PR: 293141 (cherry picked from commit 75a30ea09f4e75480743fae5c2369d50a6d8526c) --- sys/kern/kern_event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 835a22c81528..869c4cf24ddb 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -769,8 +769,13 @@ filt_timerexpire_l(struct knote *kn, bool proc_locked) PROC_LOCK(p); if (P_SHOULDSTOP(p) || P_KILLED(p)) { if ((kc->flags & KQ_TIMER_CB_ENQUEUED) == 0) { + /* + * Insert into head so that + * kqtimer_proc_continue() does not + * iterate into us again. + */ kc->flags |= KQ_TIMER_CB_ENQUEUED; - TAILQ_INSERT_TAIL(&p->p_kqtim_stop, kc, link); + TAILQ_INSERT_HEAD(&p->p_kqtim_stop, kc, link); } if (!proc_locked) PROC_UNLOCK(p); From nobody Mon Feb 16 06:23: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 4fDt4R3Xdhz6SLdL for ; Mon, 16 Feb 2026 06:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDt4R24Fyz3Q0Z for ; Mon, 16 Feb 2026 06:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ACF86kq6vUFV/5n6wDJahcpxB2SL1A153wWqYAsxiuk=; b=aYkPWyjyWDZuy7azlFmac+Kjg/r4KU93KDxYkQs6qnwnXTKNTOri6dTfpgsKMaMGjX2clg wpwK6VSxf2PpW81PfjFjpJa1ZcIbmeIeV3akL2AtezGq5UaV0L2Mi0EW4Dl6YXYcXGRdk8 oMOanz2MxtfBjEQ5/WCfTZ0EKgqGhAIJH5wN4EgvXM/jHN0Yqo2DI8uwXhgbKjR031Z8EM /ANemEi777xuKW+qd6tCYRWBCNnflEIqu6cDfaYalCh2um4xNBriA5jUzjdHPyx6Y0accG ezQfWIrv39//Q0p3RYquCNZYdN7q/ddL4WiD1pEqmWCj9E+hRxRqkH/ei2IxWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222983; a=rsa-sha256; cv=none; b=caSlYQSa5UM46pvIK6/AfZqs8ViezU/BY9AdjitSAUnVPv/dLXIYOGpoNStxzh+CwhBbTo ImuXGMVSMidS6W23FI8qXRz5+yMdppIkztiwxOYF8wjm/+/xtD/HJA5zEjVXQOIArNmzj+ FF5aRS/pcckPmE59WPy3b1ekuDxs6493iIzZZX1PlRX3cHI4FOt0bWfua2V9nR5k/4hDgW ncqYdt/VHaPsDuvkuJqxsPppX+d1OTFfw7AtmCAsXxGslkOogkfBE/2tiXiG/4viIKLebB y9Mcr9MRC9eh2W7CtUk9LhLYQgYosDQFIXC4CZySq/epK+yg21NR+WJ5pBjbPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ACF86kq6vUFV/5n6wDJahcpxB2SL1A153wWqYAsxiuk=; b=X28EzQy3mA78pF+pCcwAcThpjZZIGVXcCa4K6dM8PIkd7Xn6QDpqcq/E1xMLCTfBafYn+p 0A6uDk0iYMNMxwpRvpU14za06e+BPySoVCvFyzXUiyliSBQqpo2sD8jSuhBUGfSEeORFYj idpfaMJFmZ/HKHTWTwC0Hvzg/hVeriryAWeQcSeW3Zwu1UvQV+qyDtkxWqS+k0RB+PVI+N fZo06NS/7p1layc6BugsFmPTPNrD96G+FWOceYIe2TN1O5AQInrR42gE9yx96ah9tsLLOS GvyQRA8NYV9FXOaYiRC/FDObvcbqb3nFhD1DWwhHYkCUidcwWYDRcSvBc+4I8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDt4R1Rt7z1QKn for ; Mon, 16 Feb 2026 06:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cdad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:23:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cf941029dd02 - stable/14 - kqtimer_proc_continue(): correct calculation of 'now' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf941029dd0291c8b685aa3f6d7872371e6136b9 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:23:03 +0000 Message-Id: <6992b7c7.3cdad.1bbed842@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf941029dd0291c8b685aa3f6d7872371e6136b9 commit cf941029dd0291c8b685aa3f6d7872371e6136b9 Author: Konstantin Belousov AuthorDate: 2026-02-13 15:32:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:19:30 +0000 kqtimer_proc_continue(): correct calculation of 'now' PR: 293141 (cherry picked from commit e7f86f8b1383d278fff1d973230972325072ead6) --- sys/kern/kern_event.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 869c4cf24ddb..920256f8c1bd 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -710,14 +710,11 @@ void kqtimer_proc_continue(struct proc *p) { struct kq_timer_cb_data *kc, *kc1; - struct bintime bt; sbintime_t now; PROC_LOCK_ASSERT(p, MA_OWNED); - getboottimebin(&bt); - now = bttosbt(bt); - + now = sbinuptime(); TAILQ_FOREACH_SAFE(kc, &p->p_kqtim_stop, link, kc1) { TAILQ_REMOVE(&p->p_kqtim_stop, kc, link); kc->flags &= ~KQ_TIMER_CB_ENQUEUED; From nobody Mon Feb 16 06:23: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 4fDt4S5XL2z6SM2l for ; Mon, 16 Feb 2026 06:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDt4S38VFz3QLD for ; Mon, 16 Feb 2026 06:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcavDOOYCNc2FyfxPMt41U80+dwDqGPx8k5QCPemAkg=; b=xTWy7xvu4klzBYp7utGkjL6v5DLA1NJN21YPeUamSX35+qaFlkaeBm1cKuQiyE8Go9hQAd 8XcHuZa8VpXduIR5aH12+Ggtwdwtps3tHtXugmtRava1l/clSw0jpw713BC0WYd480Z8TH t1K3lPrBdSh6+LO4O+9PQ89RJUv8+qhwQlAHjCLLWNzC74zDbnnX2xinU4DvXWsBeMB0Xu +z8oXJ3+MJizH1Xix21NhgJvXhey42TOoChLrAquWIX7vZ6ZnX4sJDIias8EtjHkPrTbuG q95r+l0YEu5TpvznW2ENwTEvrVlNrOeqIfAWbWNy/+g4wVe0R4o7BVbBMZqXsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222984; a=rsa-sha256; cv=none; b=V7DPPb48KcClSGk4OfmePzzhs8rnCFv5ozBusZal0Sn3UUVdQEjT458OxL/CpZwZ0mnSr6 QbUt874Z4HM4PNTE1BSJtiVicqU5l+narxgi8L9j3e/3+UMU0KRAyTdBOgIBNJCXQ2KYIp m+FvWw2unq9cvbvDoZEcqG7kMLxanyvDT3Fda0c2MZ/EipunYT1IJRmxjLQdIG81hDIiAj ejDXnLbk6Pkp0nmN0byfLdfj6qcCALRxqRcVYcm6oOZS6whLawJj+TguGb9gtrF7NOgG5X GRRVdEnx6XOKbRxcu7+5Q7tHAuVhqUtJqSMt3pSOzYu2XULSP/tVXp5iBQTnfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcavDOOYCNc2FyfxPMt41U80+dwDqGPx8k5QCPemAkg=; b=KLQFtgesCVUACKEJd25zc5DeiagIzPkZRE9RzyPYCKRCt3mr3M/U63oMVQDHD6CrWICkPf i2xu5ppu898+m01U68sUSWFhdpb/8DimEh/Fo4wa4gknSHLmgAbVD6lllqA5k+Nvq8ECtA sDeQ0dAnz19beZeiRTVkShyW9HpTwCliLXjxOpCTby8R9OKdDHgQhyZ1VaGelRNfCCSaC8 jLPUhTjglnLnMrBktOx5H9HwX8EnUqqriepHy5xpPYMPQOYdrNRh7wdoMPUufxx7OeHbSG m0kQU7OklQ4NdjpPbOhvBGh9V4ZFtY24ohHGl3kIhyN6lfZcO3VvVr9R6lhfNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDt4S2H0Kz1Qxs for ; Mon, 16 Feb 2026 06:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:23:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a893e8463ab2 - stable/14 - unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a893e8463ab2741204debd17901539708ec3a970 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:23:04 +0000 Message-Id: <6992b7c8.3ce75.601a5a00@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a893e8463ab2741204debd17901539708ec3a970 commit a893e8463ab2741204debd17901539708ec3a970 Author: Konstantin Belousov AuthorDate: 2026-02-02 22:38:32 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:20:18 +0000 unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace (cherry picked from commit cd8d44173adc375b59a24b1363476c086a7c86b4) --- sys/kern/vfs_mount.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 85d14a943d01..5ca7c43269ce 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1733,6 +1733,8 @@ kern_unmount(struct thread *td, const char *path, int flags) int error; AUDIT_ARG_VALUE(flags); + if ((flags & (MNT_DEFERRED | MNT_RECURSE)) != 0) + return (EINVAL); if (jailed(td->td_ucred) || usermount == 0) { error = priv_check(td, PRIV_VFS_UNMOUNT); if (error) From nobody Mon Feb 16 06:23: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 4fDt4V34lQz6SM2m for ; Mon, 16 Feb 2026 06:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDt4T6yWFz3QJn for ; Mon, 16 Feb 2026 06:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSqzJsNZM4oEbYAfMPijize2Bw7vGjH30QyqNJNHC6o=; b=CKS1TA+8VYrNO4dx2TdMqjbMdRfpK8Jkb1zUOFeUIxdutaNrTpnw7mebyzkrrf+PceeDFy //1+b6OPqnfMbT5tK5+aeR2aD/UPZBjkK2EKydmv6yr0/DDntJ/VFyGNYeOZS/UAU308MU 1ASa0/9jH8VQ76A/TpyoI8TEnPlZsCtoR4bHv5HVv7wpyXfrzH0zBgI0h/D+y9Ve5z64IE hP25sMZArEAYzOOjeQezk2ZFuSlh8gHVDWiWiwcE4gYiI2YP/DzUtytY2jxJf3y+wit0Ye rpjD1Z47JeaN0c1t73ppiiAthkAaXzWGRcJbp0c2xfPp747Xqh5CAg3kym+0ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222986; a=rsa-sha256; cv=none; b=aPAbZLU27Wee8rxQxEr/2Zdp0Tksh4B83h3tgRqW1L3hhZcNp3ACnq5eXwtVE83SGAqdc6 0asBPBRGEXkoMzuL83702a0ynw426I7hrSZYoE2xW+O/Ogcho2OojIP2UQ9HKELDUL77Du D8h/ptZcOGXmf7/Dh+YAlCll5Im/igOKcu0fY+VUp6kMfFh7xFlsaVj6koo1fmLDSM14/+ 5R7+DB3jHimhoIarx0NgAjZgHhY7lls/cplPVNInRy+UYxYdnPeVqUIl/yYdZLMqYYBcdX WJwrE86J+CcX/EX3zP257ujCMHZsZyIGaF5ouN/uzoi4Wx7LnAgak8AJjohcdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSqzJsNZM4oEbYAfMPijize2Bw7vGjH30QyqNJNHC6o=; b=vRoMnh6PA4Ny7JijrebMPploov8DSStKS6A3RgoHk0r0Ob3mTGNcojkwnWKc0w235CPAPc 9ptjjJIvBOdjyD0ENXGBvWHR1VHQUjUpkdJma4IMdoxCLZgjfCkGlHwMoVzF3MeBiMeAUm mF+81zdk77+aInEB4HyDORE+eDX3eANHJNX4SDBbWPnx9pmcBY2I6bMx6dQMoZKTPpIu5k GbKcwQ6Lt3ayHmN5dNPdglCwVFsvo7fU6Jf0HOM4zX9wQM4DN71DaCkSGkLC993yjkxLvP dYpqUDU0DzRfLnohUEgua+mGhBGVh1FR89DoOFuwIXQPr517wg0Uu3dcD1WdzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDt4T34qbz1QKq for ; Mon, 16 Feb 2026 06:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b6d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:23:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 00095a089604 - stable/14 - kern/vfs_unmount.c: promote flags to uint64_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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00095a089604aba93ef265fb0a52e170bcb77da7 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:23:05 +0000 Message-Id: <6992b7c9.3b6d4.58309b83@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=00095a089604aba93ef265fb0a52e170bcb77da7 commit 00095a089604aba93ef265fb0a52e170bcb77da7 Author: Konstantin Belousov AuthorDate: 2026-02-09 03:11:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:22:25 +0000 kern/vfs_unmount.c: promote flags to uint64_t (cherry picked from commit 8066b8923ebfd438dc8cb840d2f57066f4daa45d) --- sys/compat/linux/linux_file.c | 2 +- sys/kern/vfs_mount.c | 4 ++-- sys/sys/syscallsubr.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 1341df8bc7fc..4861dafe27b3 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1169,7 +1169,7 @@ linux_oldumount(struct thread *td, struct linux_oldumount_args *args) int linux_umount(struct thread *td, struct linux_umount_args *args) { - int flags; + uint64_t flags; flags = 0; if ((args->flags & LINUX_MNT_FORCE) != 0) { diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 5ca7c43269ce..b380a7fdaf6b 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1720,11 +1720,11 @@ int sys_unmount(struct thread *td, struct unmount_args *uap) { - return (kern_unmount(td, uap->path, uap->flags)); + return (kern_unmount(td, uap->path, (unsigned)uap->flags)); } int -kern_unmount(struct thread *td, const char *path, int flags) +kern_unmount(struct thread *td, const char *path, uint64_t flags) { struct nameidata nd; struct mount *mp; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8fafb8ace311..ab56b22978c2 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -390,7 +390,7 @@ int kern_wait6(struct thread *td, enum idtype idtype, id_t id, int *status, int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); -int kern_unmount(struct thread *td, const char *path, int flags); +int kern_unmount(struct thread *td, const char *path, uint64_t flags); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */ From nobody Mon Feb 16 10:01: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 4fDyw13842z6ScLG for ; Mon, 16 Feb 2026 10:01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDyw115J8z3mmL for ; Mon, 16 Feb 2026 10:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771236065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UwV82Y1BGDIlPUpeKH6aS4+V/ZFgXKloE4MCwTXW07c=; b=R/ftpG0RhRh2GN2VQ/AVkIv46DZoB3cuhxjQneNA1G5zOpCznQfhAErlLO4b3f0CLmUj0P ffzhuetixodGUWBi1rsrwyEgoTaq0FjYhVrUBgwNhuuhZDEQdzypCG15zXUsqhqoRx50uI Or8cxvpdZ72w/jLrM2YWFhmN1ug/MQfuiEvPUSw3kbdrJJ0rVGYLby6xt05yq3KtcmQXkB Y8wrbHGyoyqsyFWTeJdwfvG6v5a8kN3gMyHLVdQt9qvaX5mreAomyf7CD6HoXI80h7Dw9D k6qY4NFIQlfNXnTnnl2F8nplbuBmfBohDa0fCTjA0sHvXdp5J3XmcLGGI6asRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771236065; a=rsa-sha256; cv=none; b=XGb5IK22eBKtdu6wtVFQo6X5x06ER1DctDWAs1Qy0/ExoaJD69pyOVoC4P+C6uRbrkxHFY ogXOLIKUZznn98LnJbx1Wsg+xnqFBFOeTCLIADr20NpN7ptRdwlgwQwuzt0mneZDpdWclz wM9NyLmN4jkCMjfbXbUwF6kRDC+wPGdt0kO7Z5mA50cHS/3qbsx/W5hYXhNyeXNRBaJn2R 7OghZmx80wAgSriEkm1OGhNQHauC2qI7Y9i73OGyLdzS2uXRkXfK1mn7Szc9x4fkwT4bxN L/n9SW3/psROygGDe+1xV+WnH7bKKnIClCNMyS7mK9y/8H9xLUfMoLzAdT8MEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771236065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UwV82Y1BGDIlPUpeKH6aS4+V/ZFgXKloE4MCwTXW07c=; b=OtTkg9Ax0inZUaFCHuuWz9J06k5t9P6JglhYuEwCWTzo8p9GqBRwWKive9jgEN0UyLRoCz p+elJ6bY32abHZ3XW3mkQWVPeQsgoWXNGwOJNU1fBnd5ypB3Agl4DryhMZOQi6GqBGv1Hd fgsRcNVgi9rKgYrnvpLCxzahiTn3C2hsVYrPJ6mMQK0dUXeldLJc/c91c6Co6RfP0I84o/ oExudCNSVlhVW805vbE/eSdfxdlN6RoxYV1oQggzOXif5g7fTSaax2PP2gFNhabtKuAmcM ydt8V1pUg3MFMGCXyB111bG1QbMc9bFF0A3ctFmYcAjdbLVoal4ouEOr8F0vWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDyw10dbRz371 for ; Mon, 16 Feb 2026 10:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24129 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 10:01:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fe1299f16c55 - stable/15 - lagg: Avoid dropping locks when starting the interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fe1299f16c55f09fa053e71bf1e1feee7f32527f Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 10:01:05 +0000 Message-Id: <6992eae1.24129.509b476e@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fe1299f16c55f09fa053e71bf1e1feee7f32527f commit fe1299f16c55f09fa053e71bf1e1feee7f32527f Author: Zhenlei Huang AuthorDate: 2026-02-11 18:15:41 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-16 10:00:30 +0000 lagg: Avoid dropping locks when starting the interface The init routine of a lagg(4) interface will not change during the whole lifecycle. So we can call lagg_init() directly instead of through the function pointer. Well, that requires a drop and pickup lock, which unnecessarily expose a small race window. Refactor lagg_init() into lagg_init_locked() and call the later one to avoid that. Meanwhile, delay updating the driver managed status until after the interface is really ready. Reviewed by: markj MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55198 (cherry picked from commit c182cf646a4f995fa8506afd8afc9541c4d32905) --- sys/net/if_lagg.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index c30af5bfcc4e..23ad4f72d255 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -139,6 +139,7 @@ static int lagg_port_checkstacking(struct lagg_softc *); static void lagg_port2req(struct lagg_port *, struct lagg_reqport *); static void lagg_if_updown(struct lagg_softc *, bool); static void lagg_init(void *); +static void lagg_init_locked(struct lagg_softc *); static void lagg_stop(struct lagg_softc *); static int lagg_ioctl(struct ifnet *, u_long, caddr_t); #if defined(KERN_TLS) || defined(RATELIMIT) @@ -1282,16 +1283,21 @@ static void lagg_init(void *xsc) { struct lagg_softc *sc = (struct lagg_softc *)xsc; + + LAGG_XLOCK(sc); + lagg_init_locked(sc); + LAGG_XUNLOCK(sc); +} + +static void +lagg_init_locked(struct lagg_softc *sc) +{ struct ifnet *ifp = sc->sc_ifp; struct lagg_port *lp; - LAGG_XLOCK(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - LAGG_XUNLOCK(sc); + LAGG_XLOCK_ASSERT(sc); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) return; - } - - ifp->if_drv_flags |= IFF_DRV_RUNNING; /* * Update the port lladdrs if needed. @@ -1313,8 +1319,7 @@ lagg_init(void *xsc) lagg_watchdog_infiniband(sc); mtx_unlock(&sc->sc_mtx); } - - LAGG_XUNLOCK(sc); + ifp->if_drv_flags |= IFF_DRV_RUNNING; } static void @@ -1677,24 +1682,21 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) lagg_setflags(lp, 1); } - if (!(ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) { + if ((ifp->if_flags & IFF_UP) == 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) /* * If interface is marked down and it is running, * then stop and disable it. */ lagg_stop(sc); - LAGG_XUNLOCK(sc); - } else if ((ifp->if_flags & IFF_UP) && - !(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + else if ((ifp->if_flags & IFF_UP) != 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) /* * If interface is marked up and it is stopped, then * start it. */ - LAGG_XUNLOCK(sc); - (*ifp->if_init)(sc); - } else - LAGG_XUNLOCK(sc); + lagg_init_locked(sc); + LAGG_XUNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: From nobody Mon Feb 16 10:01: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 4fDyw01qlSz6ScBl for ; Mon, 16 Feb 2026 10:01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDyw00my1z3mrw for ; Mon, 16 Feb 2026 10:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771236064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXagH3MpUTomqaTmiWTD50schqRIWGsQQGOk/YNBZH0=; b=d0QtLTj1moA/UO6jVnyOqd8qzi/wnQGMbkJCD+8HQsBHUIkJe2DvY/oI56qP53GrghdDaV 9fTW6DdKyQ1i0jXloxlS+3c4/7143RTBawT3vCtyWm5w5/3ma+rPyn0mQqfdzp2PTyYGSA eLE/3VXDh4kAsf9zEF1tNwRlUWJIAI66OStBminOXEE+3yXGoqAEbrQF0e6xaDxBhU2QXM sG09NxnNIFNRdi+k9VcsqcwHlUfAFyDdbf6kCta5FdoKxjdFjXBwyEJ5frn/+5QVGFjWcL +Q/oKf5L+85UGGdwcuIHD2hIdkwvObOcJKF4qFLw6vgCJzKL0tqO4sF3wRzQTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771236064; a=rsa-sha256; cv=none; b=O+//Z6dj4ild1LQQbtssF8ijbPu2RabCnXP/Q8IrK/eP+BafDpG+ZOWMPs2j8KCxAjowt7 nGZk7Esdrv1LlaCint54mzBXirvh9FcJwE/wNm+scXBhQq+CNrByt/HSLJMwQXZvjV9N4y mGVeDpBjYC6q53YQYjtpFPftNAxTvmH3deBbIIR1v0byroDmDGYQyci0PMl2nSRyiX6J+u 7hUbQb56zgAySukDLZe51irzblccheg3VXMO/u/5hfvE5NbNpNITgXu4RUiEu2oNtnA0/g 6XQ3nAhAOM9k6xYlarD6UvJX1oV03F7UMl7yo/Caz/T7jaC2emOjgPRePBN1BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771236064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXagH3MpUTomqaTmiWTD50schqRIWGsQQGOk/YNBZH0=; b=c39JBlCfhbIyJ0BWG/+qOLqS26RjOOJVteORdAvwhn/JgnsgJhDSXkufdWwY9UXQvuoOCs wf8ztHauntif4JswWjg9X5pNOtPz2k+U9eoBtvsv9BWGjeurxIA/h8zCWvzvhe/3mTiV+U AKFx7zlrF7/tLIiYpmUayIxyOmexZcpjDMQDmuNvLiOZpCl+ce2uFzBtErrsUF0x6xzRBj o0S7N4mjL3z0h6Lv/+r6jZfjyAv8kIByGQ196YqAUTo4QNpXGg9yDUkKmiWiZR0Qh8lACH qKvCbpf2w5GjPoTobhslM/t8PjV7MPa4QJBOBuygqKhLZecgZLfae6msaHsxbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDyw00GYPz3XN for ; Mon, 16 Feb 2026 10:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2375c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 10:01:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6ceb731a9897 - stable/15 - lagg: Make lagg_link_active() static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6ceb731a989756126f4bfb00adc57646a11cad75 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 10:01:04 +0000 Message-Id: <6992eae0.2375c.2bd2f182@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6ceb731a989756126f4bfb00adc57646a11cad75 commit 6ceb731a989756126f4bfb00adc57646a11cad75 Author: Zhenlei Huang AuthorDate: 2026-02-09 17:48:07 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-16 10:00:30 +0000 lagg: Make lagg_link_active() static It is declared as static. Make the definition consistent with the declaration. It was ever fixed by commit 52e53e2de0ec, but the commit was reverted, leaving it unfixed. No functional change intended. MFC after: 3 days (cherry picked from commit 30988d0a7bd7ebd5f5825b9b7aa04ff0af788aa7) --- sys/net/if_lagg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 1e4d3d8d85ac..c30af5bfcc4e 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2326,7 +2326,7 @@ lagg_port_state(struct ifnet *ifp, int state) LAGG_XUNLOCK(sc); } -struct lagg_port * +static struct lagg_port * lagg_link_active(struct lagg_softc *sc, struct lagg_port *lp) { struct lagg_port *lp_next, *rval = NULL; From nobody Mon Feb 16 15: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 4fF6X50MFnz6Rxjt for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6X46N0xz4PM8 for ; Mon, 16 Feb 2026 15: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=1771256660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpr4TuBD3CAs3x28y/NysdrFjlzEah3wTJ4wO6ICcLs=; b=oz78xmUCC6XPEkxfdP4HDF4dBKx4PEr+4hFNeAB9KSeZkADqV7dV1Sy5vRyRPdVP5RBXys tKWGCGD9ytgy8zZpOkuXGk0HyvaI7CUpROTwRbYyKD0QWP1meFTMqIQhp+OlR1HP8tzLHC pdiSTN0TXt7aYUU6eIHKFf1BIXljBSxvXfTsDTMxRZeZK2V5VEGzgqzfZ5dtTnHFQ8f7h3 J+hEmUrIuq7V93r8PYFihgH3dBx9wIHtjagni/0elqteBZYBUWt8WzzxqqEER742HNDVKh UFZrFKaaMhl44PUHFEOAtk6Dz1K756Ns7fGRHKWqytQbsJtzluPH//dkQ4C2tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256660; a=rsa-sha256; cv=none; b=bB12yCly5B54Gt7Xlx7Odd7ZHaLa5kKjUHM+FFkrQp4mBXKOAXEWvoKv27Xnpm4/4E6LTn 3vBGAsJGj4iCQuKovSEL/DvNMDQ+uddtD/qUjyHLN20Od5TzMijfgMB6BGubBOVVl77D76 T4k7Vc040tNYnL0505Bw/5AmoVYQVek7vCXbpg4KIxnWmabJFr0zSvvUmQVwuKFfexn824 Wdfob9BJgNbpVxQztCuYwRkOjIM5c6vWFK9puZOVOHxUVYwraxhGvTaxwtbY4JDPC3JT2+ ZokIDvWtlydcmqaHbF8MmnU4E/xFhWwfOy+BoKl9i1/M69bRI0FIvbrJ0YFrVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpr4TuBD3CAs3x28y/NysdrFjlzEah3wTJ4wO6ICcLs=; b=AO5L28vYSyITkmvY3Tr3OybxZCc4lbDKjelYt/kUGt2RrHbqof2wlRad+rRAE4nBYc8ENl HA5/aVlj1YklSlLr1u3VkLraQcsGRChtMoAEjyogUIQWFkmbymF7j1PtUUkmNb9GNBv6eF 7nAmf7ubY4KBJeRcxLlwza99GvyBaEZYgdDj13VE/Mg7Dyji5l/ZKH1efhrcsp3beHeeEd IlbNyTOo7rzVyx9E45BGKcnlNqFY9Neq4IOcU7vYCoRvY8t1+dfewbiI0Y01C+A4j8RbO6 m7Qb7B00kjveZf3H6XkwB3UuGO5ZcMQ1USjFkZ8lbsJPb/tP/Fcm39MfpEmjHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6X45rNHzTvg for ; Mon, 16 Feb 2026 15:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fdfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8bc4cbacd1dc - stable/15 - ip_mroute: Convert to using a regular mutex List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8bc4cbacd1dcca986645a4497c41bf61ed9248fe Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:20 +0000 Message-Id: <69933b54.1fdfe.72109eee@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc4cbacd1dcca986645a4497c41bf61ed9248fe commit 8bc4cbacd1dcca986645a4497c41bf61ed9248fe Author: Mark Johnston AuthorDate: 2026-01-27 14:58:02 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:10 +0000 ip_mroute: Convert to using a regular mutex The multicast routing code was using spin mutexes for packet counting, but there is no reason to use them instead of regular mutexes, given that none of this code runs in an interrupt context. Convert to using default mutexes. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54603 (cherry picked from commit a265c8b4a5a7c8fdd33e27b8f74bd2a514f82c70) --- sys/netinet/ip_mroute.c | 35 ++++++++++++++++++----------------- sys/netinet/ip_mroute.h | 10 +++++----- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 267d76111780..73f17adf5728 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -607,12 +607,12 @@ get_vif_cnt(struct sioc_vif_req *req) return EINVAL; } - mtx_lock_spin(&V_viftable[vifi].v_spin); + mtx_lock(&V_viftable[vifi].v_mtx); req->icount = V_viftable[vifi].v_pkt_in; req->ocount = V_viftable[vifi].v_pkt_out; req->ibytes = V_viftable[vifi].v_bytes_in; req->obytes = V_viftable[vifi].v_bytes_out; - mtx_unlock_spin(&V_viftable[vifi].v_spin); + mtx_unlock(&V_viftable[vifi].v_mtx); MRW_RUNLOCK(); return 0; @@ -1005,8 +1005,8 @@ add_vif(struct vifctl *vifcp) vifp->v_pkt_out = 0; vifp->v_bytes_in = 0; vifp->v_bytes_out = 0; - sprintf(vifp->v_spin_name, "BM[%d] spin", vifcp->vifc_vifi); - mtx_init(&vifp->v_spin, vifp->v_spin_name, NULL, MTX_SPIN); + sprintf(vifp->v_mtx_name, "BM[%d] mtx", vifcp->vifc_vifi); + mtx_init(&vifp->v_mtx, vifp->v_mtx_name, NULL, MTX_DEF); /* Adjust numvifs up if the vifi is higher than numvifs */ if (V_numvifs <= vifcp->vifc_vifi) @@ -1054,7 +1054,7 @@ del_vif_locked(vifi_t vifi, struct ifnet **ifp_multi_leave, struct ifnet **ifp_f } } - mtx_destroy(&vifp->v_spin); + mtx_destroy(&vifp->v_mtx); bzero((caddr_t)vifp, sizeof (*vifp)); @@ -1660,7 +1660,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) } /* If I sourced this packet, it counts as output, else it was input. */ - mtx_lock_spin(&V_viftable[vifi].v_spin); + mtx_lock(&V_viftable[vifi].v_mtx); if (in_hosteq(ip->ip_src, V_viftable[vifi].v_lcl_addr)) { V_viftable[vifi].v_pkt_out++; V_viftable[vifi].v_bytes_out += plen; @@ -1668,7 +1668,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) V_viftable[vifi].v_pkt_in++; V_viftable[vifi].v_bytes_in += plen; } - mtx_unlock_spin(&V_viftable[vifi].v_spin); + mtx_unlock(&V_viftable[vifi].v_mtx); rt->mfc_pkt_cnt++; rt->mfc_byte_cnt += plen; @@ -1705,14 +1705,14 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) for (x = rt->mfc_bw_meter_leq; x != NULL; x = x->bm_mfc_next) { /* * Record that a packet is received. - * Spin lock has to be taken as callout context + * A lock has to be taken as callout context * (expire_bw_meter_leq) might modify these fields * as well */ - mtx_lock_spin(&x->bm_spin); + mtx_lock(&x->bm_mtx); x->bm_measured.b_packets++; x->bm_measured.b_bytes += plen; - mtx_unlock_spin(&x->bm_spin); + mtx_unlock(&x->bm_mtx); } } @@ -1895,13 +1895,14 @@ expire_bw_meter_leq(void *arg) /* Reset counters */ x->bm_start_time = now; - /* Spin lock has to be taken as ip_forward context + /* + * The lock has to be taken as ip_forward context * might modify these fields as well */ - mtx_lock_spin(&x->bm_spin); + mtx_lock(&x->bm_mtx); x->bm_measured.b_bytes = 0; x->bm_measured.b_packets = 0; - mtx_unlock_spin(&x->bm_spin); + mtx_unlock(&x->bm_mtx); callout_schedule(&x->bm_meter_callout, tvtohz(&x->bm_threshold.b_time)); @@ -1987,8 +1988,8 @@ add_bw_upcall(struct bw_upcall *req) x->bm_time_next = NULL; x->bm_mfc = mfc; x->arg = curvnet; - sprintf(x->bm_spin_name, "BM spin %p", x); - mtx_init(&x->bm_spin, x->bm_spin_name, NULL, MTX_SPIN); + sprintf(x->bm_mtx_name, "BM mtx %p", x); + mtx_init(&x->bm_mtx, x->bm_mtx_name, NULL, MTX_DEF); /* For LEQ case create periodic callout */ if (req->bu_flags & BW_UPCALL_LEQ) { @@ -2015,7 +2016,7 @@ free_bw_list(struct bw_meter *list) /* MRW_WLOCK must be held here */ if (x->bm_flags & BW_METER_LEQ) { callout_drain(&x->bm_meter_callout); - mtx_destroy(&x->bm_spin); + mtx_destroy(&x->bm_mtx); } list = list->bm_mfc_next; @@ -2116,7 +2117,7 @@ bw_meter_geq_receive_packet(struct bw_meter *x, int plen, struct timeval *nowp) /* * Processing for ">=" type of bw_meter entry. - * bm_spin does not have to be hold here as in GEQ + * bm_mtx does not have to be hold here as in GEQ * case this is the only context accessing bm_measured. */ if (BW_TIMEVALCMP(&delta, &x->bm_threshold.b_time, >)) { diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 2c71dc10dfd9..ed98e59a7c77 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -262,9 +262,9 @@ struct vif { u_long v_bytes_in; /* # bytes in on interface */ u_long v_bytes_out; /* # bytes out on interface */ #ifdef _KERNEL -#define MROUTE_VIF_SYSCTL_LEN __offsetof(struct vif, v_spin) - struct mtx v_spin; /* Spin mutex for pkt stats */ - char v_spin_name[32]; +#define MROUTE_VIF_SYSCTL_LEN __offsetof(struct vif, v_mtx) + struct mtx v_mtx; /* mutex for pkt stats */ + char v_mtx_name[32]; #endif }; @@ -350,8 +350,8 @@ struct bw_meter { #ifdef _KERNEL struct callout bm_meter_callout; /* Periodic callout */ void* arg; /* custom argument */ - struct mtx bm_spin; /* meter spin lock */ - char bm_spin_name[32]; + struct mtx bm_mtx; /* meter lock */ + char bm_mtx_name[32]; #endif }; From nobody Mon Feb 16 15: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 4fF6X60gVPz6RxZR for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6X56Ztsz4P1Y for ; Mon, 16 Feb 2026 15:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFCxEMXUHTv4sA4uy4zZO2GaAp+YIbg5zbMxDTeVUfc=; b=WKzUaVtXbSlTpNjXZnmbbc6OUEgq6N2tUG8PYMnnKFFd9tk/ORxXOorrW++qbPm60vcB/0 1MTZhA68tlz867OkJuSqkaB+484idbOlatUNgM5DWT0TDAeKTVIS07PVwhWccz3HTes//z KD7nbNi7FzLYOZNV2S3ZijWt3G/owa+CRLX7UsE6M5LXK4Hm2P7NrpBwSOZoOAd4U2iCM2 iCbb5H0cUnt/CHx2qDZ3YwuickG5vqAEnmwrRDG21sYLs9Opu2MJW/8IH0vnYGAUa1tAAe T5CUzAh5NrQwPJGdLF9QCCkpeoHAhN3YiBAp5uI9aAmxiNonYdQ3YXgRUYYLCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256661; a=rsa-sha256; cv=none; b=Ltf3W89FTiolLxaE2NsxcPLs0NDLInnKcCLTvLpVUr2fbvU1vRiYiVBkuMfOyqkZUzi7qq 5fgijxUVr9+fRwmlQYun+ZLwr9DlSdCUgtZJehGYcrmOzkWfUXzWN2J0wh+WXBtW97oavI 1xfudaSMTGG+o0yNIfLyfYUYNZbhpws5Pxv2GluZoiw9hMq2BGSn0x7HFvNct/oDaGRUie x9aveW+D0tTSoHtb1sIZ879yYQKeUpZqyPRRbhd1quTj140mEGceB6JuYJZC5LiTLAxQX2 D0Vh0l71WN3LKMympsvMB3ltu+E8C8SD//j4pWfE/OZgEISBtePk3uCQDFZxww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFCxEMXUHTv4sA4uy4zZO2GaAp+YIbg5zbMxDTeVUfc=; b=jVleW7CXtNl3RE+On2mgSj5xHd6xckol0XuoapmF2QCiTrG6fF3mYpO6ECarZwANO4zrdE mReOIZ+dkS2iFGo3MOStLtxXsGqPfqxCDmYH/zcTNNVBBh+K/+n2mcgJS7twvJfgeflSXN fPV07TRG02q6kqO8+EfrF6/FyXC5LI5VSi7hMMurdN/wN+xVGhcThDIYWuiQOzGosZtcs0 FHfiYh5v3Meansom6/UAfhDbIM1UVcS5AXzSD1FGhLjo9Mntt4PiwdyYnFdR31op1mfqOG y0Pneb78x69CQaW5paMy9LZgvzzBUp7Jj4M2kQN0AAbc5SfD4BBowV0bA00zBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6X56BYszTdL for ; Mon, 16 Feb 2026 15:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f13a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 12f619de32cc - stable/15 - divert: Update divert.4 to mention pf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12f619de32cc5988031f0bb384711d5653ed7176 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:21 +0000 Message-Id: <69933b55.1f13a.2d262561@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=12f619de32cc5988031f0bb384711d5653ed7176 commit 12f619de32cc5988031f0bb384711d5653ed7176 Author: Mark Johnston AuthorDate: 2026-01-27 13:48:22 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:10 +0000 divert: Update divert.4 to mention pf pf's divert-to action can be used to pass packets to a divert socket, but divert.4 didn't mention this, only referencing ipfw. Try to make the text a bit more general. Reviewed by: igoro, kp, glebius MFC after: 2 weeks Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54848 (cherry picked from commit 120c0bb833977707fc56f59b0961994fbd6c52e7) --- share/man/man4/divert.4 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4 index 5732099bd447..647bb72ab49b 100644 --- a/share/man/man4/divert.4 +++ b/share/man/man4/divert.4 @@ -1,5 +1,5 @@ .\" -.Dd August 30, 2022 +.Dd January 23, 2026 .Dt DIVERT 4 .Os .Sh NAME @@ -15,7 +15,6 @@ To enable support for divert sockets, place the following lines in the kernel configuration file: .Bd -ragged -offset indent -.Cd "options IPFIREWALL" .Cd "options IPDIVERT" .Ed .Pp @@ -25,14 +24,15 @@ as a module at boot time, add the following lines into the .Xr loader.conf 5 file: .Bd -literal -offset indent -ipfw_load="YES" ipdivert_load="YES" .Ed .Sh DESCRIPTION Divert sockets allow to intercept and re-inject packets flowing through the .Xr ipfw 4 -firewall. +and +.Xr pf 4 +firewalls. A divert socket can be bound to a specific .Nm port via the @@ -43,13 +43,15 @@ desired value. Note that the .Nm port has nothing to do with TCP/UDP ports. -It is just a cookie number, that allows to differentiate between different -divert points in the +It is just a cookie whose value depends on the firewall in use. +For .Xr ipfw 4 -ruleset. +this is the number of the rule which diverted the packet; for +.Xr pf 4 +this is a value which indicates the original direction through the +firewall of the diverted packet. A divert socket bound to a divert port will receive all packets diverted -to that port by -.Xr ipfw 4 . +to that port by the firewall. Packets may also be written to a divert port, in which case they re-enter firewall processing at the next rule. .Pp @@ -67,8 +69,8 @@ Diverted packets may be read unaltered via or .Xr recvfrom 2 . In the latter case, the address returned will have its port set to -some tag supplied by the packet diverter, (usually the ipfw rule number) -and the IP address set to the (first) address of +some tag supplied by the packet diverter, (usually the cookie described +above) and the IP address set to the (first) address of the interface on which the packet was received (if the packet was incoming) or .Dv INADDR_ANY @@ -179,6 +181,7 @@ that was not associated with any interface. .Xr sendto 2 , .Xr socket 2 , .Xr ipfw 4 , +.Xr pf 4 , .Xr ipfw 8 .Sh AUTHORS .An Archie Cobbs Aq Mt archie@FreeBSD.org , @@ -186,8 +189,7 @@ Whistle Communications Corp. .Sh BUGS This is an attempt to provide a clean way for user mode processes to implement various IP tricks like address translation, but it -could be cleaner, and it is too dependent on -.Xr ipfw 8 . +could be cleaner. .Pp It is questionable whether incoming fragments should be reassembled before being diverted. From nobody Mon Feb 16 15:44: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 4fF6X74pLKz6RxpB for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6X70Tbnz4NwB for ; Mon, 16 Feb 2026 15: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=1771256663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DaCcpn3iuHGwXHNDTwetrLWqg9OCx4ASciAeF0anh/w=; b=l7tt7LvhaZI0+3gf8aTTCRWZxt1V8DiJ/vG5s9thHEJPJmq2qRBfCos73H5f29Pg2u0hMC 4ySDaKPsIo+1YZRVZfWfVs1mvKpM6fecpxx01ePfl6jYbY32JKeJP463Vh6oljfjPrwjZ7 V8S6pXJpACFE2hObvS9C/ZvPGYWHeD5ogqJuweCCzVd7IutD5gD8muKQqccjnQWhMSPrwB fd4EE+rzXSu/vSy1QvNmAWZvUi3h9D+HVYlnWoYuJyefvw7atuPf3cE0KCQiH9IpLm+Td8 Uq2+qP5RKVf69Zo+QcGDH56ZAFbVMxpDd/tLHNJpyjSuN3hDAKFAomaWjR1R2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256663; a=rsa-sha256; cv=none; b=vmAvEie2LW2n58Ur57nLRQJ5eIXeg8Ldu24aHkNqZLKXrWiUEegDKy2fpQJ5phGrmj7DhZ m6u8fKkuF6DRMV0jNF+FLYwOA1wZpRpqewnj0bUHjktditvKyn9iy0bC4dDCdbpZSqF2yM px7dQD0ZsUerTInluVV63sLYZdy2GrjQ8QE95DlTojlDFj8dWWZHUsh4afPeSlQwoY5bUr UT8miNS1PSRlxx2kcuwAW7+MuZhmIOKktHyIqDlbzCZqUTRNVtEhjM5EtL4dFHIgvKKBvO 4913TUmDbx7WrF04B+sDSp62CaHUqDLPa1uBjn7KYfgp+KTWgbyMgRS7uoEwbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DaCcpn3iuHGwXHNDTwetrLWqg9OCx4ASciAeF0anh/w=; b=QoJXMd8lCpTQTqcQON2ty4azgRooHIfMvpIG2gfb20Ky3pBbemVuGuUAkKFiZ5wK7C7CU1 uNg6OGDadyZd9y7tU1VsI+dn3gqyKZr1GJiFJpAYwrkVCKInkDQg6g1QHtvS7eJyF3hy0R 7A7+6YK+/ZvfXrr3jKHZAKCqK16Kr++yfyAW9ft24i7aPP5NEdCZih1cMDCUg9S/0znWbL 90o5mplxDGPZfJ0Y07D2rd1+HmJAnLqLMnVmjNXH2iwq91JRscuVtRuvhuP1A5bXOxcmns cMw1ChNi5ngkxDlwaYpg9g1ZHPggEbXtV8jT3jCpwMbSiNF+qnZoaY9Jl0eb2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6X66wXnzCnK for ; Mon, 16 Feb 2026 15:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 361b80310299 - stable/15 - vmm: Remove an unneeded NULL pointer check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 361b80310299f36a8e97dde7c08721868d9c805b Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:22 +0000 Message-Id: <69933b56.1fa8b.121643ad@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=361b80310299f36a8e97dde7c08721868d9c805b commit 361b80310299f36a8e97dde7c08721868d9c805b Author: Mark Johnston AuthorDate: 2026-02-03 19:09:44 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:10 +0000 vmm: Remove an unneeded NULL pointer check sc->vm is unconditionally dereferenced earlier in this function. No functional change intended. Reviewed by: bnovkov MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55069 (cherry picked from commit 2d0564b9daf49c46e0e4ef6c7d162c73fc8b35d7) --- sys/dev/vmm/vmm_dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index d6543bf6534e..6e7be320234c 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -895,8 +895,7 @@ vmmdev_destroy(struct vmmdev_softc *sc) free(dsc, M_VMMDEV); } - if (sc->vm != NULL) - vm_destroy(sc->vm); + vm_destroy(sc->vm); if (sc->ucred != NULL) crfree(sc->ucred); From nobody Mon Feb 16 15: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 4fF6X84Ppyz6Rxk0 for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6X81h5gz4P1n for ; Mon, 16 Feb 2026 15: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=1771256664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1smZ8mJoaa4qeygOSqkVkpb/u/jDH9zYRHqkPQTN5WE=; b=uV7batGYB+aUr5QA6+AD5CiABmR/4wwyHHx1lMNTRkbilH29f6aefYcRiOfiCa0ZuUoh0Y jvNWWwLUVxVHdgINGTXyH73CVfA6dvtRY6K8ukFYJM0LPvnIqiGEm2T7w1FAsrzpSVN5/j U7q/njdwU6G6vWxtzsa1dnaY8f6hZhJQFooOHjOKCDsJMFxF4g9X1+HM3lbOp6mXyzaUwR bK4iPFq0StNHRB4C69PdtALv5Peoo4Yugya4G+rBcfKfyjyqNG3jQsgOx1yrFDlQ8PH0sm PnTTBJIrWPy/iE/17RoD8aqIsm33tAwNxuXxgxV7DgUIYFgs72eLCKRSobzxvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256664; a=rsa-sha256; cv=none; b=Ofbefg8Rq4h9aXEyREJ5VYAs0aUlO90O3TDxs6txQd4awjKuVjPAKLDUhTUVzvusTQr964 FOu3BO2NSinxwuVIXRgVzcOPY7RTgOU42cdGtBzVK/fZkKbpeHaUWoUt2dia8BEaNJQCls RjZaoIHvE2MMFfhYvQweFO4Un7GWXioOwIPwvW+ejdt9ivSMP0r46yB96GmivfJ469TcRS 4SKRHqmFwA0TObjIYgVR30/GNSixlHTeY1DoIRDp1axX38TAJzv5Xx/lanrNFM4wr2KWe+ TdfZYeacPRMHqxVGyGap/0Bi16eOBbTbDw9hB8kRGIwNqe9XLc/ecxmG90c7Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1smZ8mJoaa4qeygOSqkVkpb/u/jDH9zYRHqkPQTN5WE=; b=YZHg6kHFyRRQJ3G62dPyc1qzmCJhEXO9Dhmd6MX32AYpQvSmnSj0+EK+DzqYsw3MdBT8DJ Qc3cwzdPxduu1tIu8y21YcvGZZpzcSIYJXu2ZIQlqov1gU/ua9pKfrxpTMF3tMDtJoueBq lz4ArQ86QeKLczyojQ20Jd4Qi3eR88WwfXq7+XegZl8uNT3tIYtQdrZUkFnf/20o/RB194 s5clboIbdXsE7usXf1eCtxSVG9TQvcQVFXD1goS3c61EpAzHPH2uj7+MmOVYBa8KBzc6f6 yMXpz9qz73lRZPYI9gHm+14LHX+JLyZNfCWkP23raXtThMLlsgwCKCe+5eek2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6X80ZdrzTyB for ; Mon, 16 Feb 2026 15:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f13e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 769bc6877399 - stable/15 - sdt: Enable on 32-bit powerpc and powerpc64le List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 769bc687739927d3e7115b27b3f4579883682459 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:24 +0000 Message-Id: <69933b58.1f13e.17e66ef8@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=769bc687739927d3e7115b27b3f4579883682459 commit 769bc687739927d3e7115b27b3f4579883682459 Author: Mark Johnston AuthorDate: 2026-02-04 14:48:34 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:10 +0000 sdt: Enable on 32-bit powerpc and powerpc64le Reviewed by: jhibbits, adrian MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54814 (cherry picked from commit 6e32e8d7d16148e9bad1e3544363f318582f4c13) --- sys/conf/files.powerpc | 2 +- sys/modules/dtrace/Makefile | 4 +--- sys/powerpc/powerpc/sdt_machdep.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0deada385f31..b1aa54c9aa64 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -391,7 +391,7 @@ powerpc/powerpc/platform.c standard powerpc/powerpc/platform_if.m standard powerpc/powerpc/ptrace_machdep.c standard powerpc/powerpc/sc_machdep.c optional sc -powerpc/powerpc/sdt_machdep.c optional powerpc64 kdtrace_hooks +powerpc/powerpc/sdt_machdep.c optional kdtrace_hooks powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode32.S optional powerpc | powerpcspe | compat_freebsd32 powerpc/powerpc/sigcode64.S optional powerpc64 | powerpc64le diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 3a3769b8b4b5..019b5e951dcf 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -9,6 +9,7 @@ SUBDIR= dtaudit \ fbt \ profile \ prototype \ + sdt \ systrace .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" @@ -31,8 +32,5 @@ SUBDIR+= fasttrap SUBDIR+= systrace_freebsd32 .endif .endif -.if ${MACHINE_CPUARCH} != "powerpc" || ${MACHINE_ARCH} == "powerpc64" -SUBDIR+= sdt -.endif .include diff --git a/sys/powerpc/powerpc/sdt_machdep.c b/sys/powerpc/powerpc/sdt_machdep.c index 8a84016a9571..04a4cc170769 100644 --- a/sys/powerpc/powerpc/sdt_machdep.c +++ b/sys/powerpc/powerpc/sdt_machdep.c @@ -37,8 +37,8 @@ sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) uint32_t instr; KASSERT(sdt_tracepoint_valid(patchpoint, target), - ("%s: invalid tracepoint %#lx -> %#lx", - __func__, patchpoint, target)); + ("%s: invalid tracepoint %#jx -> %#jx", + __func__, (uintmax_t)patchpoint, (uintmax_t)target)); instr = ((target - patchpoint) & 0x7fffffful) | 0x48000000; memcpy((void *)patchpoint, &instr, sizeof(instr)); From nobody Mon Feb 16 15: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 4fF6X94XYBz6RxY4 for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6X91pSlz4PQb for ; Mon, 16 Feb 2026 15: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=1771256665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NAxG6K/bKIJk5o747hROuuzaDbxWwIsJQrkGkwDVV0=; b=FofcMQ5HD/OM5XtIWHmtH3nFc13wofQtzH/IeiTTXncNMf0Hy62+hQ7ENvraVMHAoLD42m qUR0wg38Dy64LX2ZuUrH40m/YFTtMSYsZtG/yFxLlOHEz5mPVg27ybisoGfUjLsFicvspA R71ks4f/M1LU5qSmh5YWMKU+B7rKJr+wC9vjdlD5Zee4Pz8/frtDh+S0Srg51HWVe4xyGq aG+gv8h9E47RPR6dHQT1kaGT/fu2XjqTSNVBxctl6IM9UCu7osunhPDZzLGz5jeTa1vlPQ 3DERIiK0LbnPd1szy3fyAkyVz9NpEyEOWfXzWJuS1xTQWEbfDR7EDfTj0wh/yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256665; a=rsa-sha256; cv=none; b=CQvz9xUme252VDhggOpb2+PkPCFCNTZJFdN0ApiqwiKeWkvRXmaBT8QXPmMPY/0oF5gXHi TNdRgHGYAyTvNDB2Nx9Ze97MlNhzr90SprWzqnbsk23HuFtKhbUaFPDRjNZuFwvOVFwAHH aOX1UdAltot35dTe9713iVsQry+CP0Kia5dw4hlvqVbeZG6aQdR8rvHU1vQZDPA1rbEz4/ ntDQUtT3zfYuK9wo3XXa2zab2xjINWT4hFAFtyCrWthA+zq9PSeSkAxdV2Q4B66tiQ4c3d z9kOuDwXTUp2Xsux9ys6cJo5zZtzLPpgC0mKwDwCbQDe0ptWxnZyobd3sED9aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NAxG6K/bKIJk5o747hROuuzaDbxWwIsJQrkGkwDVV0=; b=V5d0pMX1x64kGfWZ2xGoUWc4vBsE5r7PUcxpuZw6hUP7ge2sLkxF1ToFUELsSZCYmUravt DQ5CuOPxzsGgGMUDTafgnpe1avbpsf/k21BbcHrad3Db6pUcyBozyv5RLvLTg1qwJvFsHa /bRthIGXSTrvLM20c/JgdEomt2ZiOb/1pUbkr2Kw9qa3VGGNLmjcQnB1ucXQieMa+ApaWK c4+Kx4lwS2iDbIQZ975UmAQU1cBLTOgunswd1R0+kUMX6HgXtejzPUSJlj8thqq2K+Z6JM KTZgl6OWjKtY7rKDAlHTqGJN0RbYHzh5+K6Y/ZGyplOTEEpl7c8FQVfY8lsFaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6X91Dr1zTsQ for ; Mon, 16 Feb 2026 15:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 93fe6d43f8ed - stable/15 - cpucontrol: Be more strict with input validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 93fe6d43f8ed01b9e1f98ce589b93a930ba0a540 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:25 +0000 Message-Id: <69933b59.1fcb4.435c4732@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=93fe6d43f8ed01b9e1f98ce589b93a930ba0a540 commit 93fe6d43f8ed01b9e1f98ce589b93a930ba0a540 Author: Mark Johnston AuthorDate: 2026-01-28 16:31:41 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 cpucontrol: Be more strict with input validation Avoid truncating 32-bit values. This would have saved me a bit of time when I was looking at a cpuid leaf on my system and typed 0x80000001f instead of 0x8000001f. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54919 (cherry picked from commit 59bbb62b6078afffd1c182b63d43934248289675) --- usr.sbin/cpucontrol/cpucontrol.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c index 9cc3968de01d..52e74a83b85b 100644 --- a/usr.sbin/cpucontrol/cpucontrol.c +++ b/usr.sbin/cpucontrol/cpucontrol.c @@ -36,7 +36,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -112,6 +114,21 @@ usage(void) exit(EX_USAGE); } +static uint32_t +strtouint32(const char *str, char **endptr, int base) +{ + uintmax_t val; + + errno = 0; + val = strtoumax(str, endptr, base); + if (*str == '\0' || errno == ERANGE || val > UINT32_MAX) { + WARNX(0, "invalid operand: %s", str); + exit(EX_USAGE); + /* NOTREACHED */ + } + return ((uint32_t)val); +} + static int do_cpuid(const char *cmdarg, const char *dev) { @@ -123,7 +140,7 @@ do_cpuid(const char *cmdarg, const char *dev) assert(cmdarg != NULL); assert(dev != NULL); - level = strtoul(cmdarg, &endptr, 16); + level = strtouint32(cmdarg, &endptr, 16); if (*cmdarg == '\0' || *endptr != '\0') { WARNX(0, "incorrect operand: %s", cmdarg); usage(); @@ -162,7 +179,7 @@ do_cpuid_count(const char *cmdarg, const char *dev) assert(cmdarg != NULL); assert(dev != NULL); - level = strtoul(cmdarg, &endptr, 16); + level = strtouint32(cmdarg, &endptr, 16); if (*cmdarg == '\0' || *endptr == '\0') { WARNX(0, "incorrect or missing operand: %s", cmdarg); usage(); @@ -172,7 +189,7 @@ do_cpuid_count(const char *cmdarg, const char *dev) cmdarg1 = strstr(endptr, ","); /* ... and skip past it */ cmdarg1 += 1; - level_type = strtoul(cmdarg1, &endptr1, 16); + level_type = strtouint32(cmdarg1, &endptr1, 16); if (*cmdarg1 == '\0' || *endptr1 != '\0') { WARNX(0, "incorrect or missing operand: %s", cmdarg); usage(); @@ -228,7 +245,7 @@ do_msr(const char *cmdarg, const char *dev) /* * Parse command string. */ - msr = strtoul(cmdarg, &endptr, 16); + msr = strtouint32(cmdarg, &endptr, 16); switch (*endptr) { case '\0': op = OP_READ; From nobody Mon Feb 16 15: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 4fF6XC6ZNfz6RxgP for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XC314Wz4P9C for ; Mon, 16 Feb 2026 15: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=1771256667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=veJJ83Y0cmBMTHy14QtOiuMLGeHME28c2lXsuamLFbc=; b=Sob15D99WmrbUVQhxF5DkzumZ38CTZ/gGMx5uJ0iq3gqFA8K1pLjE5X76f0uLLjfBZ/toP av/8vW8Xucg1mOX49WP3ZWoDSp5QBlEYppuy3N/PtjaraoxNo7biwUuJmcawkb7wWDSFMI 3+IeaY21E+SgUlFExiXZy/7lUNXPUKeyOgNvyeDqupq7f1F3X+0vdTJDhX303GPQR8ZjIe jzf+OzCkr4oesONsEh6zFfey1oXULlIvq8h3lVQUfNpQU+MHJvrS91Si8FpxwktNyLlGfx crWNajzQMFWGUxDg2LvwavMj9EcpgCQ9qnBagEXVv6rzyQT1QSzb0v+D00Gkig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256667; a=rsa-sha256; cv=none; b=JxuGCHYFEtTgZzDqahLBEnhNC2tL5vzJ+BGb7Dh0PVkHQ8bPTdqmyZVBNB850SxlRxXCIa JXnYQKLkPzJJykO/cf7k1JOp3O/4Tikyma/HfM8Wsfe+ehx6d+l9IDjxMd5+g6vlbCrlJ0 Nh2IagOpPgXtn9ZSuZVN0Im2XZUoy3oX1vk+3jgFW0Zd8wjUQziGNOefNCreK71AZRScS/ 6t0onZIZ6HZvsFrI51yd4l585p9XzCGHEBhEXqgZisC3PCl+zTOF2563vRJP1JjYyy6cas oYnrYmwdhoAj8GtfAZiyN8a2el3pwFyVcgCmeYxcKadgVDM/VMnaeL9rtFQ67w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=veJJ83Y0cmBMTHy14QtOiuMLGeHME28c2lXsuamLFbc=; b=aFIuxgY1Ov6b8ompKb6DAb0jZlBxQ8QdLh7BvvWuRWzqf8qPhXoH6o2P7Dqeoua+tsiz6I GtoJAbtPtxp00fhYWZkl+lTesjRCfLHzMVBchSe8NNjveiKW1ZsFVytwsm86RudP3uscYM xAA7Tg4pdI+mQ6gBN+uBJUFbsqqbtJ4YKEWkocHjepTB8JCK9BfsbwL8kq2LpRMkT8EH2f IU2XkwBRU/NYV81lnNXl/4AcKxPz27U+ku/0rVZvCKz+I5FtZRMFjo5KofXj/cYYl6Y4Lq LJSdJYGLlB3UpPH/qPcYiKVcf1h3YNxlC0e3mWR4wtRFk86AveS99FO8kSdU8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XC2VCXzTXT for ; Mon, 16 Feb 2026 15:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eab6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ebc9a98c1b7d - stable/15 - ip6_mroute: Mark functions as static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ebc9a98c1b7d0a47359dae34509e1d9c02767a88 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:27 +0000 Message-Id: <69933b5b.1eab6.22880dda@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ebc9a98c1b7d0a47359dae34509e1d9c02767a88 commit ebc9a98c1b7d0a47359dae34509e1d9c02767a88 Author: Mark Johnston AuthorDate: 2026-01-30 15:25:52 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 ip6_mroute: Mark functions as static No functional change intended. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit a03eabfebbce15d8ce028168969812d3ca2be206) --- sys/netinet6/ip6_mroute.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 36136f908307..3eaa8834171a 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -360,16 +360,16 @@ static int get_sg_cnt(struct sioc_sg_req6 *); static struct callout expire_upcalls_ch; -int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); -int X_ip6_mrouter_done(void); -int X_ip6_mrouter_set(struct socket *, struct sockopt *); -int X_ip6_mrouter_get(struct socket *, struct sockopt *); -int X_mrt6_ioctl(u_long, caddr_t); +static int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); +static int X_ip6_mrouter_done(void); +static int X_ip6_mrouter_set(struct socket *, struct sockopt *); +static int X_ip6_mrouter_get(struct socket *, struct sockopt *); +static int X_mrt6_ioctl(u_long, caddr_t); /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ -int +static int X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) { int error = 0; @@ -437,7 +437,7 @@ X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) /* * Handle MRT getsockopt commands */ -int +static int X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) { int error = 0; @@ -456,7 +456,7 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) /* * Handle ioctl commands to obtain information from the cache */ -int +static int X_mrt6_ioctl(u_long cmd, caddr_t data) { int ret; @@ -586,7 +586,7 @@ ip6_mrouter_init(struct socket *so, int v, int cmd) /* * Disable IPv6 multicast forwarding. */ -int +static int X_ip6_mrouter_done(void) { mifi_t mifi; @@ -1055,7 +1055,7 @@ socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in6 *src) * that if this function is called from somewhere else in the originating * context in the future. */ -int +static int X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) { struct rtdetq *rte; From nobody Mon Feb 16 15: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 4fF6XC038vz6RxdD for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XB28brz4PMr for ; Mon, 16 Feb 2026 15: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=1771256666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOu7YRU3VRm8yTRJPdtx8TsetGswcpX7abzaVnG2VPk=; b=j483MeNE3H3mQUYDY6Hx54BGdZ31HIalpOMllRbZvHAfQTzrKzpOBuYp7uvJdAzm/mJneE zwSB1wkXfDO4yPca2Cj5IEUjT8ALdM4UOeHxq32WqHH0/spcjbmTFj8AHDUnact7WH56jF yUPTOl4eafiemkNvSK5EkkoAgTWOuxEGJI5o7zt42W8yRc3FlGK6FHrE+X05vLQDNSXb2O wIXyGIwM8VrBhz95mLrW8JpafVE3lP2JWuTPlTgHWRvtHTX+3RypKWGEJICe8Etz+sZHcR dRWSiV/tFekp0SuuHhO2LTSlWQ6fcbceIcxmXBApR3mOmaD47FCUncaIyUpOXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256666; a=rsa-sha256; cv=none; b=WYP0SUkSE27bRBJJ7h09Pcil5/GjCdm2tDr4GfvhCOg+7oCgThr3VWaihyrVsy/inlMpb0 OktJ5dsOs55wZtPMhP1Nkfm7HO+aqRo7zELwnf1ejpwjQ70h0DeYKhFcuXYH9K/dPiHipI qyMb4qfrX4B0kkloej7NH4tyNTabACdPcpBLAWSf6yjil66rouPJHDxPyf96lWMDv+pOIt JjA5rP5ea07Nf/lDlb8hmkjKZH0yK1OLfXSOS2/Vi9L0y3E7tB8oI6FA2cfRp5M6rkvjWc 5Nmc/epDt3rF1EwAbhkNw6l7WiWRjPmfb2w9ZRs6YX1dZO1HsjgqMS5oaEYyaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOu7YRU3VRm8yTRJPdtx8TsetGswcpX7abzaVnG2VPk=; b=CoBz3wnT1ABTA7ICTTjQTs6DNVoTi2+Xno3G2lmRw45YS54QyRoM7X6uTCfAiLZ7GTwk71 Y2NlNNF4Q8qbR+XG3U5HiiiA3iU8Dy6rsDE36lfodxSHjw25fFhPhlYly7qNBPGmA5PCdY 1FOmNRoISFPKJxYLKw+FMY4cKDhXtwia7yYOAawoo9yQCdsBsL60psj3HHXPO3nDUB7xre d1ihXey995d4sJoLZ5bvQ7fAnwUkbpswiIs+GgBMEP1f/mXj73c65SA7CnSBJUMr8PZno/ iMyan+uoKfkgBhzq7XIf/vXeauDHP9KZ5oftGPtTBnBiDQfl2BH7mimKYMgdkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XB1lNRzTXR for ; Mon, 16 Feb 2026 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2085f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 147873a1a7d8 - stable/15 - ifconfig: Exit with a non-zero status when SIOCSIFFIB fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 147873a1a7d82de1c792f0afff11707954c83e02 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:26 +0000 Message-Id: <69933b5a.2085f.2dbc3f4d@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=147873a1a7d82de1c792f0afff11707954c83e02 commit 147873a1a7d82de1c792f0afff11707954c83e02 Author: Mark Johnston AuthorDate: 2026-01-28 16:11:47 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 ifconfig: Exit with a non-zero status when SIOCSIFFIB fails Previously, setting an interface FIB to some invalid value would result in a warning being printed, but the ifconfig command would exit with status 0, but this is wrong. Add a little regression test. Reviewed by: pouria, zlei, melifaro MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54918 (cherry picked from commit 2ea85a622bcba92a7b58901d6a6e945df3022c4e) --- sbin/ifconfig/iffib.c | 16 ++++++---------- sbin/ifconfig/tests/Makefile | 3 ++- sbin/ifconfig/tests/ifconfig.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c index a99dd6885d08..c1f9b3defb40 100644 --- a/sbin/ifconfig/iffib.c +++ b/sbin/ifconfig/iffib.c @@ -69,14 +69,12 @@ setiffib(if_ctx *ctx, const char *val, int dummy __unused) char *ep; fib = strtoul(val, &ep, 0); - if (*ep != '\0' || fib > UINT_MAX) { - warn("fib %s not valid", val); - return; - } + if (*ep != '\0' || fib > UINT_MAX) + errx(1, "fib %s not valid", val); ifr.ifr_fib = fib; if (ioctl_ctx_ifr(ctx, SIOCSIFFIB, &ifr) < 0) - warn("ioctl (SIOCSIFFIB)"); + err(1, "ioctl (SIOCSIFFIB)"); } static void @@ -87,14 +85,12 @@ settunfib(if_ctx *ctx, const char *val, int dummy __unused) char *ep; fib = strtoul(val, &ep, 0); - if (*ep != '\0' || fib > UINT_MAX) { - warn("fib %s not valid", val); - return; - } + if (*ep != '\0' || fib > UINT_MAX) + errx(1, "fib %s not valid", val); ifr.ifr_fib = fib; if (ioctl_ctx_ifr(ctx, SIOCSTUNFIB, &ifr) < 0) - warn("ioctl (SIOCSTUNFIB)"); + err(1, "ioctl (SIOCSTUNFIB)"); } static struct cmd fib_cmds[] = { diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index e902f262552a..8203c97cb013 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,5 +1,6 @@ NETBSD_ATF_TESTS_SH= nonexistent_test -ATF_TESTS_SH+= inet6 +ATF_TESTS_SH+= ifconfig \ + inet6 TEST_METADATA+= execenv="jail" TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" diff --git a/sbin/ifconfig/tests/ifconfig.sh b/sbin/ifconfig/tests/ifconfig.sh new file mode 100644 index 000000000000..f95581ea97ba --- /dev/null +++ b/sbin/ifconfig/tests/ifconfig.sh @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2026 Stormshield + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +atf_test_case "badfib" "cleanup" +badfib_head() +{ + atf_set descr "Test adding an interface to a non-existent FIB" + atf_set require.user root +} +badfib_body() +{ + local epair + + vnet_init + + epair=$(vnet_mkepair) + atf_check -s exit:0 ifconfig ${epair}a fib 0 + atf_check -s not-exit:0 -e not-empty \ + ifconfig ${epair}a fib $(sysctl -n net.fibs) +} +badfib_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case badfib +} From nobody Mon Feb 16 15: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 4fF6XD6hq8z6RxdK for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XD45vpz4PTn for ; Mon, 16 Feb 2026 15: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=1771256668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQF9rNyz7x/qEUnPwH5Met79CZZNSPof5eGB5qtnOa8=; b=SaOjTUIRJq3rCnn4UmT8fUmmgiFyj5QNtkv1F3+OaUfADpN2stFZVVl5sIPe5N5Sf5aihc 0VAFjSRavX/9rJdhhm9WS6F6Jn10Ow6Uw58dXqLCYzMNTziisVC1LF6k8llq1ML6KRAufg 2TPkjIDfKZ6wEHPDTheLS356NMF37kl9uSHuUV2zeNfCJ2OVhgT5XivQG2YC5oIsAOBCSO k33Rrrs070B3wb8xRSgsWBpM6nQ0usm4YhVCETHt4WbrkO66YPoq7VKWnI38XqxG5n0MkO 1bTtOwfaMXHspgYgjEZABmD8uH8SvnGLr3sJH/0clsxA2md/jWVFCoQA3znehA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256668; a=rsa-sha256; cv=none; b=sBztq6ZDnOUALRrqyc9g3JmCjmJGjq7v47wzF+wTvQgQ+Xf80+JRsZfc/W3em3oTmsSuom bOW+F8eymaeWE/viUU06Rc7zCSdlL9WaqbBsuOw/okgtwb+90NDGCir/h32wiq7E/CyC7/ lCS1vtZLJfXwqp2sraYRwcagcnP5iNDAHF1zTm/Su5F5jsL8T33FOfGq6t+J9pSF6GQCye xVyBcwdNKfJ84tV/fKnz8A6RCx1MJYuOO444wsMmR5Z3ChOledI0GaNhnl8iBBk48jim37 gCS+lzyTIrW97ySTuMKeB+9FW+Vv4lqJQDw1CU8/68niSSQ/BWRiCuOgc39RGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQF9rNyz7x/qEUnPwH5Met79CZZNSPof5eGB5qtnOa8=; b=mlLYWlxApzsw/+SqBGSqCuSkbBA77WJVru4frdwQkqOfV5l/MezO0Gco3RlUu8XpaRIgaZ tG2bnPQvM5gzi/LyI5nOZvvjOGN7G5CbPYLx6Bxjm1W+CZsFgyr+ZCJTQ1Pk3/L8mVjfsX Qk6dt+yjVgNnwQgsjqZei1bLgbFk5I8xWI+AdDcXv1mHkbqiW4JMbuDNXehz2ZMvLSIcli Fam8+T8aTSH4kdC/LmBYidrat6xg8LzFBintkLTjUPvXevgxlZZ/mQzqu+VO2Q6mszNPe0 VQIy3CZGjdYty7zl/perZ34HFV5PDwnLwrAc6j0JUYSFXntWvsN/yULdcCgaMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XD3JGpzTXV for ; Mon, 16 Feb 2026 15:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2024f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d2b595debaf2 - stable/15 - netstat: Fix whitespace in libxo output for multicast routes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d2b595debaf2ff82a402c9226a77cd43cc97bb50 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:28 +0000 Message-Id: <69933b5c.2024f.534fee0c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2b595debaf2ff82a402c9226a77cd43cc97bb50 commit d2b595debaf2ff82a402c9226a77cd43cc97bb50 Author: Mark Johnston AuthorDate: 2026-01-30 20:30:58 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 netstat: Fix whitespace in libxo output for multicast routes Also fix some bogus libxo format strings in mroute6.c, and close a couple of lists instead of opening them twice. Fixes: ade9ccfe211a ("Convert netstat to use libxo.") MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit 34c3e1d718a86436f863b2ae8b91bcf406b37f0e) --- usr.bin/netstat/mroute.c | 11 +++++------ usr.bin/netstat/mroute6.c | 13 ++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c index 1577a6ae73ac..75c3c8477ea4 100644 --- a/usr.bin/netstat/mroute.c +++ b/usr.bin/netstat/mroute.c @@ -37,7 +37,6 @@ * SUCH DAMAGE. */ -#include /* * Print multicast routing structures and statistics. * @@ -157,7 +156,7 @@ print_bw_meter(struct bw_meter *bw_meter, int *banner_printed) } xo_emit(" {:remaining-time/%s}", s3); - xo_open_instance("bandwidth-meter"); + xo_close_instance("bandwidth-meter"); xo_emit("\n"); } @@ -186,9 +185,9 @@ print_mfc(struct mfc *m, int maxvif, int *banner_printed) } memcpy(&sin.sin_addr, &m->mfc_origin, sizeof(sin.sin_addr)); - xo_emit(" {:origin-address/%-15.15s}", routename(sa, numeric_addr)); + xo_emit(" {t:origin-address/%-*.15s}", 15, routename(sa, numeric_addr)); memcpy(&sin.sin_addr, &m->mfc_mcastgrp, sizeof(sin.sin_addr)); - xo_emit(" {:group-address/%-15.15s}", + xo_emit(" {t:group-address/%-15.15s}", routename(sa, numeric_addr)); xo_emit(" {:sent-packets/%9lu}", m->mfc_pkt_cnt); xo_emit(" {:parent/%3d} ", m->mfc_parent); @@ -303,12 +302,12 @@ mroutepr(void) xo_open_instance("vif"); memcpy(&sin.sin_addr, &v->v_lcl_addr, sizeof(sin.sin_addr)); - xo_emit(" {:vif/%2u} {:threshold/%6u} {:route/%-15.15s}", + xo_emit(" {:vif/%2u} {:threshold/%6u} {t:route/%-15.15s}", /* opposite math of add_vif() */ vifi, v->v_threshold, routename(sa, numeric_addr)); memcpy(&sin.sin_addr, &v->v_rmt_addr, sizeof(sin.sin_addr)); - xo_emit(" {:source/%-15.15s}", (v->v_flags & VIFF_TUNNEL) ? + xo_emit(" {t:source/%-15.15s}", (v->v_flags & VIFF_TUNNEL) ? routename(sa, numeric_addr) : ""); xo_emit(" {:received-packets/%9lu} {:sent-packets/%9lu}\n", diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c index 0bb44b8292e7..5898791dcbe6 100644 --- a/usr.bin/netstat/mroute6.c +++ b/usr.bin/netstat/mroute6.c @@ -65,7 +65,6 @@ * SUCH DAMAGE. */ -#include #ifdef INET6 #include #include @@ -151,7 +150,7 @@ mroute6pr(void) xo_close_instance("multicast-interface"); } if (banner_printed) - xo_open_list("multicast-interface"); + xo_close_list("multicast-interface"); else xo_emit("\n{T:IPv6 Multicast Interface Table is empty}\n"); @@ -172,19 +171,19 @@ mroute6pr(void) xo_open_list("multicast-forwarding-cache"); xo_emit("\n" "{T:IPv6 Multicast Forwarding Cache}\n"); - xo_emit(" {T:%-*.*s} {T:%-*.*s} {T:%s}", + xo_emit(" {T:/%-*.*s} {T:/%-*.*s} {T:/%s}\n", WID_ORG, WID_ORG, "Origin", WID_GRP, WID_GRP, "Group", - " Packets Waits In-Mif Out-Mifs\n"); + " Packets Waits In-Mif Out-Mifs"); banner_printed = 1; } xo_open_instance("multicast-forwarding-cache"); - xo_emit(" {:origin/%-*.*s}", WID_ORG, WID_ORG, + xo_emit(" {t:origin/%-*.*s}", WID_ORG, WID_ORG, routename(sin6tosa(&mfc.mf6c_origin), numeric_addr)); - xo_emit(" {:group/%-*.*s}", WID_GRP, WID_GRP, + xo_emit(" {t:group/%-*.*s}", WID_GRP, WID_GRP, routename(sin6tosa(&mfc.mf6c_mcastgrp), numeric_addr)); xo_emit(" {:total-packets/%9ju}", @@ -205,7 +204,7 @@ mroute6pr(void) xo_open_list("mif"); for (mifi = 0; mifi <= maxmif; mifi++) { if (IF_ISSET(mifi, &mfc.mf6c_ifset)) - xo_emit(" {l:%u}", mifi); + xo_emit(" {l:/%u}", mifi); } xo_close_list("mif"); xo_emit("\n"); From nobody Mon Feb 16 15: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 4fF6XH0Hrgz6RxVm for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XG5PMyz4P9n for ; Mon, 16 Feb 2026 15: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=1771256670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6Lm6PiK1Hcp0Uhv5ubVFjkurXbgxIxLULnF1o3wOWw=; b=CmCSA1R1WlGPquML45FJYfgVhd5EdV3QZXd7Ezod9aoeMc2ppdPXEd9WrrGaatOpDwlSwl ssqWfNsrvam829yrCvKoBJeGbDfYSSXICJ7XGbiJwhEw2FJGkOxlMuv4A3fnZ68VXYgm4T EpRC8WF5mNZ8Yl5Te8aO4pWqOotjtne+E3w0dGFLPsMV/LDb1tBFhy3/rp80nfeErfZxGu qBe8hZ0FEe7kJIJ6auxi+4Z1E97sJkxyWLZ3RbM6+cCUPXkWgBWBPn33A9iNjw0QXf/4/q ZsYf5iSaQBXH899xqnI82ImBB/o+ooE8bbTLbJWgegaX++7GznHDdi6L5uUNyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256670; a=rsa-sha256; cv=none; b=OPOhKjPlvBNzlpd/UzyvF8DI4CPRxL1hd9jAwm+QVVQI0gi4xk6piTz9s2fK0TJcsxzL0P dq0nYznNGzdsI94emGln9oJCNmmEyjA9pFm0OuZ8nW2sAQtwCrwonl7UxZYxSLxJBEDvyv 7W0+P4u05keq/YPLoEwIhsIXFsLGvrB8oS37VRPU9+xv+XJufgi3F3PjbPiEt9lSHwUEX5 2EYhrmnd8IP+r/qqRW2NKZEQIejPZ8cThEerRi7lmPg3ptPbFaoVzSsJ43IhY97v50Z1Rm G/9VWqiAhHJ6l3MGbGSIZLf7C5Ww52HMjYBfuOt/B5vfKRWnPIlwSfq0M4Cw4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6Lm6PiK1Hcp0Uhv5ubVFjkurXbgxIxLULnF1o3wOWw=; b=RbB9urjQAbG8y7RRUW/rZcumTnud/0fOD+Z2oLx4cXl5CBpkQVUOBShTePvyGRDtInBoDA hWXapgLYhi2lpV+68IxW2vNDAc31jBDnRh4WRRRd7lqdthUC4RYeNDudapdmYM9qT9Sj47 SdnjKyuGwzt7OImaU/IRTF1PTFJ8v7bC++imIHYuxuZPZj5FnYYMRnLoAFuSDaFzbcx0cs kEnVnFgT5DEDDvIGegFUg5RaR7JId3iHZWpaaw7XKEtVMbNnrfEh0+EGeDhkfhsExjbrul cPO9WmvQQaV3AZEeS64LfYPfxC6ddtJIjqw/50tAzsuKd0V4PzcpvaFpgA45lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XG4vxGzTZv for ; Mon, 16 Feb 2026 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f246 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d80fe2df0ec7 - stable/15 - bhyve: Use PCIOCGETCONF to find the host LPC bridge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d80fe2df0ec7561200a4a02cf123e1896b27784c Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:30 +0000 Message-Id: <69933b5e.1f246.5b466ec@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d80fe2df0ec7561200a4a02cf123e1896b27784c commit d80fe2df0ec7561200a4a02cf123e1896b27784c Author: Mark Johnston AuthorDate: 2026-01-26 21:05:06 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 bhyve: Use PCIOCGETCONF to find the host LPC bridge pci_host_read_config() requires write access to /dev/pci so cannot be used with unprivileged bhyve. The lpc init code uses it to find the host system's LPC bridge device and so was generating warnings with bhyve running as a non-root user. Refactor the implementation to use PCIOCGETCONF instead, which doesn't require any special privileges. This isn't formally necessary, as we only care about copying the host system's identifiers in order to support Intel GPU passthrough (see commit f4ceaff56ddaa), but it's straightforward and lets an unprivileged user run bhyve without seeing warnings about failing to open /dev/pci with write permissions. Reviewed by: corvink, rew MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54851 (cherry picked from commit 1db1e4bdc64f29661592a47f2feb690d7cf37957) --- usr.sbin/bhyve/amd64/pci_lpc.c | 79 +++++++++++++++++++++++++----------------- usr.sbin/bhyve/pci_emul.c | 22 ++++++------ usr.sbin/bhyve/pci_emul.h | 2 +- 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/usr.sbin/bhyve/amd64/pci_lpc.c b/usr.sbin/bhyve/amd64/pci_lpc.c index ed41a800a2ea..52e9faec22af 100644 --- a/usr.sbin/bhyve/amd64/pci_lpc.c +++ b/usr.sbin/bhyve/amd64/pci_lpc.c @@ -28,10 +28,12 @@ */ #include + #include #include #include +#include #include #include #include @@ -46,7 +48,6 @@ #include "pci_emul.h" #include "pci_irq.h" #include "pci_lpc.h" -#include "pci_passthru.h" #include "pctestdev.h" #include "tpm_device.h" #include "uart_emul.h" @@ -460,34 +461,48 @@ pci_lpc_read(struct pci_devinst *pi __unused, int baridx __unused, #define LPC_SUBDEV_0 0x0000 static int -pci_lpc_get_sel(struct pcisel *const sel) +pci_lpc_get_conf(struct pci_conf *conf) { - assert(sel != NULL); - - memset(sel, 0, sizeof(*sel)); - - for (uint8_t slot = 0; slot <= PCI_SLOTMAX; ++slot) { - uint8_t max_func = 0; - - sel->pc_dev = slot; - sel->pc_func = 0; + struct pci_conf_io pcio; + struct pci_match_conf pmc; + int pcifd; - if (pci_host_read_config(sel, PCIR_HDRTYPE, 1) & PCIM_MFDEV) - max_func = PCI_FUNCMAX; + pcifd = open("/dev/pci", O_RDONLY); + if (pcifd < 0) { + warn("%s: Unable to open /dev/pci", __func__); + return (-1); + } - for (uint8_t func = 0; func <= max_func; ++func) { - sel->pc_func = func; +restart: + memset(&pcio, 0, sizeof(pcio)); + memset(&pmc, 0, sizeof(pmc)); + pmc.pc_class = PCIC_BRIDGE; + pmc.flags = PCI_GETCONF_MATCH_CLASS; + do { + pcio.pat_buf_len = sizeof(pmc); + pcio.num_patterns = 1; + pcio.patterns = &pmc; + pcio.match_buf_len = sizeof(*conf); + pcio.matches = conf; + if (ioctl(pcifd, PCIOCGETCONF, &pcio) == -1) { + warn("%s: ioctl(PCIOCGETCONF) failed", __func__); + break; + } + if (pcio.num_matches == 0) + break; + if (pcio.status == PCI_GETCONF_LIST_CHANGED) + goto restart; - if (pci_host_read_config(sel, PCIR_CLASS, 1) == - PCIC_BRIDGE && - pci_host_read_config(sel, PCIR_SUBCLASS, 1) == - PCIS_BRIDGE_ISA) { - return (0); - } + if (conf->pc_class == PCIC_BRIDGE && + conf->pc_subclass == PCIS_BRIDGE_ISA) { + close(pcifd); + return (0); } - } + } while (pcio.status == PCI_GETCONF_MORE_DEVS); + + close(pcifd); - warnx("%s: Unable to find host selector of LPC bridge.", __func__); + warnx("%s: Unable to find host selector of LPC bridge", __func__); return (-1); } @@ -495,8 +510,7 @@ pci_lpc_get_sel(struct pcisel *const sel) static int pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl) { - struct pcisel sel = { 0 }; - struct pcisel *selp = NULL; + struct pci_conf conf, *confp; uint16_t device, subdevice, subvendor, vendor; uint8_t revid; @@ -521,15 +535,16 @@ pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl) if (lpc_init(pi->pi_vmctx) != 0) return (-1); - if (pci_lpc_get_sel(&sel) == 0) - selp = &sel; + confp = NULL; + if (pci_lpc_get_conf(&conf) == 0) + confp = &conf; - vendor = pci_config_read_reg(selp, nvl, PCIR_VENDOR, 2, LPC_VENDOR); - device = pci_config_read_reg(selp, nvl, PCIR_DEVICE, 2, LPC_DEV); - revid = pci_config_read_reg(selp, nvl, PCIR_REVID, 1, LPC_REVID); - subvendor = pci_config_read_reg(selp, nvl, PCIR_SUBVEND_0, 2, + vendor = pci_config_read_reg(confp, nvl, PCIR_VENDOR, 2, LPC_VENDOR); + device = pci_config_read_reg(confp, nvl, PCIR_DEVICE, 2, LPC_DEV); + revid = pci_config_read_reg(confp, nvl, PCIR_REVID, 1, LPC_REVID); + subvendor = pci_config_read_reg(confp, nvl, PCIR_SUBVEND_0, 2, LPC_SUBVEND_0); - subdevice = pci_config_read_reg(selp, nvl, PCIR_SUBDEV_0, 2, + subdevice = pci_config_read_reg(confp, nvl, PCIR_SUBDEV_0, 2, LPC_SUBDEV_0); /* initialize config space */ diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 9d6060e3e254..dc27402675ee 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -353,49 +353,51 @@ pci_print_supported_devices(void) } uint32_t -pci_config_read_reg(const struct pcisel *const host_sel, nvlist_t *nvl, +pci_config_read_reg(const struct pci_conf *host_conf, nvlist_t *nvl, const uint32_t reg, const uint8_t size, const uint32_t def) { const char *config; const nvlist_t *pci_regs; + uint32_t host; assert(size == 1 || size == 2 || size == 4); pci_regs = find_relative_config_node(nvl, "pcireg"); if (pci_regs == NULL) { - return def; + return (def); } switch (reg) { case PCIR_DEVICE: config = get_config_value_node(pci_regs, "device"); + host = host_conf != NULL ? host_conf->pc_device : 0; break; case PCIR_VENDOR: config = get_config_value_node(pci_regs, "vendor"); + host = host_conf != NULL ? host_conf->pc_vendor : 0; break; case PCIR_REVID: config = get_config_value_node(pci_regs, "revid"); + host = host_conf != NULL ? host_conf->pc_revid : 0; break; case PCIR_SUBVEND_0: config = get_config_value_node(pci_regs, "subvendor"); + host = host_conf != NULL ? host_conf->pc_subvendor : 0; break; case PCIR_SUBDEV_0: config = get_config_value_node(pci_regs, "subdevice"); + host = host_conf != NULL ? host_conf->pc_subdevice : 0; break; default: return (-1); } if (config == NULL) { - return def; - } else if (host_sel != NULL && strcmp(config, "host") == 0) { -#ifdef __amd64__ - return pci_host_read_config(host_sel, reg, size); -#else - errx(1, "cannot fetch host PCI configuration"); -#endif + return (def); + } else if (host_conf != NULL && strcmp(config, "host") == 0) { + return (host); } else { - return strtol(config, NULL, 16); + return (strtol(config, NULL, 16)); } } diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h index 063b4b84e044..29e9717c1593 100644 --- a/usr.sbin/bhyve/pci_emul.h +++ b/usr.sbin/bhyve/pci_emul.h @@ -230,7 +230,7 @@ void pci_walk_lintr(int bus, pci_lintr_cb cb, void *arg); int init_pci(struct vmctx *ctx); void pci_callback(void); -uint32_t pci_config_read_reg(const struct pcisel *host_sel, nvlist_t *nvl, +uint32_t pci_config_read_reg(const struct pci_conf *host_conf, nvlist_t *nvl, uint32_t reg, uint8_t size, uint32_t def); int pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type, uint64_t size); From nobody Mon Feb 16 15: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 4fF6XF705Nz6Rxgb for ; Mon, 16 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XF549lz4PNp for ; Mon, 16 Feb 2026 15: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=1771256669; 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=bqGGs2Bc25lJJPdaLaddduyArcoDmCA5GO2sn2RGMDQ=; b=j92anvl0VD+BIWqhYyT5340fnafDzV40zfLt6sn/5R9u64cEBPklkNB3ge/QxQAmRnzUjX RfnK1sd5Irgx1dNLOZkH8qj0c1NzbzqJ0HQdK1d48SrsuyCrY/PLqW+8fsjCN2RlhDdzL1 NGz8yztG6DS80pVssQB/lfUK40McXwQycEjazxiBFwzWLfx/p+jh52qqBHTX6v7esgpmqJ lUASGE8w0+8V5VHGnxSUPFNWdpSDRHbY7YR1BG8WSSPsaCdsh0wglrzr3dFc8YKXZcxGH7 OCGjLq9vZCjrGNvJCs3kgBSz+nAGDRVa0G3BFKCPyYN3zZ2pCiJB1S2WTl03Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256669; a=rsa-sha256; cv=none; b=j7EA4Ro5OLNhvYOBoJadDUsC3+yK8NrrSQWxjPO3W+pu0VbOhdBeIj89fJE0lGDVL9LTHP NMt7A+yB0Rwgn7WtLwDGL6Cx3MFEQr9OXWkgr7XZkC1YJBaWT9O2Clw1a4Q93pTZ3ULi6W EoAuYsUp5/9UVzLEk/YCYc/1sxYXbGqKseqSV+IWz3CpCUiJ2G0ayhj/SELNUkQ9x80bbP A3Ue7C4osDxTCyXHS9o4kDj+pgufJpoid1khfDHwVhF1i4uSq2B8jbNwMuvc4PNNNaQP6k s1POsLo+EI8xnf+YFKek9E0Pj8IZYdC60Fkqy7MPt23tmRPgZcrIyuSzt/TIag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256669; 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=bqGGs2Bc25lJJPdaLaddduyArcoDmCA5GO2sn2RGMDQ=; b=qN625sHaIj+u/jdBAgMzRVqehU9kJ73UzOKuNIfFKzMfT4kP8qib2Py6dDbT90txuLpxds /N4dl9mvsgXU4h/sx/5YaUkUZ5zqZCBQaWQO0Z8rKt3lbU/JXiJBY/TH5Zd16OoDMpP7mj Cjk4hcBAojx4Fu9tuymTTGC7HjeDo5bW5EBJUawIOETMgrH2lLbJrcl4Ad4Q14H1I0FJkg 0JwvuHq/SY14RIYmRNxllhYnt0S5dAJWjlro0cNZzaemfBvgaYFApvVJs4zoAHFPL18X3y ybjKsKgTHiqsIPy3oyiOXlDQM5NScVz/L2LcwSQudC6YWy5skaCUy++x9ucNXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XF468hzTnG for ; Mon, 16 Feb 2026 15:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eee7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: David Marker From: Mark Johnston Subject: git: cf39d5888f41 - stable/15 - vmrun.sh: add option for sharing directory via p9fs to bhyve List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf39d5888f418b0341dbdf07c9cb27817ce706bd Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:29 +0000 Message-Id: <69933b5d.1eee7.304f366b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cf39d5888f418b0341dbdf07c9cb27817ce706bd commit cf39d5888f418b0341dbdf07c9cb27817ce706bd Author: David Marker AuthorDate: 2026-02-07 21:28:58 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 vmrun.sh: add option for sharing directory via p9fs to bhyve Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55100 (cherry picked from commit 525d00dcf45f6f83b188cf1ad7bfcfcc8ea39eca) --- share/examples/bhyve/vmrun.sh | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index e0052e781dc0..44c905f18625 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -53,8 +53,8 @@ errmsg() { usage() { local msg=$1 - echo "Usage: vmrun.sh [-aAEhiTuvw] [-c ] [-C ]" \ - "[-d ]" + echo "Usage: vmrun.sh [-aAEhiTuvw] [-9 <9p share>=[,]]" + echo " [-c ] [-C ] [-d ]" echo " [-e ] [-f ]" \ "[-F ]" echo " [-G [w][address:]port] [-H ]" @@ -66,6 +66,7 @@ usage() { echo " [-P ] [-t ] " echo "" echo " -h: display this help message" + echo " -9: virtio 9p (VirtFS) device to share directory" echo " -a: force memory mapped local APIC access" echo " -A: use AHCI disk emulation instead of ${DEFAULT_DISK}" echo " -c: number of virtual cpus (default: ${DEFAULT_CPUS})" @@ -128,6 +129,7 @@ disk_total=0 disk_emulation=${DEFAULT_DISK} loader_opt="" pass_total=0 +plan9_total=0 # EFI-specific options efi_mode=0 @@ -144,16 +146,26 @@ uboot_firmware="/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin" case ${platform} in amd64) bhyverun_opt="-H -P" - opts="aAc:C:d:e:Ef:F:G:hH:iI:l:L:m:n:p:P:t:Tuvw" + opts="9:aAc:C:d:e:Ef:F:G:hH:iI:l:L:m:n:p:P:t:Tuvw" ;; arm64) bhyverun_opt="" - opts="aAc:C:d:e:f:F:G:hH:iI:L:m:n:P:t:uv" + opts="9:aAc:C:d:e:f:F:G:hH:iI:L:m:n:P:t:uv" ;; esac while getopts $opts c ; do case $c in + 9) + plan9_share=${OPTARG%%=*} + plan9_rest=${OPTARG#${plan9_share}=} + plan9_path=${plan9_rest%%,*} + plan9_opts=${plan9_rest#${plan9_path}} + eval "plan9_share${plan9_total}=\"${plan9_share}\"" + eval "plan9_path${plan9_total}=\"${plan9_path}\"" + eval "plan9_opts${plan9_total}=\"${plan9_opts}\"" + plan9_total=$(($plan9_total + 1)) + ;; a) bhyverun_opt="${bhyverun_opt} -a" ;; @@ -387,6 +399,20 @@ while [ 1 ]; do i=$(($i + 1)) done + i=0 + while [ $i -lt $plan9_total ] ; do + eval "share=\$plan9_share${i}" + eval "path=\$plan9_path${i}" + eval "opts=\$plan9_opts${i}" + if [ ! -d ${path} ]; then + echo "virtio-9p \"${path}\" is not a directory" + exit 1 + fi + devargs="$devargs -s $nextslot,virtio-9p,${share}=${path}${opts} " + nextslot=$(($nextslot + 1)) + i=$(($i + 1)) + done + i=0 while [ $i -lt $tap_total ] ; do eval "tapname=\$tap_dev${i}" From nobody Mon Feb 16 15:44: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 4fF6XJ2VRVz6RxW1 for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XH5vz5z4Pg9 for ; Mon, 16 Feb 2026 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/nsl8pBF9RzXIC8t/fYs2jXrFBYShVH9uYi7cIWeZc=; b=Dl//qvWQDdWQlKvjsxEQncRqun4bojO6tJ/owd9mXe7YmVdv9VvUhhKcy7s9xg6GT0nryb 2K9yIE5KdudJfLkPB0jAXXsj1f4cL62cI6F8leppwAxURfQXVO1KlXoExk5RwT9cq3yAmi VhxYFFzZ5UxTAWovjSCK/7/096bg/MvN0fWGdtzbwuNT/WkxSAO74bQpPh3fXgdU1SZQSG GYCoP4uXUzAR3RcY7BPAMBvYIrCL0DLbNJB0h9nge8f4OEyVPbv8qRbkXTvfEkvVXBvxrK s68BTSH0woINUHriJbVAj1TLN2IW8pI+b21ouoJlZljVfuU3M5V/gDtoYEi5Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256671; a=rsa-sha256; cv=none; b=Wo+Vpnz3siThqajTUI5hZEWZDcDVeN7cTEBVxINDnv5gImh+JhApRZNcXmB3wwhojQwKdT feegYcATwkTao5sHSZKeQRaVw8mpX2FFba/uWF1E1NNXG32JKMWuMyfRnY5M0gZpPFRe2l wmYFwNUqyHYwrzRBGFXkr1UuZvGthyvAl8c9OnBDbCf31kirlduk1/DPhonzsa0bsT3hb8 lhnBPfDC7n8iyd/6aurvxxZCvEJGy1e21ND32+C0KQ/vttEcsX6Hl3w5VAANeSDJbq6j8N uUiL8Bm7XlnLkIEssu+GQKPCJsokHQnaG145xqyj17EjVTTaGOHYHD1kI/dwXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/nsl8pBF9RzXIC8t/fYs2jXrFBYShVH9uYi7cIWeZc=; b=MuNGYsoLnFLz1tnxorueCllFazJ1aA8xKkyEXAtOi2LqfK3x44p3bA2tyUOsb4MR0wUQKC cUfJYUNf3yXQywxPbq7SU3Rs94Z3Le6ewrEDSmkOk7RO8jhP7YutjwtVkwHxhWekO3HqWH 5qpDKeyEONcVq0f7qPcakwmIxaxx2oMQWfYyWkNrqseuW8P+LvZYIynJ0/hdH+3htXbkC0 KC7j+EPE+ZqIat6w8u+c6knOKKJP5lXr+FserPL2z19/AS//OYc6DWYyoPRagmK0rjoQFv Bfc/B+NcZ1JBK5ErmI/hzjGv8GRGRqP2v4cI4ZZ0VsU8zdF1pRW01xSFAtGLww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XH5Vt6zTyD for ; Mon, 16 Feb 2026 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eaba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 83d175fc2e4e - stable/15 - atf_python: Run vnet handlers in $HOME List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 83d175fc2e4e882a483111b4269b7dc58addb0e0 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:31 +0000 Message-Id: <69933b5f.1eaba.1ba97426@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=83d175fc2e4e882a483111b4269b7dc58addb0e0 commit 83d175fc2e4e882a483111b4269b7dc58addb0e0 Author: Mark Johnston AuthorDate: 2026-02-02 14:52:43 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:43:18 +0000 atf_python: Run vnet handlers in $HOME When kyua runs a test, it creates a temp directory and sets $HOME to point to it. Tests are run with the cwd set to that temp directory. When a process attaches to a jail, its cwd is set to the root of the jail. Modify atf_python to cd to $HOME instead, so that it's easier for tests to share files. Reviewed by: zlei, ngie MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54971 (cherry picked from commit 07940d1d85eb338853fcba0697c6b9a96412a7f2) --- tests/atf_python/sys/net/vnet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index f75a3eaa693e..3d431685836a 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -354,6 +354,7 @@ class VnetTestTemplate(BaseTest): vnetX_handler() after setting up interface addresses """ vnet.attach() + os.chdir(os.getenv("HOME")) print("# setup_vnet({})".format(vnet.name)) if pipe is not None: vnet.set_pipe(pipe) From nobody Mon Feb 16 15:44: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 4fF6XK1Jq7z6Rxb2 for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XJ6Tsyz4PXX for ; Mon, 16 Feb 2026 15:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/AC2OQfjhqqzc5mK41YZ+j21WeBOXykXZLfZpRtaCA=; b=doDcawEX5Se4Y8vD87ayuOye/0QwtdLohpZzHoXlsw6NiFR7LtZUjIwPFpluFtuCcfRJLa jsF2cYQOYa+RgkjBlZRFrOxnoMgV/3Gk9dT5/dp0oaCx44unEp50LqEwepOns8lEXzF7B2 S5oylqHiJnPUO07KXha0bZh0+2vxUJy1ozslU7XrwnCOe+JWkuOwV0Vu8mKifCe33M/876 fj9j/G58FJqy3ICZ5d90G4fTT7Sia6e71NmxBQP/fFEq+tbN84LTpFvhYv9rmxbFZ1kHKZ 8bBYHtOl8cnMTKj7Zc0Ids66LsmQ8WUom57/npixJVRq4JyTOS7StvkezZUhvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256672; a=rsa-sha256; cv=none; b=vjdOhJ91texMnP5oBoCT2WI7pzCAUF/ThHvjrkf7yAWkp7T65sC5xRMAFvH3UnK+rs6Fea lbwq93+sD9MIM8I5FlrE3hkyC52HUgCOEUoD0RIQFM6KBxhxsg0cp1t4Ei1HMvwuNUln+a 3XJ9JL5bS0pnnzISunP7zBJlR8fGVrLKexJH6juvOaW1bsmrmKoDiMK8ioYqTyRQmp8Qol ghXqP3Lf6J4V2LbqD8T8qn5AbTyPfS+ZU8y2a3NSwymbITGaxA+jiaPdbDTBiWzHPHVubf J4QQixojcsDjE9WQ52e8Xjddr0uZFzu3giJgw8EDFGuaashjyW7z6z1hMbEyeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/AC2OQfjhqqzc5mK41YZ+j21WeBOXykXZLfZpRtaCA=; b=m9qh5x6fgcc/z6VGbOJppXjGK2E3d1StzLtMTXt+J0KyPvy2HcmWab/vM+dZ1ZiKFlDXRL Nd2WISikNtIwcReCzL4W2fZXaLQ/EYewsTT2cEjM17k1eXZaaZ3SyVTL9oDVUNbwe3tYrs eBPTOafPNMJfa9Dkq8RIdcevynthzC8u0VOAmWta6eygbeIlbk4CSD3ys4FqztM81T3nSx MDz2hJvglyYXFJo2DMjHF5eQJdXUFDG//x2Rp09f2JK9xlp9JCJUvuI+GoCwEswgs7UkAa AJYpMS1VyanYJKUgQKq1qEHjlr+J/m9B3vl2MkETlqwku7ozGxw6tKnH3MvgJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XJ5pcfzTsT for ; Mon, 16 Feb 2026 15:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 046846bb391f - stable/15 - ip6_mroute: Remove an unused constant List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 046846bb391fb4639248d5ac8bcbe80b44fd6887 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:32 +0000 Message-Id: <69933b60.20863.2a0fe404@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=046846bb391fb4639248d5ac8bcbe80b44fd6887 commit 046846bb391fb4639248d5ac8bcbe80b44fd6887 Author: Mark Johnston AuthorDate: 2026-02-02 14:58:38 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:46:28 +0000 ip6_mroute: Remove an unused constant No functional change intended. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit b320e89e6909c0c3f29542976df0381990866988) --- sys/netinet6/ip6_mroute.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 3eaa8834171a..275c3ae2d7f1 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -271,8 +271,6 @@ static void expire_upcalls(void *); */ static struct ifnet *multicast_register_if6; -#define ENCAP_HOPS 64 - /* * Private variables. */ From nobody Mon Feb 16 15:44: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 4fF6XL3y1zz6RxbB for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XK72M4z4PVm for ; Mon, 16 Feb 2026 15:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dL16ttQv2EFDXboK8xXEcJZAKtmFcCLwSNuphj/hCgY=; b=MqwTa8xnwY8zaare7k5/L1PI2aMSS5NkpasFZVdkUQT7/cOCrrLJkEVuoCwBXSB+2jqPpo OaY0cOe75Gfc+RDSDs8e8i3guBRNkI2ihMrRy8QJXJeaSVau7GrSqvN/DMOyKAuY1Dn7s8 gbfdPAU/+Z00YVjbBu71OciSRX1vAILWY4b7MjuKYsPxFUXFbDH4/fuMMwkxbriIkavCug kfaa9iNqctDTvkjgbW98oVG443w/F0/ajX/pUFlbMPnJXPri31mTQI5l0nWA91gltH8JQm YfkHTvc12XL8dj9vYwyQ5YLrePG6XRE69RGM4AXqMcd7weicuMyOv7ZREpoQdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256674; a=rsa-sha256; cv=none; b=ENzQ0/u4fTMI6wBV0RQFOKT89xAhMXWMvyuFI/LumfHddrcVUI0sBkQ8zkcPxXvO9cJfJJ 6OKoQ8VwVfTj76AuI9KEVtPd5PLcLwfS8gH3qvOwejs6i9a+HGa32XKRwITJVEmMHKlYyq r605fIsqkp7i48RkNsFkwvoNhtrrdnnqyucwiNCr8n2pqr+brQUpkD9e7NP69aNKbSw5PX 5PkZ+bOMGCCCzOEE7sSgp7WEIdnY15NgfIpGts55nZcUXr3spiwiovFNsnMHrUCLszLRzD 9Zf4WjkKIH9sWjt2VVQAeQw76m1p9ipcLoLS9lvvWqgt4oypPze1i0IrK/Ku3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dL16ttQv2EFDXboK8xXEcJZAKtmFcCLwSNuphj/hCgY=; b=pcF0QQ91draJcB1XE7c4G5RF56gV8C8Wu1tkqXxCtrZmp7x4erNACCRslmeU4ZbnLBjLX+ e3JHELDerHI96VFitIdIWpMSZIkj67lS3/fGiG1nui/Nu57M6eJHo0ZZYM5N3bG2L/c0iM o7lnh3KI7OpwbgsKB9udeWI+71Da1SrruljHEarAuhLZW4nnYOSol38KkP+/DkOOUZdhLC drmZdItxjt9KzqDBz8ccOqVxJppwOjDKJwRqMaZiO6FWtL28d2MUGUjtDviRXjl9yer0hN sZLUXFlDMzSYTUKae4m5OfgY0dzEwUSGeM8I506xy0kwAdAKS6TRWd7Q17+qxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XK6bHjzTXX for ; Mon, 16 Feb 2026 15:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20867 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bba9e2072966 - stable/15 - ip_mroute: Make privilege checking more consistent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bba9e20729660da478743d9965a11717fde56484 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:33 +0000 Message-Id: <69933b61.20867.7b95d192@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bba9e20729660da478743d9965a11717fde56484 commit bba9e20729660da478743d9965a11717fde56484 Author: Mark Johnston AuthorDate: 2026-02-02 14:53:35 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:46:36 +0000 ip_mroute: Make privilege checking more consistent - The v6 socket option and ioctl handlers had no privilege checks at all. The socket options, I believe, can only be reached via a raw socket, but a jailed root user with a raw socket shouldn't be able to configure multicast routing in a non-VNET jail. The ioctls can only be used to fetch stats. - Delete a bogus comment in X_mrt_ioctl(), one can issue multicast routing ioctls against any socket. Note that the call path is soo_ioctl()->rtioctl_fib()->mrt_ioctl(). I think all of the mroute privilege checks should be done within the ip(6)_mroute code, but let's first make the v4 and v6 modules consistent. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54982 (cherry picked from commit 74839871be363c5c2ac7ccd3396f36bdb58d19de) --- sys/netinet/ip_mroute.c | 5 ----- sys/netinet6/ip6_mroute.c | 15 +++++++++------ sys/netinet6/raw_ip6.c | 6 ++++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 73f17adf5728..c69f3cc8b41e 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -547,11 +547,6 @@ X_mrt_ioctl(u_long cmd, caddr_t data, int fibnum __unused) { int error; - /* - * Currently the only function calling this ioctl routine is rtioctl_fib(). - * Typically, only root can create the raw socket in order to execute - * this ioctl method, however the request might be coming from a prison - */ error = priv_check(curthread, PRIV_NETINET_MROUTE); if (error) return (error); diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 275c3ae2d7f1..5b9330c290d7 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -90,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -457,24 +458,26 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) static int X_mrt6_ioctl(u_long cmd, caddr_t data) { - int ret; - - ret = EINVAL; + int error; + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error) + return (error); + error = EINVAL; switch (cmd) { case SIOCGETSGCNT_IN6: - ret = get_sg_cnt((struct sioc_sg_req6 *)data); + error = get_sg_cnt((struct sioc_sg_req6 *)data); break; case SIOCGETMIFCNT_IN6: - ret = get_mif6_cnt((struct sioc_mif_req6 *)data); + error = get_mif6_cnt((struct sioc_mif_req6 *)data); break; default: break; } - return (ret); + return (error); } /* diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index c90a1213bd66..7deb605c07a2 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -604,6 +604,9 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error != 0) + return (error); if (inp->inp_ip_p != IPPROTO_ICMPV6) return (EOPNOTSUPP); error = ip6_mrouter_get ? ip6_mrouter_get(so, sopt) : @@ -627,6 +630,9 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error != 0) + return (error); if (inp->inp_ip_p != IPPROTO_ICMPV6) return (EOPNOTSUPP); error = ip6_mrouter_set ? ip6_mrouter_set(so, sopt) : From nobody Mon Feb 16 15:44: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 4fF6XM4wZTz6Rxdc for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XM0hXFz4Pgg for ; Mon, 16 Feb 2026 15:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBhxK50DSpKvwGGRKbkrnWAeDGTY0DBaLC2iLeEyfRc=; b=gxrYxpI3yq9JQbG6jLNqORKoeWOkkxwkW9e2rpRE1j6zPHeJkAnREN+uU96rdm5mkVGe0R vTpjbks0yylyuQ4rd3yD0B/pYRTTMonuWBSK0oihqM8X7iaVdXrwkHI19lqT5tsECQq/15 twi9kZPUcomWVHXSimj/i84LEK4P6h3B6hYfeRec86g287UztjzWnokjd9GEFmz/8DrQTJ GMvJPOV80G/mdvDRS72vEU6BNl6NT1O2gmnNoxnNmzMM8Rq/hY21EmmY3eV2+ivZ2+aAbC tEAchXLAsIyFGfQZxy5awn6g/EXH5SMr7X3d0ad6xFGuqfpRhgmXrp6ximRQuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256675; a=rsa-sha256; cv=none; b=o8011IMkrSrOsoJ+HQr7eiMPVQaoKMHZv/H5ga3gdh3xuA4dE+CicjZMgX3cSOJdA9jVs/ d4xP9oY8Jh76BRvoj7BHTJevhbhNGz0RV4bj8eUXhFHg6255zgyScmR5Vz7GEibBHhCyr5 wNcu73JJDTDbBmnfE/68xQHVXssaPmKBIWeE2O3GGDJ0hEvqeFvqgZChhh5hayuSxjVQ3g tEPsIqTdTWABzGsMlTcbHUBGeViefhyAK1iGtkv2XymkGu5LpmFHBsxjIH4SOrGZiDoM8n uarhTpN8X4I93XzEY81/SFVotDUHdo9k37YOQAX7cyyA2W3t5JNgkybmgNKuTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBhxK50DSpKvwGGRKbkrnWAeDGTY0DBaLC2iLeEyfRc=; b=CUbOBh/xvQ7G8WiGTci+wJcwbc1YONYFSkVyRqtdHZELXvAupx/9sTgmwRobHgUGQ4KYp4 m/NZqGTJEGxEbraUeGlmR6JG9EUrAA+zu/MEAXpkxn6wpQgk7HUxA7U6MZnHVQlHSk44C0 HwmJ7pwXeJgFV1ZjPspKr+9yX1QB+KSqYi9uGDfqB6arTXB8on1I7L11Z1WArfKHE6UcUD BEstR2LvgzJYTOkQTbtZ/wy7g8REPaVRpNyMsCVijkVlvDYaiaJX3BC5wmKRfMI2E3ptNY r4Uld5OtSCF+q79I8vOnQRpmqvGh/4A0ekhM8cFYyHONcTpaAwJ04CfSb0/Mxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XM0HyczTvm for ; Mon, 16 Feb 2026 15:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eabe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: be4d110bcdaf - stable/15 - ip6_mroute: Make MF6CFIND a regular function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: be4d110bcdaf9ac956844c1b5a342c06c4d4536d Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:35 +0000 Message-Id: <69933b63.1eabe.5e9debf1@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be4d110bcdaf9ac956844c1b5a342c06c4d4536d commit be4d110bcdaf9ac956844c1b5a342c06c4d4536d Author: Mark Johnston AuthorDate: 2026-02-02 14:57:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:46:48 +0000 ip6_mroute: Make MF6CFIND a regular function This is more natural and corresponds more closely to the v4 multicast routing code. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54983 (cherry picked from commit b370fcc716b9cfd4d08e291f0009f02452c84d64) --- sys/netinet6/ip6_mroute.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 5b9330c290d7..7e78120791a1 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -295,26 +295,6 @@ VNET_DEFINE_STATIC(int, pim6); (g).s6_addr32[0] ^ (g).s6_addr32[1] ^ \ (g).s6_addr32[2] ^ (g).s6_addr32[3]) -/* - * Find a route for a given origin IPv6 address and Multicast group address. - */ -#define MF6CFIND(o, g, rt) do { \ - struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ - rt = NULL; \ - while (_rt) { \ - if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \ - IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \ - (_rt->mf6c_stall == NULL)) { \ - rt = _rt; \ - break; \ - } \ - _rt = _rt->mf6c_next; \ - } \ - if (rt == NULL) { \ - MRT6STAT_INC(mrt6s_mfc_misses); \ - } \ -} while (/*CONSTCOND*/ 0) - /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code @@ -365,6 +345,22 @@ static int X_ip6_mrouter_set(struct socket *, struct sockopt *); static int X_ip6_mrouter_get(struct socket *, struct sockopt *); static int X_mrt6_ioctl(u_long, caddr_t); +static struct mf6c * +mf6c_find(const struct in6_addr *origin, const struct in6_addr *group) +{ + MFC6_LOCK_ASSERT(); + + for (struct mf6c *rt = mf6ctable[MF6CHASH(*origin, *group)]; rt != NULL; + rt = rt->mf6c_next) { + if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr, origin) && + IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr, group) && + rt->mf6c_stall == NULL) + return (rt); + } + MRT6STAT_INC(mrt6s_mfc_misses); + return (NULL); +} + /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ @@ -493,7 +489,7 @@ get_sg_cnt(struct sioc_sg_req6 *req) MFC6_LOCK(); - MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt); + rt = mf6c_find(&req->src.sin6_addr, &req->grp.sin6_addr); if (rt == NULL) { ret = ESRCH; } else { @@ -816,9 +812,8 @@ add_m6fc(struct mf6cctl *mfccp) MFC6_LOCK(); - MF6CFIND(mfccp->mf6cc_origin.sin6_addr, - mfccp->mf6cc_mcastgrp.sin6_addr, rt); - + rt = mf6c_find(&mfccp->mf6cc_origin.sin6_addr, + &mfccp->mf6cc_mcastgrp.sin6_addr); /* If an entry already exists, just update the fields */ if (rt) { MRT6_DLOG(DEBUG_MFC, "no upcall o %s g %s p %x", @@ -1113,7 +1108,7 @@ X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) /* * Determine forwarding mifs from the forwarding cache table */ - MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt); + rt = mf6c_find(&ip6->ip6_src, &ip6->ip6_dst); MRT6STAT_INC(mrt6s_mfc_lookups); /* Entry exists, so forward if necessary */ From nobody Mon Feb 16 15:44: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 4fF6XP3YfBz6Rxdj for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XP2RVdz4Pdv for ; Mon, 16 Feb 2026 15:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95I+z9IakggFKkr+QpNku77U2F4WCDuaAm5X1CYD2DE=; b=dPuI+avsHUUMIXcTOVqGY3E/wO7zxamj9ehqpGsqKvK6dCtGL1/fFOddpV3tx92GR6nNis vYgmk6CFey5T3pbeI4Y3Qq3qqICBue+jNycz+fgH972oUWDfpj2Iza6HKdrGQXkVQZI32b I9hOrHk0ilx6sqKRmTcB4eTo5WR/0mr4OO9oUZa34pHlAu8hdPm0iwr5CZBGOCEQ26cQEC Sn8aWxk44sy+Kb1WQdBaD9hYrscZY+eP8Dac6haJtdGyvHr/yV2Ao6GCJtj/SfRatULBoD X37eb9/IxL0/9zu2R4bgVd3oCLaQ1Wy5VqKW0M7S0U00m57Zf5yPvYc+2H6XhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256677; a=rsa-sha256; cv=none; b=VC4o4ZeqqMOHg2jU4g/cj9fWCbRMaAu271uVYS9sLYn83iqxa+xFYQq86J6V3BBc3dFDN2 c5umbYgxtVmMfObfac6lz1G6GmpRhDFjSmIkTB18VtHJm3lxRGXbn2HLLEQfHWtyXIZ1Xw mF034sD4jtyfY6zZ6fO/h7AGUSD6TgAuuNwe1ATGgGVrtStiYHqhT4x81Z0GuUnTXCBfNN xYMTArud1u950j8/duqtOJ/89Fwq7WLc8pHcll7arY3JAOCAZ4VddCqgmtUHpnneY3wqQz Bl07wEEe7R2Pr6C4F4NXJNMU+fa/UnCUj/w7/dVZd0EGtg1ArSxPZA72v5Ui6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95I+z9IakggFKkr+QpNku77U2F4WCDuaAm5X1CYD2DE=; b=NHoKM4rx/sasdl9px+atnUh2A5i04ouyaZL/EgEh1FJJPF8GC+B2rgK27w7q3bpouqwyae On/eRoNdNebHoOIyjSQ1eFYEjKw8cP3Gcs3d56PKwinFGcpqyhKRxYfUYy5bZVrd72R5u2 HyKnYg68gcKa+6wi+Az+GdYaq8rnlkS/ERrAOXLdHYl2NOB3HBY1Ma6gQVyj7VMQEvzJ1R O52IsEAa+I03ONWR2qStEZ/2lIQ6D3SHuPiZeHLxBHbAyoMgG4pzg39RGgZ0ljmEHJZjbb 0P3EAPqUbpwolsr2s7p7lOPvI+xyjkfuHmwoZQMNuHih87CL6+KoDmfAgsCLsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XP1mrhzTZx for ; Mon, 16 Feb 2026 15:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e945 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0e260cf83352 - stable/15 - ip6_mroute: Fix the UPCALL_TIMING 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0e260cf83352fbd64cb83de2800687c795ff7961 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:37 +0000 Message-Id: <69933b65.1e945.2e0cb7ad@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0e260cf83352fbd64cb83de2800687c795ff7961 commit 0e260cf83352fbd64cb83de2800687c795ff7961 Author: Mark Johnston AuthorDate: 2026-02-02 14:57:49 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:47:08 +0000 ip6_mroute: Fix the UPCALL_TIMING build MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit 5bb953b095461b488b102ab3025f42cd2ef61f9d) --- sys/netinet6/ip6_mroute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 17f502834b2d..7dd87a07340c 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -321,7 +321,7 @@ VNET_DEFINE_STATIC(int, pim6); #ifdef UPCALL_TIMING #define UPCALL_MAX 50 static u_long upcall_data[UPCALL_MAX + 1]; -static void collate(); +static void collate(struct timeval *); #endif /* UPCALL_TIMING */ static int ip6_mrouter_init(struct socket *, int, int); From nobody Mon Feb 16 15:44: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 4fF6XN3x5hz6Rxgt for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XN1WjGz4PPy for ; Mon, 16 Feb 2026 15:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=My0OX6WR9JFwXiRegzCxTi6uxudt7gU3OxO1rpV7x5A=; b=U/9YFJAjVYIDE2P48ZkKyu8vpZsWI59QNIl5e3rWc0FGd25gcDs8atz5nRLzxYf19zfRZR tE+6xrgIikHMotqpg38gk5243/FM3fAHmGyzY8qmnd+QZb8jVeP6wkNDByY3hPoXwPBvPO g25lgnOlW0AMDBrIvV2mdzinMqGkkU7oWiLuSVLpjvVISStcuN7i4+QDS0suG7AK2BCkPA 3P7DbzA0TJiuk/ThzdehbvJIVyKMYBD//4JtN8yXf0ZFnK6SPMa15d1TqUeWYdb1/VK4ej wonB0lzFi322ytTDwFNqPkYrNVxL+JHjwPHTWNgJg+sNOxhJf7w4C2GSFmFuNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256676; a=rsa-sha256; cv=none; b=roSX13lVL0HpnhDAFCcvc7/FdI0gXf7RmQdYJBU6pewA7qd/mdhtvH2g7Zz2KXsKmqi0Mg zEYP0LfPHHKchVqVcOjKjOL8N4DJGc8kOPWsR0lGsADt5hL6TmopoojnlCt5+L6u324myZ lrdO3wEa5v5wnMqZjMso6DuLQhl/yEp7KUBmr47sFJuwiP48MD8Fchv+5sNFW4twvRwQfF JyLKJOFqR34ewZRl3lLmS51Gs74EB/6HEgI/DYjbIosHoOyxsG3TYj5zEtVjALZTHV+sJG Krh47VQM10pF0OEmrhm1S7xv9Ii+60pbaYLWjr4bTzRscRy9rdLcASf40Cx0Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=My0OX6WR9JFwXiRegzCxTi6uxudt7gU3OxO1rpV7x5A=; b=yq1UBdhjHPkloGEu7la5Rk18nfp6V8iVCbeJk7g9z8aTVspeB6XgXUvRQRHCS4b2Pyb5Vk 0WtfJ+W04VlknNKJzVs410bg0WfzyP+9wEiIk8Psi7/d82MqyIPmlyfluTG/yDEG4oMSpX o3TlALEMufof3/INjIxcm6uBAjnXFP9Cb5RmcY97+llPiCW3uRmLFY2v3IU9fjp6lAJ3lH OAu+/lqhQE2jKnFcCpZZtAg2q+OQiF+/h6pK1QkQQKArigli/dYw7JMR77stoiUKDbF/wX mkk/5xYLCx1clp/FGEdiXrk9ppOZHuI8FgN0BMA8gZ7glJZRSaL+9KK3XMVpdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XN12QhzTsT for ; Mon, 16 Feb 2026 15:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ec0f6d2f15e4 - stable/15 - ip6_mroute: Remove an unhelpful comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ec0f6d2f15e433bb75b91c2a5ad8b2306b348e68 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:36 +0000 Message-Id: <69933b64.1ffee.5b2a0603@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ec0f6d2f15e433bb75b91c2a5ad8b2306b348e68 commit ec0f6d2f15e433bb75b91c2a5ad8b2306b348e68 Author: Mark Johnston AuthorDate: 2026-02-02 14:59:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:46:57 +0000 ip6_mroute: Remove an unhelpful comment ifnets already track if_allmulti() calls in the if_amcount field. That field is older than the comment, so I'm not exactly sure what the intent was; let's just remove it. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit a45fb94801dffd414bdb1981def0e977ef0c774f) --- sys/netinet6/ip6_mroute.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 7e78120791a1..17f502834b2d 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -255,10 +255,6 @@ static void expire_upcalls(void *); #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ -/* - * XXX TODO: maintain a count to if_allmulti() calls in struct ifnet. - */ - /* * 'Interfaces' associated with decapsulator (so we can tell * packets that went through it from ones that get reflected From nobody Mon Feb 16 17:30:06 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t63dHcz6S5Mc for ; Mon, 16 Feb 2026 17:30: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8t60nHPz3Skl for ; Mon, 16 Feb 2026 17:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEaIFYtFUY9mLur/ijIFOxpSUVQJnmMp/F8V7G5PgjU=; b=Bd0iEklf1yXm59w9q6kDAh+KRqYKQjm00uDyYaflQBszL1J8MemmDQXs2A/zHEsEUYOP6h Kut+pH1ZIj7osOhHf7mRqA7k0C+h3Xra5boW6ISM5OG6k/6VFiFmPxhrHdXDlCV7f05gZ4 wYDlAXRtpSRvBw6+T+m9KGXhITtkoh955qllXWrxrVoK/INESoW/cpnB4fJNbXUGhUVioL vCS8GYigLOwGQv6LsmTOpvkXrWJc/8XRXqeHn32CNBdPJk493Rmz3jkzQLgb/IWdkynVQE Vv0cvNrOMT+bLy8VnFFnG9Nv0AZO155IhQlkxZIKXo2OEOJy5x+AFGM82vzpSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771263006; a=rsa-sha256; cv=none; b=xGJpZ1axMD0G9VMt/oNRDSBA/C9Yf1FzItC2X5vSQW5Gw2WXj6X3nkeCk2gEIMchoNz0qk fRQSa5wdkAIJLzwEgnZFpcecH7p8D3TlKEZvKDw5yHVdQiQvTMD1RAk9k+IEMga8b2l2Su leZ5RkmVWZjxplVFm6NNTGlFnE+h3pENV69TU5UckJjnoZ1vVvYEzR01TFYsei6LDQayA2 /ELlcPy2NfyS/twm5kr4Fpaywf3qEz9TiOJQAjw9F0yw7C19ehyvRGPLTU4BX/2vbpHeoV QicqCZLCUHvHyrpdmuThof6FvzWESjuyQSU2899J6Wcuc0vVx1cNLmHWp62J1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEaIFYtFUY9mLur/ijIFOxpSUVQJnmMp/F8V7G5PgjU=; b=FnWZO+GdHkoNqZLCnX8v5bxm5Y7/VzGLTkf/bgUwKK+zumEHjC/bSFmQQnMrB0r6Kpt3At /8zWi8yiEnfeyR2NC73Do9/Ai/PWUNOgEws/PfGR1/fuQVoRVhcSOxaa4+XwY5cW52U1xe 7EyiSCk0eRpjqHNI4Ga1cvNyxiJLC0lnkuzF0PQ84xYZUZUUERERBka24ja2RR3rghLgZQ 5WUyhhu2QFw4ocHMduTiJpDl5zkhWBiv4sBe0SJoxkpdKpRDnvfS2Ox7Z8igQuzJodhqmZ nt525wkhffsZ1MPivBnMIdar3CKf+Vv5IhA+UQA1Pit3dcqzNKm0vC/mM8UkPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t60MQwzZ7b for ; Mon, 16 Feb 2026 17:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33101 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:30:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guido Falsi Subject: git: 4c7357aaf5d2 - stable/15 - sys/netinet6: Use atomic(9) for dad_failures counter List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4c7357aaf5d2fbe85eb6d86b59efe11c6f0e8c9a Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:30:06 +0000 Message-Id: <6993541e.33101.16a0270e@gitrepo.freebsd.org> The branch stable/15 has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=4c7357aaf5d2fbe85eb6d86b59efe11c6f0e8c9a commit 4c7357aaf5d2fbe85eb6d86b59efe11c6f0e8c9a Author: Guido Falsi AuthorDate: 2025-10-03 10:09:42 +0000 Commit: Guido Falsi CommitDate: 2026-02-16 17:27:41 +0000 sys/netinet6: Use atomic(9) for dad_failures counter Replace counter(9) usage with more lightweight atomic(9) in the code handling RFC 7217 SLAAC address generation. Also, use `u_int` types with this. Leaving `dad_failures` local to `in6_get_stableifid()` as a `uint64_t` to avoid changing the generated addresses from previous code; this also gives some headroom for future changes. While here, moved some `#include` lines to adhere to style(9). Reviewed by: glebius, jhibbits, jtl, zlei Approved by: glebius, jtl, zlei Differential Revision: https://reviews.freebsd.org/D52731 (cherry picked from commit 0c94dc9da7c238603e43c55ca6da64c417fc2204) Reviewed by: glebius, kp, pouria, zlei Approved by: glebius, pouria Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54382 --- sys/netinet6/in6.c | 3 --- sys/netinet6/in6_ifattach.c | 6 ++++-- sys/netinet6/in6_proto.c | 4 ++-- sys/netinet6/in6_var.h | 2 +- sys/netinet6/ip6_var.h | 2 +- sys/netinet6/nd6_nbr.c | 8 +++++--- sys/netinet6/nd6_rtr.c | 4 +++- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index abb880e5c2c1..bdee1eefaa3f 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2629,8 +2629,6 @@ in6_domifattach(struct ifnet *ifp) COUNTER_ARRAY_ALLOC(ext->icmp6_ifstat, sizeof(struct icmp6_ifstat) / sizeof(uint64_t), M_WAITOK); - ext->dad_failures = counter_u64_alloc(M_WAITOK); - ext->nd_ifinfo = nd6_ifattach(ifp); ext->scope6_id = scope6_ifattach(ifp); ext->lltable = in6_lltattach(ifp); @@ -2666,7 +2664,6 @@ in6_domifdetach(struct ifnet *ifp, void *aux) COUNTER_ARRAY_FREE(ext->icmp6_ifstat, sizeof(struct icmp6_ifstat) / sizeof(uint64_t)); free(ext->icmp6_ifstat, M_IFADDR); - counter_u64_free(ext->dad_failures); free(ext, M_IFADDR); } diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 538f34a267b4..b487c80a6667 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include @@ -72,6 +71,9 @@ #include #include +#include +#include + #ifdef IP6_AUTO_LINKLOCAL VNET_DEFINE(int, ip6_auto_linklocal) = IP6_AUTO_LINKLOCAL; #else @@ -378,7 +380,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) } hostuuid_len = strlen(hostuuid); - dad_failures = counter_u64_fetch(DAD_FAILURES(ifp)); + dad_failures = atomic_load_int(&DAD_FAILURES(ifp)); /* * RFC 7217 section 7 diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 6669a2ba56ce..f567b42b42ca 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -167,7 +167,7 @@ VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix * walk list every 5 sec. */ VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */ VNET_DEFINE(int, ip6_v6only) = 1; -VNET_DEFINE(int, ip6_stableaddr_maxretries) = IP6_IDGEN_RETRIES; +VNET_DEFINE(u_int, ip6_stableaddr_maxretries) = IP6_IDGEN_RETRIES; #ifdef IPSTEALTH VNET_DEFINE(int, ip6stealth) = 0; @@ -317,7 +317,7 @@ SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USETEMPADDR, use_tempaddr, SYSCTL_BOOL(_net_inet6_ip6, IPV6CTL_USESTABLEADDR, use_stableaddr, CTLFLAG_VNET | CTLFLAG_RWTUN, &VNET_NAME(ip6_use_stableaddr), 0, "Create RFC7217 semantically opaque address for autoconfigured addresses (default for new interfaces)"); -SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STABLEADDR_MAXRETRIES, stableaddr_maxretries, +SYSCTL_UINT(_net_inet6_ip6, IPV6CTL_STABLEADDR_MAXRETRIES, stableaddr_maxretries, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip6_stableaddr_maxretries), IP6_IDGEN_RETRIES, "RFC7217 semantically opaque address DAD max retries"); SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STABLEADDR_NETIFSRC, stableaddr_netifsource, diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index e511ead24f08..1414cc71388d 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -106,7 +106,7 @@ struct in6_ifextra { struct scope6_id *scope6_id; struct lltable *lltable; struct mld_ifsoftc *mld_ifinfo; - counter_u64_t dad_failures; /* DAD failures when using RFC 7217 stable addresses */ + u_int dad_failures; /* DAD failures when using RFC 7217 stable addresses */ }; #define LLTABLE6(ifp) (((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->lltable) diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index c28bfa5a9d08..db1631736c4a 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -344,7 +344,7 @@ VNET_DECLARE(bool, ip6_use_stableaddr); /* Whether to use stable address generat #define V_ip6_use_stableaddr VNET(ip6_use_stableaddr) #define IP6_IDGEN_RETRIES 3 /* RFC 7217 section 7 default max retries */ -VNET_DECLARE(int, ip6_stableaddr_maxretries); +VNET_DECLARE(u_int, ip6_stableaddr_maxretries); #define V_ip6_stableaddr_maxretries VNET(ip6_stableaddr_maxretries) #define IP6_STABLEADDR_NETIFSRC_NAME 0 diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index e2db192bca15..29151b29a071 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -77,6 +77,8 @@ #include #include +#include + #define SDL(s) ((struct sockaddr_dl *)s) struct dadq; @@ -1460,7 +1462,7 @@ nd6_dad_timer(void *arg) if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) == 0) { ia->ia6_flags &= ~IN6_IFF_TENTATIVE; if ((ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) && !(ia->ia6_flags & IN6_IFF_TEMPORARY)) - counter_u64_zero(DAD_FAILURES(ifp)); + atomic_store_int(&DAD_FAILURES(ifp), 0); } nd6log((LOG_DEBUG, @@ -1509,10 +1511,10 @@ nd6_dad_duplicated(struct ifaddr *ifa, struct dadq *dp) * More addresses will be generated as long as retries are not exhausted. */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) && !(ia->ia6_flags & IN6_IFF_TEMPORARY)) { - uint64_t dad_failures = counter_u64_fetch(DAD_FAILURES(ifp)); + u_int dad_failures = atomic_load_int(&DAD_FAILURES(ifp)); if (dad_failures <= V_ip6_stableaddr_maxretries) { - counter_u64_add(DAD_FAILURES(ifp), 1); + atomic_add_int(&DAD_FAILURES(ifp), 1); /* if retries exhausted, output an informative error message */ if (dad_failures == V_ip6_stableaddr_maxretries) log(LOG_ERR, "%s: manual intervention required, consider disabling \"stableaddr\" on the interface" diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 2ac883729c12..2556ed101a90 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -74,6 +74,8 @@ #include #include +#include + static struct nd_defrouter *defrtrlist_update(struct nd_defrouter *); static int prelist_update(struct nd_prefixctl *, struct nd_defrouter *, struct mbuf *, int); @@ -1709,7 +1711,7 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, * to fail and no further retries should happen. */ if (ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR && - counter_u64_fetch(DAD_FAILURES(ifp)) <= V_ip6_stableaddr_maxretries && + atomic_load_int(&DAD_FAILURES(ifp)) <= V_ip6_stableaddr_maxretries && ifa6->ia6_flags & (IN6_IFF_DUPLICATED | IN6_IFF_TEMPORARY)) continue; From nobody Mon Feb 16 17:30:08 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t85JLlz6S5B9 for ; Mon, 16 Feb 2026 17:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8t823Mbz3SZ8 for ; Mon, 16 Feb 2026 17:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPD4+NclWto1Rh2GL65OCr1O2I4zmkD58XBUfJdVcDU=; b=dj9V5fh2HxlDSCrAWqD605M4RYnIVqCZKhoY5GoBrPO6MIaBURgO2arzcYQ/fyGTkd61wp gG8FAAB1gmFnEWcTJfvq0h0L26FuE02v2bSl3I/B4XWAhwyHBXIrSHY4c4Z0msXUGYE0aS b03r+uRIdSjYYSQIP4Q9xsoOKdGwDqQ2wc+XLnDMAXB5CRjeRnqZuYFbTRKb3fCkciA6d3 qo2Iwo+o6IFvNCp6/l8q/PgAmEDWJTmgTAj1x5b1dgL/fIhimbBX3H6mDbnfX09e27T5ZZ J2bVlNFp8JZXA2QFSxVWj5if4QKLGjZbdO10LJ8j+KUoKoXVZbD5q9C45Yqj9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771263008; a=rsa-sha256; cv=none; b=ilsNYn6s+yhLsf3Staqg8hzikh6J1UyNDO1N1iPzUO3xzt2cLMV1uWa+HhGy457S9kqgZj Xe3uFEmMmyx96lIU75b6kL2PFd+8b7NEzoYak18yKUGCqRARp3nAvgg4RvamVULQKx1k7D rwU0UGNL1xACyNB+CzM69pkWZP6cOLcIAqmDo5nx3BRrM1Q0RlN1a0ISROfmoKgrzs/oM5 tBdMpt66nwPvUJS1067kLCZRD69JwQ/4QSrz5twW12kS0en0IMTBPoxe3yulIDS7rxXBYN MSgbBr53vzCmq6MeA8dLh0YqTgm3DSoCFv0XsLNlCD1DEan/LBv1vk+iY1ietQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPD4+NclWto1Rh2GL65OCr1O2I4zmkD58XBUfJdVcDU=; b=GTFVpCXNK1fe//jnj+hBtwggL6X7nS2NIoG9GJcLK2qF3dhBtuIPmXBCcLHWQwpmedM+na YIPVZxAfQTJAdLFndQcs/QSEQtmFM3jXNUZAAyFYVRagepReZW1S6aFuqNPZGOtBun06EO koDjEjmuVxuG6Fmt5HqSHSDDCmUOaoSx84vyb8xGvzcEecNg9YGGxggKdOOyVd8XwUmNuv zTrF3cRmjKuxZATHvv8Vb4H51X4LpR01cteS3cAeM40RmTHDtf3I77UNY9Rt+5A12FjeBk fKIiKAjS1SAW56ubCprP/dxZcqhS5Ti1OtMQ0/eFKrmDfre2WlA0bnFp6CiWJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t81L3jzXrW for ; Mon, 16 Feb 2026 17:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31d5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:30:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guido Falsi Subject: git: c20f5fd44322 - stable/15 - ifconfig.8: Start new sentence on new line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c20f5fd443228743fed3b071ee30216145940178 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:30:08 +0000 Message-Id: <69935420.31d5a.5b8e065a@gitrepo.freebsd.org> The branch stable/15 has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=c20f5fd443228743fed3b071ee30216145940178 commit c20f5fd443228743fed3b071ee30216145940178 Author: Guido Falsi AuthorDate: 2026-02-09 20:04:01 +0000 Commit: Guido Falsi CommitDate: 2026-02-16 17:28:52 +0000 ifconfig.8: Start new sentence on new line This change was forgotten by me in the previous commit to this file. Reported by: kib Approved by: implicit (change omitted from previous commit) Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 (cherry picked from commit e912723afb4e6bcfa828fcb73f35cd82fc6bca68) Reviewed by: glebius, kp, pouria, zlei Approved by: glebius, pouria Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54382 --- sbin/ifconfig/ifconfig.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index e1d153aa7493..f062ddec774d 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1009,7 +1009,8 @@ Clear a flag .Cm no_dad . .It Cm stableaddr Set a flag to create SLAAC addresses using a stable algorithm -according to RFC 7217. The +according to RFC 7217. +The .Xr sysctl 8 variable .Va net.inet6.ip6.use_stableaddr From nobody Mon Feb 16 17:30:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t74tsLz6S5B6 for ; Mon, 16 Feb 2026 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8t71Xwqz3Skm for ; Mon, 16 Feb 2026 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFAIuBoxeN+i27//ZuQR9ozfmq70TpmZBKUCbEZ7agI=; b=Dge1zdpKb0iu9BX+NIVa0gSJUmTaXWyYUZ7gDH5hftSec1qhXbwnCSS35RdzpOSV7y+sIm crQ3jvF5Pa5GbIHsPsVJNT7N6kCzVx8vDIIspeF5iXlwpFIU0E0OGZMjn8OK4MwObq+5k0 +Qb+Qx2PKKrUlpN4JWgZijKfx3m7P7T0Dh55Z9Col4jmoxS8PClBxelw8xaiBY2zAyP4Z8 qQa2jxswYQ85EKeGgjYzKXS6Ugd+ZldfgrwwzunrcCxeBdUXO2QoEhNfnwoqlJANpHS5KC bs+6KR8H7X/w9KsUp1G5hL+Nat9Gc9ZmW5xcuvmo0OFOs/9eYp/zXsCOglYswg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771263007; a=rsa-sha256; cv=none; b=Ff38+yOKQ5qc0+lRssv0QYK0nsfHRMPpYQAUjxM6YmgHd1IWtyBglhKnwrGiQ9iiIs0C5v NVsrQBzFJHDcaR2QQS0Fn519aQgv4S3h1Dl7+dlTYHQ2WEO9pID/YJZhrcc4bAOfA7pwGA sqRek4O3M4Lx2ZOrX0PQQD3GfCxj1NPuO53gLFeoppqyt7T8w5PL2lavca0Zc2B1s6hdga 41Mk9RhSp5MFBZxrMLfj7ps7gZq18DZG9HOgBTQ8JucRyaJt1mXa14RAwOkgQOhhbzGDm9 V/+U9mqfCbp3X7Ir4q3e9a/o8o1c0xRTns6pofuFZNi8m3lBY3cE3PL6I8l3BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFAIuBoxeN+i27//ZuQR9ozfmq70TpmZBKUCbEZ7agI=; b=FQzw9VCjE0TG7OdDidFsdjeNowFCEkg6+G+ZGP6vj3sx/pOQQtUJyga9hpHpldV28e8sij 1VjZTZGIG1CRuRZcpyn7+qUz6Hj4/XJmXkgbe5thDbqGoPwkGXH2P4Szfj52OeEzrHbe1M Exw146WkdZavs8m5Du6G1Ib4ZEcEEe5OR58y/tw4kxjf1Gb+z094c/mghcoiZQSeRgDWhZ JhcwdqB/klezHpjn6VlLCkM6Mt9TfdMN8mVpUixvR6iBlEnhiA5/WxDrWt6rNyHuzr4sto lXhJNcwoqInreRepDaBVxBbBGavJ7horuzu+We6baU7cntWPmtHBcUxFr81v7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t70zsYzZ0M for ; Mon, 16 Feb 2026 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33105 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:30:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guido Falsi Subject: git: 20294a77a8d4 - stable/15 - netinet6: Fix my style 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: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 20294a77a8d40bb645efad4b365ddaa9e7a53db2 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:30:07 +0000 Message-Id: <6993541f.33105.4e8d4552@gitrepo.freebsd.org> The branch stable/15 has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=20294a77a8d40bb645efad4b365ddaa9e7a53db2 commit 20294a77a8d40bb645efad4b365ddaa9e7a53db2 Author: Guido Falsi AuthorDate: 2026-02-07 12:46:05 +0000 Commit: Guido Falsi CommitDate: 2026-02-16 17:28:04 +0000 netinet6: Fix my style issues Reported by: pouria Reviewed by: pouria, ziaee, glebius Approved by: glebius Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 Differential Revision: https://reviews.freebsd.org/D55136 (cherry picked from commit 4548149a81026ad9b1706b2b7e7ad47a4c1358b6) Reviewed by: glebius, kp, pouria, zlei Approved by: glebius, pouria Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54382 --- sbin/ifconfig/ifconfig.8 | 19 +++++++++++-------- sys/netinet6/in6_ifattach.c | 22 +++++++++------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 627b7cd3f9e3..e1d153aa7493 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1008,24 +1008,28 @@ Set a flag to disable Duplicate Address Detection. Clear a flag .Cm no_dad . .It Cm stableaddr -Set a flag to create SLAAC addresses using a stable algorithm according to RFC 7217 -The +Set a flag to create SLAAC addresses using a stable algorithm +according to RFC 7217. The .Xr sysctl 8 variable .Va net.inet6.ip6.use_stableaddr -controls whether this flag is set by default or not for newly created interfaces. -To get consistent defaults for interfaces created at boot it should be set as a tunable via loader.conf(8). +controls whether this flag is set by default +or not for newly created interfaces. +To get consistent defaults for interfaces created at boot +it should be set as a tunable via +.Xr loader.conf 8 . The .Xr sysctl 8 variable .Va net.inet6.ip6.stableaddr_maxretries -sets the maximum number of retries to generate a unique IPv6 address to be performed in case of DAD failures. +sets the maximum number of retries to generate a unique IPv6 address +to be performed in case of DAD failures. This defaults to 3 which is also the reccommended minimum value. The interface ID source can be configured using the .Xr sysctl 8 variable -.Va net.inet6.ip6.stableaddr_netifsource: -.Bl -tag -compact +.Va net.inet6.ip6.stableaddr_netifsource : +.Bl -tag -compact -width indent .It Cm 0 uses the interface name string (the default) .It Cm 1 @@ -1033,7 +1037,6 @@ uses the interface ID .It Cm 2 uses the MAC address of the interface (if one can be obtained for it) .El -.Pp .It Cm -stableaddr Clear the flag .Cm stableaddr . diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index b487c80a6667..c9e951e93ec8 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -157,7 +157,7 @@ get_rand_ifid(struct ifnet *ifp, struct in6_addr *in6) } -/** +/* * Get interface link level sockaddr */ static struct sockaddr_dl * @@ -177,10 +177,10 @@ get_interface_link_level(struct ifnet *ifp) if (sdl->sdl_alen == 0) continue; - return sdl; + return (sdl); } - return NULL; + return (NULL); } /* @@ -249,10 +249,10 @@ in6_get_interface_hwaddr(struct ifnet *ifp, size_t *len) return (NULL); } - return addr; + return (addr); } - /* +/* * Get interface identifier for the specified interface. * XXX assumes single sockaddr_dl (AF_LINK address) per an interface * @@ -267,7 +267,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6) hwaddr = in6_get_interface_hwaddr(ifp, &hwaddr_len); if (hwaddr == NULL || (hwaddr_len != 6 && hwaddr_len != 8)) - return -1; + return (-1); /* make EUI64 address */ if (hwaddr_len == 8) @@ -313,7 +313,7 @@ validate_ifid(uint8_t *iid) static uint8_t reserved_eth[5] = { 0x02, 0x00, 0x5E, 0xFF, 0xFE }; static uint8_t reserved_anycast[7] = { 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - /* Subnet-Router Anycast (RFC 4291)*/ + /* Subnet-Router Anycast (RFC 4291) */ if (memcmp(iid, allzero, 8) == 0) return (false); @@ -374,7 +374,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) /* Use hostuuid as constant "secret" key */ getcredhostuuid(curthread->td_ucred, hostuuid, sizeof(hostuuid)); if (strncmp(hostuuid, DEFAULT_HOSTUUID, sizeof(hostuuid)) == 0) { - // If hostuuid is not set, use a random value + /* If hostuuid is not set, use a random value */ arc4rand(hostuuid, HOSTUUIDLEN, 0); hostuuid[HOSTUUIDLEN] = '\0'; } @@ -382,11 +382,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) dad_failures = atomic_load_int(&DAD_FAILURES(ifp)); - /* - * RFC 7217 section 7 - * - * default max retries - */ + /* RFC 7217 section 7, default max retries */ if (dad_failures > V_ip6_stableaddr_maxretries) return (false); From nobody Mon Feb 16 17:30:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t55KdPz6S5Mb for ; Mon, 16 Feb 2026 17:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8t52Cjpz3SfK for ; Mon, 16 Feb 2026 17:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oz0iYDeJMDRCuXGqns2hXhdLSW+6bsePrEvYopA15PA=; b=Q+ZBveh4JiaMrCMvTtnyO8PBYQZCYFJYLZlK+2wKpMpSJpvgMLjmgq/UgA48Qr23pQFzIA VGga0ByAn/38fEyPBtpBJUHk5tcrbvfYeYydjvt9wT9+nWoadoOmADFgqwh1srh/92k+dG z0aEqfMrRtfXb00cI3uY3qgHHuiHoHQ+OepUbeMfciDMds/fO9+Sk3jxihBfhWLUouT1+B 3crK4YlGi5U5yZCkKQLA5q+raP1YyY2l47MmBRzXu/gF2s3YdQz02ppIe3xJcvkYVPSAEu wFy6e1vzvJgMowDXFPAdywr6aDRb83IZx07EQSfd6lM3F/GItzruhjytPdF26w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771263005; a=rsa-sha256; cv=none; b=WHg3QsHAon4uL9T4b95em1+J85z8BP32EN1baSViX415Qo42a23qYTE7rGHAlG4moImXB1 s6+IfYxQSCXi4IRngm8uepzHkJ7p8R3VXlVLQ0FHR46u9jpTfYvCuKyHmftGSpyGjekYSj wELzKT1+8D3tzocnQDlmbqljDpI3NvwuOnQ8zYoDOPS9U0uDNRjta5KJPtPxKfWD+CVyXv G8jT3oA9Be1+VxXAzgkmBRRqrQ/NHI6P0FeJbEb4IwP8NZuK/yGi4nmhdFdRx/sHjDH3gN fWyhqIbDjmRqecTzNkiVYwxOD2CBKiJaADzKgqvosa6uOMZv9Kfn9kHASwZ32A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oz0iYDeJMDRCuXGqns2hXhdLSW+6bsePrEvYopA15PA=; b=SgoPNNZNQ23JeIMw9tHr+KLIP63aITv9p/mGHWXXxMnT2t6R5P4H9S/2gGebhJP3K2yA12 Ou6HV4Lz10kBhBs7fHs60x9XOehikIkJTX+kFCveHAVJ5c+bB2jM1qiI2o0RoHdUWrYyuB zMv6Zc2IgnqiWlaRolfx2292gs1CEPf9Bw3ziOwQthc0fWUVhWkGI0hkp8DPGyzvPdswaL Lsyq/dtlRNagWpGgiUML+VTIOz/ULGpjYRg421z4SI4C5+Sx+bdvCQUj8owl2/5y2aOUhc OhtcNAOGxEKnoO36dWl+8+0KLP9d5uWO9CJ6MimzEWujE2ieMwh37nUdAoW2Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t473dmzXrS for ; Mon, 16 Feb 2026 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 315b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:30:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guido Falsi Subject: git: 76cd2807fc3a - stable/15 - sys/netinet6: Fix ABI breakage introduced with RFC 7217 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: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 76cd2807fc3a686abf4f6e87705896a69315e943 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:30:04 +0000 Message-Id: <6993541c.315b7.3f686a1f@gitrepo.freebsd.org> The branch stable/15 has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=76cd2807fc3a686abf4f6e87705896a69315e943 commit 76cd2807fc3a686abf4f6e87705896a69315e943 Author: Guido Falsi AuthorDate: 2025-09-22 07:57:39 +0000 Commit: Guido Falsi CommitDate: 2026-02-16 17:27:04 +0000 sys/netinet6: Fix ABI breakage introduced with RFC 7217 support commit 31ec8b6407fdd5a87d70265762457c67ce618283 added a `dad_failures` variable to `struct nd_ifinfo`, which broke the netowrking ABI. This commit fixes it by moving such variable to `struct in6_ifextra` which is not a public interface, while `struct nd_ifinfo` is back in its original state. Thanks to kib, markj and glebious for their help and suggestions in solving this problem. Reported by: "Herbert J. Skuhra" Tested by: "Herbert J. Skuhra" Approved by: glebius Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 (cherry picked from commit 0ec13430c583830cc4d29640787e2d154b140e31) Reviewed by: glebius, kp, pouria, zlei Approved by: glebius, pouria Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54382 --- sys/netinet6/in6.c | 3 +++ sys/netinet6/in6_ifattach.c | 2 +- sys/netinet6/in6_var.h | 2 ++ sys/netinet6/nd6.c | 4 ---- sys/netinet6/nd6.h | 1 - sys/netinet6/nd6_nbr.c | 6 +++--- sys/netinet6/nd6_rtr.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index bdee1eefaa3f..abb880e5c2c1 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2629,6 +2629,8 @@ in6_domifattach(struct ifnet *ifp) COUNTER_ARRAY_ALLOC(ext->icmp6_ifstat, sizeof(struct icmp6_ifstat) / sizeof(uint64_t), M_WAITOK); + ext->dad_failures = counter_u64_alloc(M_WAITOK); + ext->nd_ifinfo = nd6_ifattach(ifp); ext->scope6_id = scope6_ifattach(ifp); ext->lltable = in6_lltattach(ifp); @@ -2664,6 +2666,7 @@ in6_domifdetach(struct ifnet *ifp, void *aux) COUNTER_ARRAY_FREE(ext->icmp6_ifstat, sizeof(struct icmp6_ifstat) / sizeof(uint64_t)); free(ext->icmp6_ifstat, M_IFADDR); + counter_u64_free(ext->dad_failures); free(ext, M_IFADDR); } diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 3152291cbe6a..538f34a267b4 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -378,7 +378,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) } hostuuid_len = strlen(hostuuid); - dad_failures = counter_u64_fetch(ND_IFINFO(ifp)->dad_failures); + dad_failures = counter_u64_fetch(DAD_FAILURES(ifp)); /* * RFC 7217 section 7 diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index e5ab83e6a2a1..e511ead24f08 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -106,9 +106,11 @@ struct in6_ifextra { struct scope6_id *scope6_id; struct lltable *lltable; struct mld_ifsoftc *mld_ifinfo; + counter_u64_t dad_failures; /* DAD failures when using RFC 7217 stable addresses */ }; #define LLTABLE6(ifp) (((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->lltable) +#define DAD_FAILURES(ifp) (((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->dad_failures) #ifdef _KERNEL diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 938d411711f0..00df5efcef92 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -329,8 +329,6 @@ nd6_ifattach(struct ifnet *ifp) nd->flags |= ND6_IFF_STABLEADDR; } - nd->dad_failures = counter_u64_alloc(M_WAITOK); - return nd; } @@ -350,8 +348,6 @@ nd6_ifdetach(struct ifnet *ifp, struct nd_ifinfo *nd) } NET_EPOCH_EXIT(et); - counter_u64_free(nd->dad_failures); - free(nd, M_IP6NDP); } diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 4322066b0912..e484c709e29a 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -76,7 +76,6 @@ struct nd_ifinfo { u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */ u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */ u_int8_t randomid[8]; /* current random ID */ - counter_u64_t dad_failures; /* DAD failures when using RFC 7217 stable addresses */ }; #define ND6_IFF_PERFORMNUD 0x1 diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 74f63ed6dfdc..e2db192bca15 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1460,7 +1460,7 @@ nd6_dad_timer(void *arg) if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) == 0) { ia->ia6_flags &= ~IN6_IFF_TENTATIVE; if ((ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) && !(ia->ia6_flags & IN6_IFF_TEMPORARY)) - counter_u64_zero(ND_IFINFO(ifp)->dad_failures); + counter_u64_zero(DAD_FAILURES(ifp)); } nd6log((LOG_DEBUG, @@ -1509,10 +1509,10 @@ nd6_dad_duplicated(struct ifaddr *ifa, struct dadq *dp) * More addresses will be generated as long as retries are not exhausted. */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) && !(ia->ia6_flags & IN6_IFF_TEMPORARY)) { - uint64_t dad_failures = counter_u64_fetch(ND_IFINFO(ifp)->dad_failures); + uint64_t dad_failures = counter_u64_fetch(DAD_FAILURES(ifp)); if (dad_failures <= V_ip6_stableaddr_maxretries) { - counter_u64_add(ND_IFINFO(ifp)->dad_failures, 1); + counter_u64_add(DAD_FAILURES(ifp), 1); /* if retries exhausted, output an informative error message */ if (dad_failures == V_ip6_stableaddr_maxretries) log(LOG_ERR, "%s: manual intervention required, consider disabling \"stableaddr\" on the interface" diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 85046c0dd9fe..2ac883729c12 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1709,7 +1709,7 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, * to fail and no further retries should happen. */ if (ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR && - counter_u64_fetch(ND_IFINFO(ifp)->dad_failures) <= V_ip6_stableaddr_maxretries && + counter_u64_fetch(DAD_FAILURES(ifp)) <= V_ip6_stableaddr_maxretries && ifa6->ia6_flags & (IN6_IFF_DUPLICATED | IN6_IFF_TEMPORARY)) continue; From nobody Mon Feb 16 17:30:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t52Cgtz6S5MW for ; Mon, 16 Feb 2026 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8t40Q8Gz3SZ6 for ; Mon, 16 Feb 2026 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49uXOJ9/5sgFSQrLtIkQ4YY1KReJ3xUwbLAe0FlSp4g=; b=kXve8yBMymcfTbseu99wqmpZHIdAm7Wrn9LJIPJejFQdpcIHuQWCWMS/nDhzJBgmhexPpc cTvbfuoHnzrrr3+WaZRV34Ji2QjBkgPa3bwGiu19rMUMzBlj1ICj9P910eLfRRxOS5CInC T+E0+ga/47Z1OZ7NPTNuhE1D0vF3z5K4K63XxIJSDttqAS/N5fKWJJmYULtS3pcOKfcpic 7OB6xhGrq1erC+xxL6OxukFjBpjb/SHygqnZa6AxUCh9niRF8kcQJqUxSV8diMqCgSv4sO 6O2NhXivhEb/C+ypMwwCskF+uQnZ43UBKTu5OdgKQ9+VPiqQHjc0dhp1j4ELAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771263004; a=rsa-sha256; cv=none; b=O4IjbLL5tF7wTjK/SxcQKFz5o8lI6sWNqDosM57N2fpE5mGVFR1GLPSn5egHE0ukwip7/M 1EDECATgRvKRye8m5poI1nedIpzlhQZqsW1X+gm0pxprGkhF4pau7zJ6+uJ6DUvMOuazWY rrj2rNsGE7EswcHaYEiBEWTiAHKrKqcxswgHJiGsnCGtW6fB7UbOc2wKq0YCESlU76e1L1 XY2JhiNmDq1k7wMf2hDrMDtohkiaaL3Ac+1pa1TAS517o57nRxm1EmUthA6S7MdqG3H5mk wgMYqkfbjcilxeg14kKXj3DBQuIvbyl/xk3Lras47l/4jGDQ9IzJPh76uuTiEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771263004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49uXOJ9/5sgFSQrLtIkQ4YY1KReJ3xUwbLAe0FlSp4g=; b=o+E34jt+2qsR/M9NKyahw4Dqn/8rJ3qiq/ArLdotjETRqg4lm4eg/0fTKGwK481xVyyM/3 HLC+NtNOSjYMEpaD4X+h4i+NQpIg2ujNQeH3JRvopGTRr7ZA8XmrvmPeqVz5veROdA8s3P a6NSbOF5rTagfajsrBNui4od3qesp9gL40m+ycxFFqpQ/hyXMfPDe6G9WKKKpsXURHM6Rp Yd9j2UWNbTigVkBtVapuUxQ0dPXAfnKzN0GpaADMThTWdWzzte+wTx3RXFg2bOi4E2e0CY CDfOJhUOM2AsXkr0EtobVNwrODBnK5aknIWi7MtxwGQrkbajXpy+sx0E5mFRMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8t36d39zZ0L for ; Mon, 16 Feb 2026 17:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:30:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guido Falsi Subject: git: 865e0b20ca3c - stable/15 - sys/netinet6: Implement RFC 7217 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 865e0b20ca3cefce25d68bd355090d414c2dfb84 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:30:03 +0000 Message-Id: <6993541b.30f6c.387140ec@gitrepo.freebsd.org> The branch stable/15 has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=865e0b20ca3cefce25d68bd355090d414c2dfb84 commit 865e0b20ca3cefce25d68bd355090d414c2dfb84 Author: Guido Falsi AuthorDate: 2025-09-20 12:26:41 +0000 Commit: Guido Falsi CommitDate: 2026-02-16 17:24:16 +0000 sys/netinet6: Implement RFC 7217 Implement RFC 7217 (A Method for Generating Semantically Opaque Interface Identifiers with IPv6 Stateless Address Autoconfiguration (SLAAC)) in our IPv6 stack. A new ifconfig `stableaddr` flag is added to enable the feature on interfaces, which defaults to on or off for new interfaces based on the sysctl `net.inet6.ip6.use_stableaddr` (off by default, so this commit causes no change in behavior with default settings). The algorithm follows the RFC in its logic, using SHA256-HMAC as the algorithm to derive addresses so as to provide code that can be leveraged by future implentations of RFC 8981, leveraging the `hostuuid` as the secret. The source of the hostidentifier can be configured using the sysctl `net.inet6.ip6.stableaddr_netifsource`, while the number of retries generating a new address in case of collision can be configured using the `net.inet6.ip6.stableaddr_maxretries` sysctl (default 3). Documentation about all these flags is added to the ifconfig(8) man page. Reviewed by: cognet, glebius, hrs Tested by: zarychtam@plan-b.pwste.edu.pl Approved by: cognet, glebius Relnotes: yes Differential Revision: https://reviews.freebsd.org/D49681 (cherry picked from commit 31ec8b6407fdd5a87d70265762457c67ce618283) Reviewed by: glebius, kp, pouria, zlei Approved by: glebius, pouria Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54382 --- sbin/ifconfig/af_inet6.c | 2 + sbin/ifconfig/af_nd6.c | 1 + sbin/ifconfig/ifconfig.8 | 30 +++++ sys/netinet6/in6.h | 3 + sys/netinet6/in6_ifattach.c | 275 +++++++++++++++++++++++++++++++++++++------- sys/netinet6/in6_ifattach.h | 2 + sys/netinet6/in6_proto.c | 10 ++ sys/netinet6/ip6_input.c | 1 + sys/netinet6/ip6_var.h | 12 ++ sys/netinet6/nd6.c | 9 ++ sys/netinet6/nd6.h | 2 + sys/netinet6/nd6_nbr.c | 35 +++++- sys/netinet6/nd6_rtr.c | 94 ++++++++++----- usr.sbin/ndp/ndp.c | 7 ++ 14 files changed, 406 insertions(+), 77 deletions(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index a5c406db8a0c..365f01be9590 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -728,6 +728,8 @@ static struct cmd inet6_cmds[] = { DEF_CMD_ARG("pltime", setip6pltime), DEF_CMD_ARG("vltime", setip6vltime), DEF_CMD("eui64", 0, setip6eui64), + DEF_CMD("stableaddr", ND6_IFF_STABLEADDR, setnd6flags), + DEF_CMD("-stableaddr", -ND6_IFF_STABLEADDR, setnd6flags), #ifdef EXPERIMENTAL DEF_CMD("ipv6_only", ND6_IFF_IPV6_ONLY_MANUAL,setnd6flags), DEF_CMD("-ipv6_only", -ND6_IFF_IPV6_ONLY_MANUAL,setnd6flags), diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c index 2899ad6a0778..fb7e72028e2e 100644 --- a/sbin/ifconfig/af_nd6.c +++ b/sbin/ifconfig/af_nd6.c @@ -66,6 +66,7 @@ static const char *ND6BITS[] = { [9] = "IPV6_ONLY", [10] = "IPV6_ONLY_MANUAL", #endif + [11] = "STABLEADDR", [15] = "DEFAULTIF", }; diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 481181d3d5d2..627b7cd3f9e3 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1007,6 +1007,36 @@ Set a flag to disable Duplicate Address Detection. .It Cm -no_dad Clear a flag .Cm no_dad . +.It Cm stableaddr +Set a flag to create SLAAC addresses using a stable algorithm according to RFC 7217 +The +.Xr sysctl 8 +variable +.Va net.inet6.ip6.use_stableaddr +controls whether this flag is set by default or not for newly created interfaces. +To get consistent defaults for interfaces created at boot it should be set as a tunable via loader.conf(8). +The +.Xr sysctl 8 +variable +.Va net.inet6.ip6.stableaddr_maxretries +sets the maximum number of retries to generate a unique IPv6 address to be performed in case of DAD failures. +This defaults to 3 which is also the reccommended minimum value. +The interface ID source can be configured using the +.Xr sysctl 8 +variable +.Va net.inet6.ip6.stableaddr_netifsource: +.Bl -tag -compact +.It Cm 0 +uses the interface name string (the default) +.It Cm 1 +uses the interface ID +.It Cm 2 +uses the MAC address of the interface (if one can be obtained for it) +.El +.Pp +.It Cm -stableaddr +Clear the flag +.Cm stableaddr . .El .Ss IPv6 Parameters The following parameters are specific for IPv6 addresses. diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index fd2e18b4695b..f250d7e49982 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -609,6 +609,8 @@ struct ip6_mtuinfo { /* IPV6CTL_RTMINEXPIRE 26 deprecated */ /* IPV6CTL_RTMAXCACHE 27 deprecated */ +#define IPV6CTL_STABLEADDR_NETIFSRC 30 /* semantically opaque addresses (RFC7217) hash algo netif parameter src */ +#define IPV6CTL_STABLEADDR_MAXRETRIES 31 /* semantically opaque addresses (RFC7217) max DAD retries */ #define IPV6CTL_USETEMPADDR 32 /* use temporary addresses (RFC3041) */ #define IPV6CTL_TEMPPLTIME 33 /* preferred lifetime for tmpaddrs */ #define IPV6CTL_TEMPVLTIME 34 /* valid lifetime for tmpaddrs */ @@ -617,6 +619,7 @@ struct ip6_mtuinfo { #define IPV6CTL_PREFER_TEMPADDR 37 /* prefer temporary addr as src */ #define IPV6CTL_ADDRCTLPOLICY 38 /* get/set address selection policy */ #define IPV6CTL_USE_DEFAULTZONE 39 /* use default scope zone */ +#define IPV6CTL_USESTABLEADDR 40 /* use semantically opaque addresses (RFC7217) */ #define IPV6CTL_MAXFRAGS 41 /* max fragments */ #if 0 diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index f284f7fa5ffc..3152291cbe6a 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -43,6 +44,7 @@ #include #include #include +#include #include #include @@ -79,6 +81,8 @@ VNET_DEFINE(int, ip6_auto_linklocal) = 1; /* enabled by default */ VNET_DEFINE(struct callout, in6_tmpaddrtimer_ch); #define V_in6_tmpaddrtimer_ch VNET(in6_tmpaddrtimer_ch) +VNET_DEFINE(int, ip6_stableaddr_netifsource) = IP6_STABLEADDR_NETIFSRC_NAME; /* Use interface name by default */ + VNET_DECLARE(struct inpcbinfo, ripcbinfo); #define V_ripcbinfo VNET(ripcbinfo) @@ -99,6 +103,9 @@ static void in6_purgemaddrs(struct ifnet *); #define IFID_LOCAL(in6) (!EUI64_LOCAL(in6)) #define IFID_UNIVERSAL(in6) (!EUI64_UNIVERSAL(in6)) +#define HMAC_IPAD 0x36 +#define HMAC_OPAD 0x5C + /* * Generate a last-resort interface identifier, when the machine has no * IEEE802/EUI64 address sources. @@ -148,22 +155,14 @@ get_rand_ifid(struct ifnet *ifp, struct in6_addr *in6) } -/* - * Get interface identifier for the specified interface. - * XXX assumes single sockaddr_dl (AF_LINK address) per an interface - * - * in6 - upper 64bits are preserved +/** + * Get interface link level sockaddr */ -int -in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6) +static struct sockaddr_dl * +get_interface_link_level(struct ifnet *ifp) { struct ifaddr *ifa; struct sockaddr_dl *sdl; - u_int8_t *addr; - size_t addrlen; - static u_int8_t allzero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - static u_int8_t allone[8] = - { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; NET_EPOCH_ASSERT(); @@ -176,14 +175,30 @@ in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6) if (sdl->sdl_alen == 0) continue; - goto found; + return sdl; } - return -1; + return NULL; +} + +/* + * Get hwaddr from link interface + */ +static uint8_t * +in6_get_interface_hwaddr(struct ifnet *ifp, size_t *len) +{ + struct sockaddr_dl *sdl; + u_int8_t *addr; + static u_int8_t allzero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + static u_int8_t allone[8] = + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + + sdl = get_interface_link_level(ifp); + if (sdl == NULL) + return (NULL); -found: addr = LLADDR(sdl); - addrlen = sdl->sdl_alen; + *len = sdl->sdl_alen; /* get EUI64 */ switch (ifp->if_type) { @@ -194,36 +209,21 @@ found: case IFT_IEEE1394: /* IEEE802/EUI64 cases - what others? */ /* IEEE1394 uses 16byte length address starting with EUI64 */ - if (addrlen > 8) - addrlen = 8; + if (*len > 8) + *len = 8; /* look at IEEE802/EUI64 only */ - if (addrlen != 8 && addrlen != 6) - return -1; + if (*len != 8 && *len != 6) + return (NULL); /* * check for invalid MAC address - on bsdi, we see it a lot * since wildboar configures all-zero MAC on pccard before * card insertion. */ - if (bcmp(addr, allzero, addrlen) == 0) - return -1; - if (bcmp(addr, allone, addrlen) == 0) - return -1; - - /* make EUI64 address */ - if (addrlen == 8) - bcopy(addr, &in6->s6_addr[8], 8); - else if (addrlen == 6) { - in6->s6_addr[8] = addr[0]; - in6->s6_addr[9] = addr[1]; - in6->s6_addr[10] = addr[2]; - in6->s6_addr[11] = 0xff; - in6->s6_addr[12] = 0xfe; - in6->s6_addr[13] = addr[3]; - in6->s6_addr[14] = addr[4]; - in6->s6_addr[15] = addr[5]; - } + if (memcmp(addr, allzero, *len) == 0 || memcmp(addr, allone, *len) == 0) + return (NULL); + break; case IFT_GIF: @@ -234,16 +234,51 @@ found: * identifier source (can be renumbered). * we don't do this. */ - return -1; + return (NULL); case IFT_INFINIBAND: - if (addrlen != 20) - return -1; - bcopy(addr + 12, &in6->s6_addr[8], 8); + if (*len != 20) + return (NULL); + *len = 8; + addr += 12; break; default: + return (NULL); + } + + return addr; +} + + /* + * Get interface identifier for the specified interface. + * XXX assumes single sockaddr_dl (AF_LINK address) per an interface + * + * in6 - upper 64bits are preserved + */ +int +in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6) +{ + size_t hwaddr_len; + uint8_t *hwaddr; + static u_int8_t allzero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + + hwaddr = in6_get_interface_hwaddr(ifp, &hwaddr_len); + if (hwaddr == NULL || (hwaddr_len != 6 && hwaddr_len != 8)) return -1; + + /* make EUI64 address */ + if (hwaddr_len == 8) + memcpy(&in6->s6_addr[8], hwaddr, 8); + else if (hwaddr_len == 6) { + in6->s6_addr[8] = hwaddr[0]; + in6->s6_addr[9] = hwaddr[1]; + in6->s6_addr[10] = hwaddr[2]; + in6->s6_addr[11] = 0xff; + in6->s6_addr[12] = 0xfe; + in6->s6_addr[13] = hwaddr[3]; + in6->s6_addr[14] = hwaddr[4]; + in6->s6_addr[15] = hwaddr[5]; } /* sanity check: g bit must not indicate "group" */ @@ -264,6 +299,153 @@ found: return 0; } +/* + * Validate generated interface id to make sure it does not fall in any reserved range: + * + * https://www.iana.org/assignments/ipv6-interface-ids/ipv6-interface-ids.xhtml + */ +static bool +validate_ifid(uint8_t *iid) +{ + static uint8_t allzero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + static uint8_t reserved_eth[5] = { 0x02, 0x00, 0x5E, 0xFF, 0xFE }; + static uint8_t reserved_anycast[7] = { 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + + /* Subnet-Router Anycast (RFC 4291)*/ + if (memcmp(iid, allzero, 8) == 0) + return (false); + + /* + * Reserved IPv6 Interface Identifiers corresponding to the IANA Ethernet Block (RFC 4291) + * and + * Proxy Mobile IPv6 (RFC 6543) + */ + if (memcmp(iid, reserved_eth, 5) == 0) + return (false); + + /* Reserved Subnet Anycast Addresses (RFC 2526) */ + if (memcmp(iid, reserved_anycast, 7) == 0 && iid[7] >= 0x80) + return (false); + + return (true); +} + +/* + * Get interface identifier for the specified interface, according to + * RFC 7217 Stable and Opaque IDs with SLAAC, using HMAC-SHA256 digest. + * + * in6 - upper 64bits are preserved + */ +bool +in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) +{ + struct sockaddr_dl *sdl; + const uint8_t *netiface; + size_t netiface_len, hostuuid_len; + uint8_t hostuuid[HOSTUUIDLEN + 1], hmac_key[SHA256_BLOCK_LENGTH], + hk_ipad[SHA256_BLOCK_LENGTH], hk_opad[SHA256_BLOCK_LENGTH]; + uint64_t dad_failures; + SHA256_CTX ctxt; + + switch (V_ip6_stableaddr_netifsource) { + case IP6_STABLEADDR_NETIFSRC_ID: + sdl = get_interface_link_level(ifp); + if (sdl == NULL) + return (false); + netiface = (uint8_t *)&LLINDEX(sdl); + netiface_len = sizeof(u_short); /* real return type of LLINDEX */ + break; + + case IP6_STABLEADDR_NETIFSRC_MAC: + netiface = in6_get_interface_hwaddr(ifp, &netiface_len); + if (netiface == NULL) + return (false); + break; + + case IP6_STABLEADDR_NETIFSRC_NAME: + default: + netiface = (const uint8_t *)if_name(ifp); + netiface_len = strlen(netiface); + break; + } + + /* Use hostuuid as constant "secret" key */ + getcredhostuuid(curthread->td_ucred, hostuuid, sizeof(hostuuid)); + if (strncmp(hostuuid, DEFAULT_HOSTUUID, sizeof(hostuuid)) == 0) { + // If hostuuid is not set, use a random value + arc4rand(hostuuid, HOSTUUIDLEN, 0); + hostuuid[HOSTUUIDLEN] = '\0'; + } + hostuuid_len = strlen(hostuuid); + + dad_failures = counter_u64_fetch(ND_IFINFO(ifp)->dad_failures); + + /* + * RFC 7217 section 7 + * + * default max retries + */ + if (dad_failures > V_ip6_stableaddr_maxretries) + return (false); + + /* + * Use hostuuid as basis for HMAC key + */ + memset(hmac_key, 0, sizeof(hmac_key)); + if (hostuuid_len <= SHA256_BLOCK_LENGTH) { + /* copy to hmac key variable, zero padded */ + memcpy(hmac_key, hostuuid, hostuuid_len); + } else { + /* if longer than block length, use hash of the value, zero padded */ + SHA256_Init(&ctxt); + SHA256_Update(&ctxt, hostuuid, hostuuid_len); + SHA256_Final(hmac_key, &ctxt); + } + /* XOR key with ipad and opad values */ + for (uint16_t i = 0; i < sizeof(hmac_key); i++) { + hk_ipad[i] = hmac_key[i] ^ HMAC_IPAD; + hk_opad[i] = hmac_key[i] ^ HMAC_OPAD; + } + + /* + * Generate interface id in a loop, adding an offset to be factored in the hash function. + * This is necessary, because if the generated interface id happens to be invalid we + * want to force the hash function to generate a different one, otherwise we would end up + * in an infinite loop trying the same invalid interface id over and over again. + * + * Using an uint8 counter for the offset, so limit iteration at UINT8_MAX. This is a safety + * measure, this will never iterate more than once or twice in practice. + */ + for(uint8_t offset = 0; offset < UINT8_MAX; offset++) { + uint8_t digest[SHA256_DIGEST_LENGTH]; + + /* Calculate inner hash */ + SHA256_Init(&ctxt); + SHA256_Update(&ctxt, hk_ipad, sizeof(hk_ipad)); + SHA256_Update(&ctxt, in6->s6_addr, prefixlen / 8); + SHA256_Update(&ctxt, netiface, netiface_len); + SHA256_Update(&ctxt, (uint8_t *)&dad_failures, 8); + SHA256_Update(&ctxt, hostuuid, hostuuid_len); + SHA256_Update(&ctxt, &offset, 1); + SHA256_Final(digest, &ctxt); + + /* Calculate outer hash */ + SHA256_Init(&ctxt); + SHA256_Update(&ctxt, hk_opad, sizeof(hk_opad)); + SHA256_Update(&ctxt, digest, sizeof(digest)); + SHA256_Final(digest, &ctxt); + + if (validate_ifid(digest)) { + /* assumes sizeof(digest) > sizeof(ifid) */ + memcpy(&in6->s6_addr[8], digest, 8); + + return (true); + } + } + + return (false); +} + /* * Get interface identifier for the specified interface. If it is not * available on ifp0, borrow interface identifier from other information @@ -279,7 +461,14 @@ get_ifid(struct ifnet *ifp0, struct ifnet *altifp, NET_EPOCH_ASSERT(); - /* first, try to get it from the interface itself */ + /* first, try to get it from the interface itself, with stable algorithm, if configured */ + if ((ND_IFINFO(ifp0)->flags & ND6_IFF_STABLEADDR) && in6_get_stableifid(ifp0, in6, 64) == 0) { + nd6log((LOG_DEBUG, "%s: got interface identifier from itself (stable private)\n", + if_name(ifp0))); + goto success; + } + + /* then/otherwise try to get it from the interface itself */ if (in6_get_hw_ifid(ifp0, in6) == 0) { nd6log((LOG_DEBUG, "%s: got interface identifier from itself\n", if_name(ifp0))); diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h index 897926e90078..851610a92bcf 100644 --- a/sys/netinet6/in6_ifattach.h +++ b/sys/netinet6/in6_ifattach.h @@ -39,6 +39,8 @@ void in6_ifattach(struct ifnet *, struct ifnet *); void in6_ifattach_destroy(void); void in6_ifdetach(struct ifnet *); void in6_ifdetach_destroy(struct ifnet *); +int in6_get_tmpifid(struct ifnet *, u_int8_t *, const u_int8_t *, int); +bool in6_get_stableifid(struct ifnet *, struct in6_addr *, int); void in6_tmpaddrtimer(void *); int in6_get_hw_ifid(struct ifnet *, struct in6_addr *); int in6_nigroup(struct ifnet *, const char *, int, struct in6_addr *); diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index b289d4eeb0a2..6669a2ba56ce 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -167,6 +167,7 @@ VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix * walk list every 5 sec. */ VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */ VNET_DEFINE(int, ip6_v6only) = 1; +VNET_DEFINE(int, ip6_stableaddr_maxretries) = IP6_IDGEN_RETRIES; #ifdef IPSTEALTH VNET_DEFINE(int, ip6stealth) = 0; @@ -313,6 +314,15 @@ SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RR_PRUNE, rr_prune, SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USETEMPADDR, use_tempaddr, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip6_use_tempaddr), 0, "Create RFC3041 temporary addresses for autoconfigured addresses"); +SYSCTL_BOOL(_net_inet6_ip6, IPV6CTL_USESTABLEADDR, use_stableaddr, + CTLFLAG_VNET | CTLFLAG_RWTUN, &VNET_NAME(ip6_use_stableaddr), 0, + "Create RFC7217 semantically opaque address for autoconfigured addresses (default for new interfaces)"); +SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STABLEADDR_MAXRETRIES, stableaddr_maxretries, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip6_stableaddr_maxretries), IP6_IDGEN_RETRIES, + "RFC7217 semantically opaque address DAD max retries"); +SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STABLEADDR_NETIFSRC, stableaddr_netifsource, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip6_stableaddr_netifsource), IP6_STABLEADDR_NETIFSRC_NAME, + "RFC7217 semantically opaque address Net_Iface source (0 - name, 1 - ID, 2 - MAC addr)"); SYSCTL_PROC(_net_inet6_ip6, IPV6CTL_TEMPPLTIME, temppltime, CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, NULL, 0, sysctl_ip6_temppltime, "I", diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index b22491a6007f..99dad1e7c309 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -235,6 +235,7 @@ ip6_vnet_init(void *arg __unused) &V_ip6_auto_linklocal); TUNABLE_INT_FETCH("net.inet6.ip6.accept_rtadv", &V_ip6_accept_rtadv); TUNABLE_INT_FETCH("net.inet6.ip6.no_radr", &V_ip6_no_radr); + TUNABLE_BOOL_FETCH("net.inet6.ip6.use_stableaddr", &V_ip6_use_stableaddr); CK_STAILQ_INIT(&V_in6_ifaddrhead); V_in6_ifaddrhashtbl = hashinit(IN6ADDR_NHASH, M_IFADDR, diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index cc6f9efbe4b4..c28bfa5a9d08 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -338,8 +338,20 @@ VNET_DECLARE(int, ip6_use_tempaddr); /* Whether to use temporary addresses */ VNET_DECLARE(int, ip6_prefer_tempaddr); /* Whether to prefer temporary * addresses in the source address * selection */ +VNET_DECLARE(bool, ip6_use_stableaddr); /* Whether to use stable address generation (RFC 7217) */ #define V_ip6_use_tempaddr VNET(ip6_use_tempaddr) #define V_ip6_prefer_tempaddr VNET(ip6_prefer_tempaddr) +#define V_ip6_use_stableaddr VNET(ip6_use_stableaddr) + +#define IP6_IDGEN_RETRIES 3 /* RFC 7217 section 7 default max retries */ +VNET_DECLARE(int, ip6_stableaddr_maxretries); +#define V_ip6_stableaddr_maxretries VNET(ip6_stableaddr_maxretries) + +#define IP6_STABLEADDR_NETIFSRC_NAME 0 +#define IP6_STABLEADDR_NETIFSRC_ID 1 +#define IP6_STABLEADDR_NETIFSRC_MAC 2 +VNET_DECLARE(int, ip6_stableaddr_netifsource); +#define V_ip6_stableaddr_netifsource VNET(ip6_stableaddr_netifsource) VNET_DECLARE(int, ip6_use_defzone); /* Whether to use the default scope * zone when unspecified */ diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 8480e7fc90e3..938d411711f0 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -324,6 +324,13 @@ nd6_ifattach(struct ifnet *ifp) /* XXX: we cannot call nd6_setmtu since ifp is not fully initialized */ nd6_setmtu0(ifp, nd); + /* Configure default value for stable addresses algorithm, skip loopback interface */ + if (V_ip6_use_stableaddr && !(ifp->if_flags & IFF_LOOPBACK)) { + nd->flags |= ND6_IFF_STABLEADDR; + } + + nd->dad_failures = counter_u64_alloc(M_WAITOK); + return nd; } @@ -343,6 +350,8 @@ nd6_ifdetach(struct ifnet *ifp, struct nd_ifinfo *nd) } NET_EPOCH_EXIT(et); + counter_u64_free(nd->dad_failures); + free(nd, M_IP6NDP); } diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index ae1de36f73e0..4322066b0912 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -76,6 +76,7 @@ struct nd_ifinfo { u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */ u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */ u_int8_t randomid[8]; /* current random ID */ + counter_u64_t dad_failures; /* DAD failures when using RFC 7217 stable addresses */ }; #define ND6_IFF_PERFORMNUD 0x1 @@ -89,6 +90,7 @@ struct nd_ifinfo { #define ND6_IFF_NO_RADR 0x40 #define ND6_IFF_NO_PREFER_IFACE 0x80 /* XXX: not related to ND. */ #define ND6_IFF_NO_DAD 0x100 +#define ND6_IFF_STABLEADDR 0x800 #ifdef EXPERIMENTAL /* XXX: not related to ND. */ #define ND6_IFF_IPV6_ONLY 0x200 /* draft-ietf-6man-ipv6only-flag */ diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 45ab5841b291..74f63ed6dfdc 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -1453,9 +1454,14 @@ nd6_dad_timer(void *arg) * No duplicate address found. Check IFDISABLED flag * again in case that it is changed between the * beginning of this function and here. + * + * Reset DAD failures counter if using stable addresses. */ - if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) == 0) + if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) == 0) { ia->ia6_flags &= ~IN6_IFF_TENTATIVE; + if ((ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) && !(ia->ia6_flags & IN6_IFF_TEMPORARY)) + counter_u64_zero(ND_IFINFO(ifp)->dad_failures); + } nd6log((LOG_DEBUG, "%s: DAD complete for %s - no duplicates found\n", @@ -1484,20 +1490,39 @@ nd6_dad_duplicated(struct ifaddr *ifa, struct dadq *dp) struct ifnet *ifp; char ip6buf[INET6_ADDRSTRLEN]; + ifp = ifa->ifa_ifp; + log(LOG_ERR, "%s: DAD detected duplicate IPv6 address %s: " "NS in/out/loopback=%d/%d/%d, NA in=%d\n", - if_name(ifa->ifa_ifp), ip6_sprintf(ip6buf, &ia->ia_addr.sin6_addr), + if_name(ifp), ip6_sprintf(ip6buf, &ia->ia_addr.sin6_addr), dp->dad_ns_icount, dp->dad_ns_ocount, dp->dad_ns_lcount, dp->dad_na_icount); ia->ia6_flags &= ~IN6_IFF_TENTATIVE; ia->ia6_flags |= IN6_IFF_DUPLICATED; - ifp = ifa->ifa_ifp; log(LOG_ERR, "%s: DAD complete for %s - duplicate found\n", if_name(ifp), ip6_sprintf(ip6buf, &ia->ia_addr.sin6_addr)); - log(LOG_ERR, "%s: manual intervention required\n", - if_name(ifp)); + + /* + * For RFC 7217 stable addresses, increment failure counter here if we still have retries. + * More addresses will be generated as long as retries are not exhausted. + */ + if ((ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) && !(ia->ia6_flags & IN6_IFF_TEMPORARY)) { + uint64_t dad_failures = counter_u64_fetch(ND_IFINFO(ifp)->dad_failures); + + if (dad_failures <= V_ip6_stableaddr_maxretries) { + counter_u64_add(ND_IFINFO(ifp)->dad_failures, 1); + /* if retries exhausted, output an informative error message */ + if (dad_failures == V_ip6_stableaddr_maxretries) + log(LOG_ERR, "%s: manual intervention required, consider disabling \"stableaddr\" on the interface" + " or checking hostuuid for uniqueness\n", + if_name(ifp)); + } + } else { + log(LOG_ERR, "%s: manual intervention required\n", + if_name(ifp)); + } /* * If the address is a link-local address formed from an interface diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 0f3e855f5b4d..85046c0dd9fe 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -92,6 +92,7 @@ VNET_DEFINE(int, nd6_defifindex); #define V_nd6_defifp VNET(nd6_defifp) VNET_DEFINE(int, ip6_use_tempaddr) = 0; +VNET_DEFINE(bool, ip6_use_stableaddr) = 0; VNET_DEFINE(int, ip6_desync_factor); VNET_DEFINE(uint32_t, ip6_temp_max_desync_factor) = TEMP_MAX_DESYNC_FACTOR_BASE; @@ -1163,7 +1164,7 @@ in6_ifadd(struct nd_prefixctl *pr, int mcast) struct in6_aliasreq ifra; struct in6_ifaddr *ia, *ib; int error, plen0; - struct in6_addr mask; + struct in6_addr mask, newaddr; int prefixlen = pr->ndpr_plen; int updateflags; char ip6buf[INET6_ADDRSTRLEN]; @@ -1189,37 +1190,46 @@ in6_ifadd(struct nd_prefixctl *pr, int mcast) * (4) it is easier to manage when an interface has addresses * with the same interface identifier, than to have multiple addresses * with different interface identifiers. + * + * If using stable privacy generation, generate a new address with + * the algorithm specified in RFC 7217 section 5 */ - ifa = (struct ifaddr *)in6ifa_ifpforlinklocal(ifp, 0); /* 0 is OK? */ - if (ifa) - ib = (struct in6_ifaddr *)ifa; - else - return NULL; - - /* prefixlen + ifidlen must be equal to 128 */ - plen0 = in6_mask2len(&ib->ia_prefixmask.sin6_addr, NULL); - if (prefixlen != plen0) { - ifa_free(ifa); - nd6log((LOG_INFO, - "%s: wrong prefixlen for %s (prefix=%d ifid=%d)\n", - __func__, if_name(ifp), prefixlen, 128 - plen0)); - return NULL; - } /* make ifaddr */ in6_prepare_ifra(&ifra, &pr->ndpr_prefix.sin6_addr, &mask); + if (ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) { + memcpy(&newaddr, &pr->ndpr_prefix.sin6_addr, sizeof(pr->ndpr_prefix.sin6_addr)); + + if(!in6_get_stableifid(ifp, &newaddr, prefixlen)) + return NULL; + } else { + ifa = (struct ifaddr *)in6ifa_ifpforlinklocal(ifp, 0); /* 0 is OK? */ + if (ifa) + ib = (struct in6_ifaddr *)ifa; + else + return NULL; + + /* prefixlen + ifidlen must be equal to 128 */ + plen0 = in6_mask2len(&ib->ia_prefixmask.sin6_addr, NULL); + if (prefixlen != plen0) { + ifa_free(ifa); + nd6log((LOG_DEBUG, + "%s: wrong prefixlen for %s (prefix=%d ifid=%d)\n", + __func__, if_name(ifp), prefixlen, 128 - plen0)); + return NULL; + } + + memcpy(&newaddr, &ib->ia_addr.sin6_addr, sizeof(ib->ia_addr.sin6_addr)); + ifa_free(ifa); + } + IN6_MASK_ADDR(&ifra.ifra_addr.sin6_addr, &mask); /* interface ID */ - ifra.ifra_addr.sin6_addr.s6_addr32[0] |= - (ib->ia_addr.sin6_addr.s6_addr32[0] & ~mask.s6_addr32[0]); - ifra.ifra_addr.sin6_addr.s6_addr32[1] |= - (ib->ia_addr.sin6_addr.s6_addr32[1] & ~mask.s6_addr32[1]); - ifra.ifra_addr.sin6_addr.s6_addr32[2] |= - (ib->ia_addr.sin6_addr.s6_addr32[2] & ~mask.s6_addr32[2]); - ifra.ifra_addr.sin6_addr.s6_addr32[3] |= - (ib->ia_addr.sin6_addr.s6_addr32[3] & ~mask.s6_addr32[3]); - ifa_free(ifa); + ifra.ifra_addr.sin6_addr.s6_addr32[0] |= (newaddr.s6_addr32[0] & ~mask.s6_addr32[0]); + ifra.ifra_addr.sin6_addr.s6_addr32[1] |= (newaddr.s6_addr32[1] & ~mask.s6_addr32[1]); + ifra.ifra_addr.sin6_addr.s6_addr32[2] |= (newaddr.s6_addr32[2] & ~mask.s6_addr32[2]); + ifra.ifra_addr.sin6_addr.s6_addr32[3] |= (newaddr.s6_addr32[3] & ~mask.s6_addr32[3]); /* lifetimes. */ ifra.ifra_lifetime.ia6t_vltime = pr->ndpr_vltime; @@ -1447,6 +1457,7 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, int auth; struct in6_addrlifetime lt6_tmp; char ip6buf[INET6_ADDRSTRLEN]; + bool has_temporary = false; NET_EPOCH_ASSERT(); @@ -1592,9 +1603,6 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, if (ifa6->ia6_ndpr != pr) continue; - if (ia6_match == NULL) /* remember the first one */ - ia6_match = ifa6; - /* * An already autoconfigured address matched. Now that we * are sure there is at least one matched address, we can @@ -1654,6 +1662,13 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, if ((ifa6->ia6_flags & IN6_IFF_TEMPORARY) != 0) { u_int32_t maxvltime, maxpltime; + /* + * if stable addresses (RFC 7217) are enabled, mark that a temporary address has been found + * to avoid generating uneeded extra ones. + */ + if (ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR) + has_temporary = true; + if (V_ip6_temp_valid_lifetime > (u_int32_t)((time_uptime - ifa6->ia6_createtime) + V_ip6_desync_factor)) { @@ -1682,6 +1697,24 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, } ifa6->ia6_lifetime = lt6_tmp; ifa6->ia6_updatetime = time_uptime; + + /* + * If using stable addresses (RFC 7217) and we still have retries to perform, ignore + * addresses already marked as duplicated, since a new one will be generated. + * Also ignore addresses marked as temporary, since their generation is orthogonal to + * opaque stable ones. + * + * There is a small race condition, in that the dad_counter could be incremented + * between here and when a new address is generated, but this will cause that generation + * to fail and no further retries should happen. + */ + if (ND_IFINFO(ifp)->flags & ND6_IFF_STABLEADDR && + counter_u64_fetch(ND_IFINFO(ifp)->dad_failures) <= V_ip6_stableaddr_maxretries && + ifa6->ia6_flags & (IN6_IFF_DUPLICATED | IN6_IFF_TEMPORARY)) + continue; + + if (ia6_match == NULL) /* remember the first one */ + ia6_match = ifa6; } if (ia6_match == NULL && new->ndpr_vltime) { int ifidlen; @@ -1732,8 +1765,11 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr, * immediately together with a new set of temporary * addresses. Thus, we specifiy 1 as the 2nd arg of * in6_tmpifadd(). + * + * Skip this if a temporary address has been marked as + * found (happens only if stable addresses (RFC 7217) is in use) */ - if (V_ip6_use_tempaddr) { + if (V_ip6_use_tempaddr && !has_temporary) { int e; if ((e = in6_tmpifadd(ia6, 1, 1)) != 0) { nd6log((LOG_NOTICE, "%s: failed to " diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 6e6f40c3ff64..cbca8ec20941 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1058,6 +1058,9 @@ ifinfo(char *ifname, int argc, char **argv) #endif #ifdef ND6_IFF_NO_PREFER_IFACE SETFLAG("no_prefer_iface", ND6_IFF_NO_PREFER_IFACE); +#endif +#ifdef ND6_IFF_STABLEADDR + SETFLAG("stableaddr", ND6_IFF_STABLEADDR); #endif SETVALUE("basereachable", ND.basereachable); SETVALUE("retrans", ND.retrans); @@ -1144,6 +1147,10 @@ ifinfo(char *ifname, int argc, char **argv) if ((ND.flags & ND6_IFF_AUTO_LINKLOCAL)) xo_emit("{l:%s} ", "auto_linklocal"); #endif +#ifdef ND6_IFF_STABLEADDR + if ((ND.flags & ND6_IFF_STABLEADDR)) + xo_emit("{l:%s} ", "stableaddr"); +#endif #ifdef ND6_IFF_NO_PREFER_IFACE if ((ND.flags & ND6_IFF_NO_PREFER_IFACE)) xo_emit("{l:%s} ", "no_prefer_iface"); From nobody Mon Feb 16 19:47: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 4fFCwZ6zYcz6SFlJ for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwZ6Mrzz3p6m for ; Mon, 16 Feb 2026 19:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6v7eW3eBSgTzXwA+ojIGQwdbrHINhBlhZLZUlk5xuxs=; b=mZPYKx+2OWnPYRLOiWmgscLu+2Nxge+YGCC/gzT5vXRao0KXhYhIHEwxMYYicQgap/F83g yOg/iJtyBGPPKSUH8BXsTYFuFrZplr/rGFM22HQWFba6p6qZge3FsLh1neb/mPqSZgOsVO AT/L7u1v0Y/YDhZut/8rcVZI3tOS8ru3pCbvY6NxNzReYjzpR6maW5Yoav7cHhhEdBw95H +Xl19RaokKd1fkagidix3ErLeTdHII/OsG7asd7CoT4etQtBk9JlHKo6vkEwkrWQo+q9iK nH8dgkK53lZ9c/p/hT3cNE/3ywwNypMyJeLX5f/0LpTx8kFX0r8eZee/u8CTmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271246; a=rsa-sha256; cv=none; b=Za1VCycZAQO6y4cwZ5wwi+y47oAmDgIcQQERQ2ZiXrwUqWer4f0V+itHZfxwA4xBdzltAV 1AyrjgCiWS+gA0GlEZpgvH4J3WhaSdfo3Ib2pvN78pX5PxK2RKOe6Y1wITmQkhL44z1BDt AV8sHX4FHpei/bZeUyYEVEQuADzQxWXbDsnQ9gbvQ24SXNyO0k9/8DlEHY5Mjqw0dnhHuy AlzMvOI4aWgzwRm62LqlKKAG3BF0BVnB7ME8LAhNTd/PTnc3PVKNkNTBXo+uq1AaHSWYmP vKDMqfgo8bMREzMoMgvocXk/QCzobBU1cH4lODok3dXD7Wotm4REtZJiFhdTBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6v7eW3eBSgTzXwA+ojIGQwdbrHINhBlhZLZUlk5xuxs=; b=auSg094AfQEjJb+QiyqfiJzMpuPK4Kl4nC1Nyu5sYz/9a7pKt33yIY2lfyg3fo+6ZOVTLm nyYCZxYpOkBSEAwm8nnUzzyO1lyjXRcwGP+fTpxpAfsMnHubhv1M5hgn5utP1/sugf4LiF H3nZsdx0MULMdDhEZOjqW/ftbkdAF1MMWegSOTvsRz6Mh8TEz3DRvUImKmyeGb8exJW9Ts +BQT+7KVJxFFrxfYsAVAECoQ3riuDi2vIkvoNwh+uytQz1QP7k/b47I7N8cI4u6DStBVVx UHTSZzTZ/nR0VBYFlWYyTMgQYvw2dN6NRnVX23LeH/+g7TI48izP/+J3ZROrjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwZ5VPmzdLW for ; Mon, 16 Feb 2026 19:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d4763c1fe5bc - stable/14 - ifconfig: Exit with a non-zero status when SIOCSIFFIB fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4763c1fe5bcb803ad32645f6e316efce9e21571 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:26 +0000 Message-Id: <6993744e.3f9c4.5407cd09@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d4763c1fe5bcb803ad32645f6e316efce9e21571 commit d4763c1fe5bcb803ad32645f6e316efce9e21571 Author: Mark Johnston AuthorDate: 2026-01-28 16:11:47 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ifconfig: Exit with a non-zero status when SIOCSIFFIB fails Previously, setting an interface FIB to some invalid value would result in a warning being printed, but the ifconfig command would exit with status 0, but this is wrong. Add a little regression test. Reviewed by: pouria, zlei, melifaro MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54918 (cherry picked from commit 2ea85a622bcba92a7b58901d6a6e945df3022c4e) --- sbin/ifconfig/iffib.c | 16 ++++++---------- sbin/ifconfig/tests/Makefile | 3 ++- sbin/ifconfig/tests/ifconfig.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c index a99dd6885d08..c1f9b3defb40 100644 --- a/sbin/ifconfig/iffib.c +++ b/sbin/ifconfig/iffib.c @@ -69,14 +69,12 @@ setiffib(if_ctx *ctx, const char *val, int dummy __unused) char *ep; fib = strtoul(val, &ep, 0); - if (*ep != '\0' || fib > UINT_MAX) { - warn("fib %s not valid", val); - return; - } + if (*ep != '\0' || fib > UINT_MAX) + errx(1, "fib %s not valid", val); ifr.ifr_fib = fib; if (ioctl_ctx_ifr(ctx, SIOCSIFFIB, &ifr) < 0) - warn("ioctl (SIOCSIFFIB)"); + err(1, "ioctl (SIOCSIFFIB)"); } static void @@ -87,14 +85,12 @@ settunfib(if_ctx *ctx, const char *val, int dummy __unused) char *ep; fib = strtoul(val, &ep, 0); - if (*ep != '\0' || fib > UINT_MAX) { - warn("fib %s not valid", val); - return; - } + if (*ep != '\0' || fib > UINT_MAX) + errx(1, "fib %s not valid", val); ifr.ifr_fib = fib; if (ioctl_ctx_ifr(ctx, SIOCSTUNFIB, &ifr) < 0) - warn("ioctl (SIOCSTUNFIB)"); + err(1, "ioctl (SIOCSTUNFIB)"); } static struct cmd fib_cmds[] = { diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index e902f262552a..8203c97cb013 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,5 +1,6 @@ NETBSD_ATF_TESTS_SH= nonexistent_test -ATF_TESTS_SH+= inet6 +ATF_TESTS_SH+= ifconfig \ + inet6 TEST_METADATA+= execenv="jail" TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" diff --git a/sbin/ifconfig/tests/ifconfig.sh b/sbin/ifconfig/tests/ifconfig.sh new file mode 100644 index 000000000000..f95581ea97ba --- /dev/null +++ b/sbin/ifconfig/tests/ifconfig.sh @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2026 Stormshield + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +atf_test_case "badfib" "cleanup" +badfib_head() +{ + atf_set descr "Test adding an interface to a non-existent FIB" + atf_set require.user root +} +badfib_body() +{ + local epair + + vnet_init + + epair=$(vnet_mkepair) + atf_check -s exit:0 ifconfig ${epair}a fib 0 + atf_check -s not-exit:0 -e not-empty \ + ifconfig ${epair}a fib $(sysctl -n net.fibs) +} +badfib_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case badfib +} From nobody Mon Feb 16 19:47: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 4fFCwc0z3rz6SFr7 for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwb6ptBz3nrS for ; Mon, 16 Feb 2026 19:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrfIVklwBrjG0j0opWM5sZBOU8MXki/xUDMskQY+hyg=; b=H+sWYb2KhqlNcY4UgPEhkEwFhTexN3NlJW+8DH9J7ATdyXiQ4SQyjPnu7D6bmPpUYSwb9N ZP8xCK7Q9Zmx6GfWyj2t/ZvwZVjJgNcEs9/kdJy1Qh7tDeNjw5i8Rd0dO3fo1qWmMsXQah 6xp6GgzxDeUYgvo2GEIVSGYWl6jjCIrwk+c58ajr6EA7rECy2tLcXo/u92hFHyrP2Kl4A8 mxf7h+8MHc6m/Xp+uAUm8BjoflL2g3Eci7zvEkRruvE2Jou033NP+KhRrG+bpO3z8Mesrh /4AvyjwpNQPLNb7UewEx7ohtAZGrKjIMIrNTI06mVAZ0YogVWPMrY5W4KWGDKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271248; a=rsa-sha256; cv=none; b=PwYwXgt4FP2mlFZOrVIHX/2S+hyEfCzz4LbBsZ/3uKeT2ARkKYh9BVI97gENEqY8LCFirt hf7uGO4Yf3WmAomBh5aOO8GXLG+hUsRQdB8WDca3or0KNKJu/StfpNOu23fzIFzoK8wuZq d0A4+fzKeUazWoxLNKq7PrloMfm5YdzGMX1v5Gc09LQ0OXYfcmieHrdf5ud3cJsAEaDyNt d+Ce3/R9a9necCVpHfD/ToO+mQIqcYZVjCiKtmc6MWGy4or5RUBt9Z5NX6XjGwkJ35fmBS llzASSEEZkoXQQPDvFkmsq/OJzKpX7LEbj9Yy1fyWS3ljtp58WtWhQbqf9JlBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrfIVklwBrjG0j0opWM5sZBOU8MXki/xUDMskQY+hyg=; b=MT4zvh7to1Kk01/xuHNSTN9rzJR/R+vHljCs6InlhWZZ9X/ydL0Gbk8dJmts7amL7RfIWg iKWwKrH2fgkUVDewzGJgmc+1fIolIx4Vsd4FxnGSbGkSXQVL4LQzBZMK2Y5wV90sd3gqJ+ y3mFZTGZhw02ei+WLL6yYH/1ckOSORK9hbte/OJyGhCFt5KsT/HcMkoyMiqlpHAAOlWr2+ Nt6RRHV1Ul6zhST72Rpybs/QacRrTtM/2adni0hOE1nDD+dfvWD3n3ycVi3P5NkDhIxK7O wk2EZoI4JuGb3GFcOgGUJLku6RvI9UzHyf5e+ErDF7yyyEm3jJG/2Oxd2I8wBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwb6G0rzdvp for ; Mon, 16 Feb 2026 19:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fde5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0e0455aaa799 - stable/14 - ip6_mroute: Mark functions as static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e0455aaa799a27bd359468cb32b6a390aebb144 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:27 +0000 Message-Id: <6993744f.3fde5.1d39ff@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0455aaa799a27bd359468cb32b6a390aebb144 commit 0e0455aaa799a27bd359468cb32b6a390aebb144 Author: Mark Johnston AuthorDate: 2026-01-30 15:25:52 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip6_mroute: Mark functions as static No functional change intended. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit a03eabfebbce15d8ce028168969812d3ca2be206) (cherry picked from commit ebc9a98c1b7d0a47359dae34509e1d9c02767a88) --- sys/netinet6/ip6_mroute.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 9d30c1291b7b..9e41dd8176d3 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -362,16 +362,16 @@ static int get_sg_cnt(struct sioc_sg_req6 *); static struct callout expire_upcalls_ch; -int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); -int X_ip6_mrouter_done(void); -int X_ip6_mrouter_set(struct socket *, struct sockopt *); -int X_ip6_mrouter_get(struct socket *, struct sockopt *); -int X_mrt6_ioctl(u_long, caddr_t); +static int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); +static int X_ip6_mrouter_done(void); +static int X_ip6_mrouter_set(struct socket *, struct sockopt *); +static int X_ip6_mrouter_get(struct socket *, struct sockopt *); +static int X_mrt6_ioctl(u_long, caddr_t); /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ -int +static int X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) { int error = 0; @@ -439,7 +439,7 @@ X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) /* * Handle MRT getsockopt commands */ -int +static int X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) { int error = 0; @@ -458,7 +458,7 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) /* * Handle ioctl commands to obtain information from the cache */ -int +static int X_mrt6_ioctl(u_long cmd, caddr_t data) { int ret; @@ -588,7 +588,7 @@ ip6_mrouter_init(struct socket *so, int v, int cmd) /* * Disable IPv6 multicast forwarding. */ -int +static int X_ip6_mrouter_done(void) { mifi_t mifi; @@ -1058,7 +1058,7 @@ socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in6 *src) * that if this function is called from somewhere else in the originating * context in the future. */ -int +static int X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) { struct rtdetq *rte; From nobody Mon Feb 16 19:47: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 4fFCwd2qqvz6SFlK for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwd0nJxz3p4L for ; Mon, 16 Feb 2026 19:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qVOacOHjZnswprm32Orf6IQqCWTcIxdczAkFeHAcjUY=; b=KpinMTNSXU4q6rYyZqKb3vi4Drgoq40fGtAumGxG7uyLOwVt7yrP55b2YC+if2dmNf+0N0 07HJy7eCmqqTOyXW+XiztaVI1En/ZQmq1e/CbUXiXMlkpzpoX/EMt2uf4jS6jyRFplGQeZ VFyrlNOJDBY0zmnAgprKxoP9x5DotdJsIvbnHg4Z6pzzM4agtCKoNlEYjLuXD7e1YZZWwp E5io6B86jz7Q6yLHHq+vaGpJRamNqe8Vr9XPekVGr1A0gnMnnJMJLhM9IavcIvJOQfsd8r zr3BcnZBk6rn1MwmozpmWx5X7zsqP4bH49LE1fAXtHcJYkP6PkLDNPwKQymffQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271249; a=rsa-sha256; cv=none; b=JfCdsfYJ5VGJx9SvISuIOu5VcWHKLCo22Y3QRaFeAl65yRmnc9n//qseXa5gJojfeOiGuJ WDlZ1EPxrAvAZoziy+u6+CTnWtLk9rdAsa8OL/7GTCiS/y61O8Chz4CizQ8Xiu3rSxdSPj ojEXq0tOcaRFwmikRzRVg9BdBh9u/xVpt7QUS5bRRvk7a95ZZa1PglIsnazEESkNC4aeTe kfdlP4gU3XudL9LTVgjWZx99/H9E5lVhEV6HPwhCIpKdg+EbDcOg8/8E7H5JPLoXBcc+yV IPLJ1Qd3zArs68Mw1q7w0MsoNkwBjxeicQJanX3UgPHrsBytvcafOu1oZLnURA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qVOacOHjZnswprm32Orf6IQqCWTcIxdczAkFeHAcjUY=; b=W1dLQUQlQYmMajKGo9tZB6Vc3HZ4f3t3PSFgBTnfdod0LBreupitpF3zB2BXULQc6DrwwH obV4pi5yjTEvppw1q1KagueGNbLJvdbk2pFGz5WL9echir3MNia2VUudMGY/i66FuL9Rws dKYqLiuerrOK1SFe39hqyE/hgE6347K4QomMupFJlB9KTgEwpCds3tjUOLrv0VKlRACPds 2pz/FllUqnxlxSwJ1mEuEQnu7tWu0G8CmEmu4zgaIzbeaSi/bMzLeglwbsWfaNuGIYqhCu UEXVtKJAHyloLa77cTgBlDoG9dDzgfqud2Zn4u8Td9pNRNJVhr3bPgrlW/X/Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwd03dnzdlH for ; Mon, 16 Feb 2026 19:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 49dbd7670300 - stable/14 - netstat: Fix whitespace in libxo output for multicast routes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 49dbd7670300e015a217ffb00a3110db5ef28c7d Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:28 +0000 Message-Id: <69937450.40d78.37ad6354@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=49dbd7670300e015a217ffb00a3110db5ef28c7d commit 49dbd7670300e015a217ffb00a3110db5ef28c7d Author: Mark Johnston AuthorDate: 2026-01-30 20:30:58 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 netstat: Fix whitespace in libxo output for multicast routes Also fix some bogus libxo format strings in mroute6.c, and close a couple of lists instead of opening them twice. Fixes: ade9ccfe211a ("Convert netstat to use libxo.") MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit 34c3e1d718a86436f863b2ae8b91bcf406b37f0e) (cherry picked from commit d2b595debaf2ff82a402c9226a77cd43cc97bb50) --- usr.bin/netstat/mroute.c | 11 +++++------ usr.bin/netstat/mroute6.c | 13 ++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c index a5da29e89009..84db9022e43b 100644 --- a/usr.bin/netstat/mroute.c +++ b/usr.bin/netstat/mroute.c @@ -39,7 +39,6 @@ * @(#)mroute.c 8.2 (Berkeley) 4/28/95 */ -#include /* * Print multicast routing structures and statistics. * @@ -160,7 +159,7 @@ print_bw_meter(struct bw_meter *bw_meter, int *banner_printed) } xo_emit(" {:remaining-time/%s}", s3); - xo_open_instance("bandwidth-meter"); + xo_close_instance("bandwidth-meter"); xo_emit("\n"); } @@ -189,9 +188,9 @@ print_mfc(struct mfc *m, int maxvif, int *banner_printed) } memcpy(&sin.sin_addr, &m->mfc_origin, sizeof(sin.sin_addr)); - xo_emit(" {:origin-address/%-15.15s}", routename(sa, numeric_addr)); + xo_emit(" {t:origin-address/%-*.15s}", 15, routename(sa, numeric_addr)); memcpy(&sin.sin_addr, &m->mfc_mcastgrp, sizeof(sin.sin_addr)); - xo_emit(" {:group-address/%-15.15s}", + xo_emit(" {t:group-address/%-15.15s}", routename(sa, numeric_addr)); xo_emit(" {:sent-packets/%9lu}", m->mfc_pkt_cnt); xo_emit(" {:parent/%3d} ", m->mfc_parent); @@ -306,12 +305,12 @@ mroutepr(void) xo_open_instance("vif"); memcpy(&sin.sin_addr, &v->v_lcl_addr, sizeof(sin.sin_addr)); - xo_emit(" {:vif/%2u} {:threshold/%6u} {:route/%-15.15s}", + xo_emit(" {:vif/%2u} {:threshold/%6u} {t:route/%-15.15s}", /* opposite math of add_vif() */ vifi, v->v_threshold, routename(sa, numeric_addr)); memcpy(&sin.sin_addr, &v->v_rmt_addr, sizeof(sin.sin_addr)); - xo_emit(" {:source/%-15.15s}", (v->v_flags & VIFF_TUNNEL) ? + xo_emit(" {t:source/%-15.15s}", (v->v_flags & VIFF_TUNNEL) ? routename(sa, numeric_addr) : ""); xo_emit(" {:received-packets/%9lu} {:sent-packets/%9lu}\n", diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c index 5873c1ee85c6..0b9438dee2a3 100644 --- a/usr.bin/netstat/mroute6.c +++ b/usr.bin/netstat/mroute6.c @@ -67,7 +67,6 @@ * @(#)mroute.c 8.2 (Berkeley) 4/28/95 */ -#include #ifdef INET6 #include #include @@ -155,7 +154,7 @@ mroute6pr(void) xo_close_instance("multicast-interface"); } if (banner_printed) - xo_open_list("multicast-interface"); + xo_close_list("multicast-interface"); else xo_emit("\n{T:IPv6 Multicast Interface Table is empty}\n"); @@ -176,19 +175,19 @@ mroute6pr(void) xo_open_list("multicast-forwarding-cache"); xo_emit("\n" "{T:IPv6 Multicast Forwarding Cache}\n"); - xo_emit(" {T:%-*.*s} {T:%-*.*s} {T:%s}", + xo_emit(" {T:/%-*.*s} {T:/%-*.*s} {T:/%s}\n", WID_ORG, WID_ORG, "Origin", WID_GRP, WID_GRP, "Group", - " Packets Waits In-Mif Out-Mifs\n"); + " Packets Waits In-Mif Out-Mifs"); banner_printed = 1; } xo_open_instance("multicast-forwarding-cache"); - xo_emit(" {:origin/%-*.*s}", WID_ORG, WID_ORG, + xo_emit(" {t:origin/%-*.*s}", WID_ORG, WID_ORG, routename(sin6tosa(&mfc.mf6c_origin), numeric_addr)); - xo_emit(" {:group/%-*.*s}", WID_GRP, WID_GRP, + xo_emit(" {t:group/%-*.*s}", WID_GRP, WID_GRP, routename(sin6tosa(&mfc.mf6c_mcastgrp), numeric_addr)); xo_emit(" {:total-packets/%9ju}", @@ -209,7 +208,7 @@ mroute6pr(void) xo_open_list("mif"); for (mifi = 0; mifi <= maxmif; mifi++) { if (IF_ISSET(mifi, &mfc.mf6c_ifset)) - xo_emit(" {l:%u}", mifi); + xo_emit(" {l:/%u}", mifi); } xo_close_list("mif"); xo_emit("\n"); From nobody Mon Feb 16 19:47: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 4fFCwf2VmMz6SFyd for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwf1BLvz3p4P for ; Mon, 16 Feb 2026 19:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6V9O/KB0nNmQTPpVdOIU5wKBSWEKuGc8qOjl4EbLxEw=; b=SUFt0BRUijXaXXOPS24BqGGBwIQHg5okRkN4Pno8nGHePon4il+VRSNpqgSRx5FxPtMR7d oBVotKwAKaKAnYQ4reiwablr7dEuQTfqfwqq3tABNoxJhJitOM39iLoOFt7fShIs5SMhuu 7vHSdx2x4TKUUyI1avw3jz2GC5Gvinf0GUNjbJruJYJP+ztP+ATmpF82cX5GCtUwNFunHH DT9JkWVu49/WVdphPFEZMbXCNgWaD9fAAS0JFS1rhtIY2OWlKRmJE3IF4ottz291uRo2Wu 8y4HAgq2T0bxi3bHtnKIWzIki6g872j9gwQ839jKIqz1d3f3pkYaqNgEwqGV0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271250; a=rsa-sha256; cv=none; b=uQWsiKBxnW67u+BcZkxJdNBCGEcySuWCMmSGECXkNoewlOSzjrV9Qahgk6BTPhJjgfJdqp ln6PplbpNQS8bqiHt+BfAFseSzh5Bbzv4cqmD1Dm9Qvj5A48+QNnzAziyIJ7dv/5sYTheX ZFs56pcvyrj133bQTlhzD4jgeDrGcEamhexFgp+KsFqb1ekPCtn5LHj50FA7ov1j1mVrk3 N2UPO4A18dgX2KYtCW+zeIYDveHA1ADBO41ZEgyGj55pI0u5YLFtpI7KgeLWMMbT8FcY+r OIQK5MJx6bTgeamG75RoUqZnNC8JMMV4aDo7bwQWmi6x6Hmsh1WFjuKleIRVUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6V9O/KB0nNmQTPpVdOIU5wKBSWEKuGc8qOjl4EbLxEw=; b=bKXXNKeTroX3Beb+aLJs5/l+9jWwmWcL+aWGaodpgb3S7U3pzidjvztIad7owSdL0fDeXf qaUr8Qmbf6xnhOy8mkUYLDFvsWNLWVzJ0q9NuOnckI57J63hzt/LDCKp9QFABeuya/nQMd oe7Mi9E86GWveTVBwUbUTMZfeZ++Fti1W8L1BZshrJDMxUOsW236EoP0xOweh0OTOSfPXo 8Xxat7ecWKri84/xBGkGiIdymBu9njwYlLU6wgUN84n0fFgGXvzCj434M6JxGAVt+d4vZA kEW2fvGkfa5Z56q4kT/MUJPuDVVc2EHWcA1tk4mSaEaEcGBhTyZZY/eV8F8sFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwf0mbzzdlK for ; Mon, 16 Feb 2026 19:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8845df6a4caa - stable/14 - atf_python: Run vnet handlers in $HOME List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8845df6a4caa08a0ae52eedfcf177b1b53a1057a Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:30 +0000 Message-Id: <69937452.40d7c.30aa259c@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8845df6a4caa08a0ae52eedfcf177b1b53a1057a commit 8845df6a4caa08a0ae52eedfcf177b1b53a1057a Author: Mark Johnston AuthorDate: 2026-02-02 14:52:43 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 atf_python: Run vnet handlers in $HOME When kyua runs a test, it creates a temp directory and sets $HOME to point to it. Tests are run with the cwd set to that temp directory. When a process attaches to a jail, its cwd is set to the root of the jail. Modify atf_python to cd to $HOME instead, so that it's easier for tests to share files. Reviewed by: zlei, ngie MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54971 (cherry picked from commit 07940d1d85eb338853fcba0697c6b9a96412a7f2) --- tests/atf_python/sys/net/vnet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index 41d612fc7c7f..d76933cb69a2 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -350,6 +350,7 @@ class VnetTestTemplate(BaseTest): vnetX_handler() after setting up interface addresses """ vnet.attach() + os.chdir(os.getenv("HOME")) print("# setup_vnet({})".format(vnet.name)) if pipe is not None: vnet.set_pipe(pipe) From nobody Mon Feb 16 19:47: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 4fFCwg64CHz6SFst for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwg2Gm7z3nrk for ; Mon, 16 Feb 2026 19:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpSttXnTtpxqRomqS0xcFcuHX0EXmf5TEaVZ3PQxQFU=; b=uE/0iHrSvH1PRJ4gzMPyHWQMua675M1lmeSy2Rsg/Y9lWMDhWrCgRdqtyUzLQ00vXuTVTV 5/bXR0A69qTCMGHcPJCaH9N7ZbLGkTueRIhDfXdBuH0jOaLfIBDlXEiWt8n7qExyGvUACO zxkK83/yTpI8K0aV62FB7F9jM7XdygxTG8j5qqYDpeRDapMMQstcMSEk3aGyGb76igKkF/ 8oEIZ+Wp7TbQnCynXGKc80q94W+CB9IBSVQFvuJnUdY7m77c4plRts61MJx9X54CppuUqt 9Z74axCaykBPD1wnmkE729eKAoYrrGnpFwaB6sJlwp/iYlLssondMSPz/56b3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271251; a=rsa-sha256; cv=none; b=YsOzsG0+CrJ1aadI5l9X8QpLWwTD1GLRsz/USEnEDuS6CcB8otdVF93ODnIay4ag28vCYu p9e+nthrUmNmcXekjflQinlpfyGYIyfWWgKFSGkZDgw80SjbpepUNh2rEgXLaxCd6p+lgr MwjzcgmZ0xR6ix+RZd2xTiBV4sFEMQv3QuEPj0svJmdSHB5c8CYWSIG3H2YOAFeVombTgi 0oSvS1RSBFF0BEYzGa2wOcDSF2WjI9YBn94+pZbbPIrxzSsjPah69pbKCYUX8YrkWtLzAq Ug1imL/KLl36f3Ztdz34dm6geqAJeH527HNY3VXRuwRUQcnzlyU63lHAJ9j6Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpSttXnTtpxqRomqS0xcFcuHX0EXmf5TEaVZ3PQxQFU=; b=i8Sv9zkT85BA8XhIDEflK6KFmwecJ0PKg4u+Mt/1P40VmTfnI4P8ygfhuKqePDTJyn/XQT UrDNZ7fy13FRn1CdDQZ3vHHf6ktbv3bALteQ41//QRqQ14y39CoSeKmh6V/3ziWe3MHIzJ mZdm6taBQE/91UO0k8C2BUN1NOfHJkdl5YCP1D8KbV0ExxrG51JFh1QqyeQBERxczNuEP2 in3mvqdkXR8CXqGhMED3aAYddGmsV6Qx9bjKlyBCju6B7pVtFdcOh91YGN8eUc/CZgUY2f SPUN5QK1Jkby3Ax4M+4kM5xWoDhbGnF+ZIarVSkcQD/1nvJ2YrfsMv2k5MjwSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwg1bmGzdlM for ; Mon, 16 Feb 2026 19:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ebe7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 289fadef7163 - stable/14 - atf_python: Fix a typo in a type annotation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 289fadef716377b06f02988beaaa2d78aecb7bc6 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:31 +0000 Message-Id: <69937453.3ebe7.5093663f@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=289fadef716377b06f02988beaaa2d78aecb7bc6 commit 289fadef716377b06f02988beaaa2d78aecb7bc6 Author: Mark Johnston AuthorDate: 2026-01-27 14:57:31 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 atf_python: Fix a typo in a type annotation No functional change intended. MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit ef389b7f581b2500c0e18c0989a54465712cd175) --- tests/atf_python/atf_pytest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/atf_python/atf_pytest.py b/tests/atf_python/atf_pytest.py index 19b5f88fa200..aa44fbf7826f 100644 --- a/tests/atf_python/atf_pytest.py +++ b/tests/atf_python/atf_pytest.py @@ -117,7 +117,7 @@ class ATFHandler(object): reason: str def __init__(self, report_file_name: Optional[str]): - self._tests_state_map: Dict[str, ReportStatus] = {} + self._tests_state_map: Dict[str, self.ReportState] = {} self._report_file_name = report_file_name self._report_file_handle = None From nobody Mon Feb 16 19:47: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 4fFCwh477cz6SFlP for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwh2l7Lz3p7J for ; Mon, 16 Feb 2026 19:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJRyT+aOHLxykohVwAtQ0yqhNda6qoMXtQPzKaXBAYE=; b=a6TXa7W+ExYSldrQUZQedzWVQoSpFCbKP2f1pdJLLvSkpqpWDimqF4XnpmvVpBzhUkJ+1H zMpamddXY97mvmCucB+CjqV1YW+y3gB5IRl//6GKrV2gTCDInTpRApQKTFli8fg4GwZztS bKpS3qeMoNAODCdD7x0j84FMhXDHxWuwSgwcJ6tnwIjOgIBP1U/Oli0kw08VzLUwoH1fRA bA4bM53sfQPyagt8OFmBOPaGfXqnNlTK1sQbHHFW8oWQIklU6W5olY0GDX/YktinuF4MTO HD49UsaHsaplAr9q7BOtvN0j/Fveb7p6xPMI6F1vA2GxqAb8v2QabNIjxldndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271252; a=rsa-sha256; cv=none; b=WnKs9FcYEFvjaFNPAl9ttRFcGqpveuTwLVJCJ4x8RunmrP+uVHKyW6S5hLH2zF3R3wUhC7 1l0UR+mtjkIFVaK43OULZHYG85bXkVSrToDzvr1bfIwqpoxNT9XV8FU+xD0m9gYu7+n/zu 9PXplOS8xMaTO5pUuZNIow+6qD5UdwicQN46s035NSGxoKOp+/PJOMTekM5Zgggm/+iH0m xESaen1CP8bT5E9LOE3gPAQ65leR6YxU/ylaLK9/L9od0zMzmWKk25n+BI9CQi/D5RSvqx LqiMCj2usA6p3UQtCY7Z9d8R0riLaC1Sgg2sPHCaiH4OmHlpMbPPoKKXpewjsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJRyT+aOHLxykohVwAtQ0yqhNda6qoMXtQPzKaXBAYE=; b=svDYyUboMgAYC0KL6UCQlFxByKGwzzdHyxO++DdOIa+uhhwY66eJODSPIlhwOWI8zK2tF6 JJr271352ala4kyz7MGFcUOnXVMJpBJUhWclJTAmgL3l2bSxW/zNq4aWW8LSTOYFiW3uyg 6R/s2rlA5p/3c4ItgsgFNJXTz7zU8LqngON7WlxyyUE5ORcHfBCH2yB5D5bP/jQsVXMY/k O5TFJY+NpSPSwGhFsQESUh2AlgEzkAext9ME/qMhr8Y3TZc24HuzdquQaeRC9j+YA0yYlu 835cYj/S6IIdgFrbW0/hFihOa1XYREI0E4Evbz4A6cgSEPYS/wgqO4GpflVL3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwh1xkTzdlN for ; Mon, 16 Feb 2026 19:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cd784bf4d001 - stable/14 - ip_mroute: Convert to using a regular mutex List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd784bf4d0010085cd029ed76d0a55b1c57a8e9e Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:32 +0000 Message-Id: <69937454.3fb63.7f9fc052@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd784bf4d0010085cd029ed76d0a55b1c57a8e9e commit cd784bf4d0010085cd029ed76d0a55b1c57a8e9e Author: Mark Johnston AuthorDate: 2026-01-27 14:58:02 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip_mroute: Convert to using a regular mutex The multicast routing code was using spin mutexes for packet counting, but there is no reason to use them instead of regular mutexes, given that none of this code runs in an interrupt context. Convert to using default mutexes. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54603 (cherry picked from commit a265c8b4a5a7c8fdd33e27b8f74bd2a514f82c70) --- sys/netinet/ip_mroute.c | 35 ++++++++++++++++++----------------- sys/netinet/ip_mroute.h | 10 +++++----- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 306335ff8b79..133269edf3ba 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -602,12 +602,12 @@ get_vif_cnt(struct sioc_vif_req *req) return EINVAL; } - mtx_lock_spin(&V_viftable[vifi].v_spin); + mtx_lock(&V_viftable[vifi].v_mtx); req->icount = V_viftable[vifi].v_pkt_in; req->ocount = V_viftable[vifi].v_pkt_out; req->ibytes = V_viftable[vifi].v_bytes_in; req->obytes = V_viftable[vifi].v_bytes_out; - mtx_unlock_spin(&V_viftable[vifi].v_spin); + mtx_unlock(&V_viftable[vifi].v_mtx); MRW_RUNLOCK(); return 0; @@ -985,8 +985,8 @@ add_vif(struct vifctl *vifcp) vifp->v_pkt_out = 0; vifp->v_bytes_in = 0; vifp->v_bytes_out = 0; - sprintf(vifp->v_spin_name, "BM[%d] spin", vifcp->vifc_vifi); - mtx_init(&vifp->v_spin, vifp->v_spin_name, NULL, MTX_SPIN); + sprintf(vifp->v_mtx_name, "BM[%d] mtx", vifcp->vifc_vifi); + mtx_init(&vifp->v_mtx, vifp->v_mtx_name, NULL, MTX_DEF); /* Adjust numvifs up if the vifi is higher than numvifs */ if (V_numvifs <= vifcp->vifc_vifi) @@ -1034,7 +1034,7 @@ del_vif_locked(vifi_t vifi, struct ifnet **ifp_multi_leave, struct ifnet **ifp_f } } - mtx_destroy(&vifp->v_spin); + mtx_destroy(&vifp->v_mtx); bzero((caddr_t)vifp, sizeof (*vifp)); @@ -1642,7 +1642,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) } /* If I sourced this packet, it counts as output, else it was input. */ - mtx_lock_spin(&V_viftable[vifi].v_spin); + mtx_lock(&V_viftable[vifi].v_mtx); if (in_hosteq(ip->ip_src, V_viftable[vifi].v_lcl_addr)) { V_viftable[vifi].v_pkt_out++; V_viftable[vifi].v_bytes_out += plen; @@ -1650,7 +1650,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) V_viftable[vifi].v_pkt_in++; V_viftable[vifi].v_bytes_in += plen; } - mtx_unlock_spin(&V_viftable[vifi].v_spin); + mtx_unlock(&V_viftable[vifi].v_mtx); rt->mfc_pkt_cnt++; rt->mfc_byte_cnt += plen; @@ -1687,14 +1687,14 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) for (x = rt->mfc_bw_meter_leq; x != NULL; x = x->bm_mfc_next) { /* * Record that a packet is received. - * Spin lock has to be taken as callout context + * A lock has to be taken as callout context * (expire_bw_meter_leq) might modify these fields * as well */ - mtx_lock_spin(&x->bm_spin); + mtx_lock(&x->bm_mtx); x->bm_measured.b_packets++; x->bm_measured.b_bytes += plen; - mtx_unlock_spin(&x->bm_spin); + mtx_unlock(&x->bm_mtx); } } @@ -1876,13 +1876,14 @@ expire_bw_meter_leq(void *arg) /* Reset counters */ x->bm_start_time = now; - /* Spin lock has to be taken as ip_forward context + /* + * The lock has to be taken as ip_forward context * might modify these fields as well */ - mtx_lock_spin(&x->bm_spin); + mtx_lock(&x->bm_mtx); x->bm_measured.b_bytes = 0; x->bm_measured.b_packets = 0; - mtx_unlock_spin(&x->bm_spin); + mtx_unlock(&x->bm_mtx); callout_schedule(&x->bm_meter_callout, tvtohz(&x->bm_threshold.b_time)); @@ -1968,8 +1969,8 @@ add_bw_upcall(struct bw_upcall *req) x->bm_time_next = NULL; x->bm_mfc = mfc; x->arg = curvnet; - sprintf(x->bm_spin_name, "BM spin %p", x); - mtx_init(&x->bm_spin, x->bm_spin_name, NULL, MTX_SPIN); + sprintf(x->bm_mtx_name, "BM mtx %p", x); + mtx_init(&x->bm_mtx, x->bm_mtx_name, NULL, MTX_DEF); /* For LEQ case create periodic callout */ if (req->bu_flags & BW_UPCALL_LEQ) { @@ -1996,7 +1997,7 @@ free_bw_list(struct bw_meter *list) /* MRW_WLOCK must be held here */ if (x->bm_flags & BW_METER_LEQ) { callout_drain(&x->bm_meter_callout); - mtx_destroy(&x->bm_spin); + mtx_destroy(&x->bm_mtx); } list = list->bm_mfc_next; @@ -2097,7 +2098,7 @@ bw_meter_geq_receive_packet(struct bw_meter *x, int plen, struct timeval *nowp) /* * Processing for ">=" type of bw_meter entry. - * bm_spin does not have to be hold here as in GEQ + * bm_mtx does not have to be hold here as in GEQ * case this is the only context accessing bm_measured. */ if (BW_TIMEVALCMP(&delta, &x->bm_threshold.b_time, >)) { diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index aefc0933485b..52899a6e3c4e 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -264,9 +264,9 @@ struct vif { u_long v_bytes_in; /* # bytes in on interface */ u_long v_bytes_out; /* # bytes out on interface */ #ifdef _KERNEL -#define MROUTE_VIF_SYSCTL_LEN __offsetof(struct vif, v_spin) - struct mtx v_spin; /* Spin mutex for pkt stats */ - char v_spin_name[32]; +#define MROUTE_VIF_SYSCTL_LEN __offsetof(struct vif, v_mtx) + struct mtx v_mtx; /* mutex for pkt stats */ + char v_mtx_name[32]; #endif }; @@ -352,8 +352,8 @@ struct bw_meter { #ifdef _KERNEL struct callout bm_meter_callout; /* Periodic callout */ void* arg; /* custom argument */ - struct mtx bm_spin; /* meter spin lock */ - char bm_spin_name[32]; + struct mtx bm_mtx; /* meter lock */ + char bm_mtx_name[32]; #endif }; From nobody Mon Feb 16 19:47: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 4fFCwj5F4xz6SFfd for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwj3ChNz3p7k for ; Mon, 16 Feb 2026 19:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1w9qB10E499Lva2VXqN1M3Dw0opH5fTKWraRoCXgYjc=; b=gPk9VMsy5C7WZ98T3jRBIE1gi6rLP9WUqRJmML9u1YFgavWiBvMplV6iioEwc9Fxg1m/1V t0ku2FxuG3PNxCcmT1ZvPYjpMGspN2/eumXpVW/ogfmwZdmmFdU93WhZ18Vok8+vGnqkSI ytd/utyYnh6nPE3BrzleGKiUvykNbG5cWKXQwblc8qKhPYBIUWfo82M3I1QKq281oH+lnt 4IhRjHSOnvxs74m7nW+GmXJ7uqILeOquXlI+2Pv9KZzpJsB+Xm5VYDgu+POsgeJKv7AuRb 1EsibMxfmO9claYEyZy/3OYOOEPATYDvThputnmFXb56UxZQ0rbTpcRg4WWZ3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271253; a=rsa-sha256; cv=none; b=xa8Ok2UGVe6W8Wd43dck02mIim17yxxl40A3pwO85wAc9Zfj4qtSMqPykAIEi1KMj8Pihd Zcg47FUti5tjsb4TxCNtyagOGcaFtrTZ7ol/7+1XSrtElmwpgFdPSm8HM+SqWCz6LaTxWC X6Dx7bmZYh/D6bb0rHkyDwZ9/TjppQSUM6qdgujYV5NJCiLDn+rslh+O1Mx9Fix4mnwIa4 7tOfJfaEcrExe6tJ6/H6Jhw2e11+3qJEFbfSqX+q/56alMti2xuHcYdEyJULznVadR5aHM SHroZpB27+pZBc+qX4H30BFeKs6Wc/bHgq0DktTojc2h9EBOQouD4jfQZcqmTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1w9qB10E499Lva2VXqN1M3Dw0opH5fTKWraRoCXgYjc=; b=Hu3Pp5Vmpi65szd5AxO+5iYzeddhoNYrmsjykq+WQrdlDeoug9KeXLDNDlbRcxooILbnhf WhK6l+Ly2RltQ+ZwJT7bpdFXpELNqmSR+CsOIjMfsU4n48sf3tJyzihOyiunlxIMFMtFMZ m6fBwgP5S3fy0XQ/AfyBcjPd89sAhLXM1s5hN616YGph4tjL8/ACRngDs/tRKCiCZLjEN3 unu8nA4Lq5AT0Zy75RvgfxIfTiyLrYclUHP8I2rqYFIm+z2bUIG39yb4V1FSRFSRX00P8Q kRSIuz0RlK6uzdP8UwAazXG0CbQ7GD/14rYdPWCmZ8HgIpf4pUAtAMCkGaG5GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwj2hZvzdLX for ; Mon, 16 Feb 2026 19:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f848 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 85250c12e509 - stable/14 - ip6_mroute: Remove an unused constant List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85250c12e509582048b4a80d10a996cee0eab3a2 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:33 +0000 Message-Id: <69937455.3f848.9382ee5@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=85250c12e509582048b4a80d10a996cee0eab3a2 commit 85250c12e509582048b4a80d10a996cee0eab3a2 Author: Mark Johnston AuthorDate: 2026-02-02 14:58:38 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip6_mroute: Remove an unused constant No functional change intended. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit b320e89e6909c0c3f29542976df0381990866988) --- sys/netinet6/ip6_mroute.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 9e41dd8176d3..3d5fc75d9a07 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -273,8 +273,6 @@ static void expire_upcalls(void *); */ static struct ifnet *multicast_register_if6; -#define ENCAP_HOPS 64 - /* * Private variables. */ From nobody Mon Feb 16 19:47: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 4fFCwk6sSfz6SFyn for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwk4Y92z3pGV for ; Mon, 16 Feb 2026 19:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JOADfKQQS4g5FI2WGC7ULwaTD+tjaRdWfwrkxjhvwY=; b=nysYAfQxER5/BDH6OS+4MDG1fH+/Ct/C51FvxH4haqri3TLFJA8zBxXXnhh+Cw7LmJu5ql 9nXSGd8VUcDgWfCsgRRaPbzRmby821Xhs1rPLjXqb//+bDLtPnDlCbkYhl/3E6KWmH8509 bpYgyB9sXHshqM6IKJgqeqWRPNX/T14fLlUguqgjdD4e/gOwuDJKG/BvBbCMtDtqsJ9X7O ulmL9jTzzFYYhuSl7kCcPXm1Rq8oqg1v3IOy2r6OntS15sV2z4QqINs6ydsvpWRIJHvyKT WEokGkGbROXcuTcQiDQf+nOdjrnfDL5uNmDUZnOpmz21VF9HebKyBjnejbFF3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271254; a=rsa-sha256; cv=none; b=BlBs3rDH3nJsC9W7TbTMjfdtca7A4m5kBRca5wXQV0yyvbBHzA/zOlZyyMDdu1bUuKcTb9 eCGJCWb0WD/vIV5C6YJumwY2HiFWRVIm4GG24bIiSVF93oVrA4ROqV/KUhucOR5oxMuIdF PQZWT1F3yGW/n3C+TTP2zYaCSC92yhCmS9unTGDTDJ5RV6t4oGPJWKfZrGaBefR91ioXtl m8xRr+/dIiht9wIo/2sQ6NF0qOgQXztwxAePiRhbnZWOigzaukkaeLvnnDO57+XpUw/Fcu zi9cxEKuisjOG4n1Y9Z0CUSW4YxGCBJ6c9y8SPLFlzrqObY53/+MAhAoaAkh1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JOADfKQQS4g5FI2WGC7ULwaTD+tjaRdWfwrkxjhvwY=; b=kovxtf7XdV9jAOlrza8RmTFd7KA1sA8dI3HS6f/Cv2/38348j02iElzCUEiqP6eAKqDFnv QmZFSaSaU/7ETDbbNawGB+bTpQyr2INkDhBXugzLqsfmWjH9bc3HaD84WeALbQgjgihJs7 2EcGWvdHNuWUqyvqJKfEBbjSiP0x7/07TSwhsXSBWPFfvq5K4AUaJDvvBPBkOMYxybyxUj CRUbeLZsnKEaxodL+L8KV8uOAEczBREFv3hS/YEd3V9d3MX/33l/ruJGGEiTomFCxq7TKo 4ge5SaVdN5jyK/GEEiCC2CDGhbbzI+1HD8FnHYgiLP9RuPyxc/RU/hZP40Hzvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwk3Zlxzdwl for ; Mon, 16 Feb 2026 19:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2e8f0a46d391 - stable/14 - ip_mroute: Make privilege checking more consistent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2e8f0a46d391c43f22c8deaa88e2c03cf205b8a4 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:34 +0000 Message-Id: <69937456.3f9c8.fb5c22@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2e8f0a46d391c43f22c8deaa88e2c03cf205b8a4 commit 2e8f0a46d391c43f22c8deaa88e2c03cf205b8a4 Author: Mark Johnston AuthorDate: 2026-02-02 14:53:35 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip_mroute: Make privilege checking more consistent - The v6 socket option and ioctl handlers had no privilege checks at all. The socket options, I believe, can only be reached via a raw socket, but a jailed root user with a raw socket shouldn't be able to configure multicast routing in a non-VNET jail. The ioctls can only be used to fetch stats. - Delete a bogus comment in X_mrt_ioctl(), one can issue multicast routing ioctls against any socket. Note that the call path is soo_ioctl()->rtioctl_fib()->mrt_ioctl(). I think all of the mroute privilege checks should be done within the ip(6)_mroute code, but let's first make the v4 and v6 modules consistent. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54982 (cherry picked from commit 74839871be363c5c2ac7ccd3396f36bdb58d19de) --- sys/netinet/ip_mroute.c | 5 ----- sys/netinet6/ip6_mroute.c | 15 +++++++++------ sys/netinet6/raw_ip6.c | 6 ++++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 133269edf3ba..5c71f6658a8f 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -542,11 +542,6 @@ X_mrt_ioctl(u_long cmd, caddr_t data, int fibnum __unused) { int error; - /* - * Currently the only function calling this ioctl routine is rtioctl_fib(). - * Typically, only root can create the raw socket in order to execute - * this ioctl method, however the request might be coming from a prison - */ error = priv_check(curthread, PRIV_NETINET_MROUTE); if (error) return (error); diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 3d5fc75d9a07..76e20b110d72 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -92,6 +92,7 @@ #include #include #include +#include #include #include #include @@ -459,24 +460,26 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) static int X_mrt6_ioctl(u_long cmd, caddr_t data) { - int ret; - - ret = EINVAL; + int error; + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error) + return (error); + error = EINVAL; switch (cmd) { case SIOCGETSGCNT_IN6: - ret = get_sg_cnt((struct sioc_sg_req6 *)data); + error = get_sg_cnt((struct sioc_sg_req6 *)data); break; case SIOCGETMIFCNT_IN6: - ret = get_mif6_cnt((struct sioc_mif_req6 *)data); + error = get_mif6_cnt((struct sioc_mif_req6 *)data); break; default: break; } - return (ret); + return (error); } /* diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index caee18cab071..caefba22c0ca 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -607,6 +607,9 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error != 0) + return (error); if (inp->inp_ip_p != IPPROTO_ICMPV6) return (EOPNOTSUPP); error = ip6_mrouter_get ? ip6_mrouter_get(so, sopt) : @@ -630,6 +633,9 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error != 0) + return (error); if (inp->inp_ip_p != IPPROTO_ICMPV6) return (EOPNOTSUPP); error = ip6_mrouter_set ? ip6_mrouter_set(so, sopt) : From nobody Mon Feb 16 19:47: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 4fFCwm2L6Sz6SFyv for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwl534Fz3pMH for ; Mon, 16 Feb 2026 19:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aGLjdmEVVIAWLVQZyJwvyR8b5XCWYi3vr7HzGsLAfyw=; b=eTc15A3PdMLVUUUAJMtd6gPetkhl/Dijq94A7xO/rG1UCDkaDrCb8ws6O3BJOtGym7VVCH ItbjY4/0VzlSbdr0waBxbapdCaHE6L64ss3UdZi34aNr4n4Bfv22K4+r3X/h/KLm7sL1h/ T/58Hg+ZqvQqqwSEl+P+dUGPK1s3rW7PCLXvOQV96dqfIa8ZC5ce+x+s12g5+sn/CI2kgF fK/gKanVZ50aiyk7Hjq6reBJUix+//H1EezkTrTfWwnI+c2h+1yLO0Ud7XKrVpJXcpI7kJ XEGF/Uv1E/2WOUSyLFCtWrJgrb5gJY0vSLmsLGwmmbHhiy7OqV0WGMp6RrZWcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271255; a=rsa-sha256; cv=none; b=aXbrmouxhoKrYqDZ9ChGrG54fRwWO+UcO7UgntkJkr/1dzXmVEmiqLsloadQ5fdDvLgZPX xlclAdBrwUFXw36mg/r6m9tWzKiDutKY5sBDJrbTqhqLlbSeBnOmJp46H01OFJcJK/OuSY 3T+49toEGJYGXcSriZgeX1Mm2bItO/zW3N9pvVXHd0z7kopRk1JpnljlROgQylSBuTQRvF dMpYGY2ugseNFCShzsULwZZk6H9ddb88RSNgau551/INRVIY6JJjRHIrBI6NnXdDjdhhE0 AxttBRa/Mij0u7WU6mH+mctu4MaXha+n6deQhTXdhzn63o7q+7Nu1WeVARXE+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=1771271255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aGLjdmEVVIAWLVQZyJwvyR8b5XCWYi3vr7HzGsLAfyw=; b=Au4d1Qmw8kstz28BToJpAHaNddrnnaAwCeSa2tELsxtwjDiigvz2BvueCk3cw/e5C+zF10 Fuz3IxPso7JEH8c7sBUFvlh15LGTzIAQFiBe4AxPqih3IKYTuGjX9GTRsnBWTYEcW3qntq UwOKyE6fLHrMQziOqZkkm8amB0jTUZPFcdxplCG+RzchGBsaM4QGiqlfkxa5qktt8wGCqF JOrjDqGo/FMG8LPZNXlmXEHQsNIaQOkhCLJrNMG/Oy21LZn5yNy6F9heqltIp8sfDzh9Pf F6iT/HdwEMCcrOD966H4g9dwoLAfjn65fBDaOAcMLBI0vCwg9MXnOwlO0Riviw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwl4Gnhzdvr for ; Mon, 16 Feb 2026 19:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fde9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 20f81dcba998 - stable/14 - ip6_mroute: Make MF6CFIND a regular function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20f81dcba99874bef290745e39abb53f94a8474f Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:35 +0000 Message-Id: <69937457.3fde9.c16fbe5@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20f81dcba99874bef290745e39abb53f94a8474f commit 20f81dcba99874bef290745e39abb53f94a8474f Author: Mark Johnston AuthorDate: 2026-02-02 14:57:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip6_mroute: Make MF6CFIND a regular function This is more natural and corresponds more closely to the v4 multicast routing code. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54983 (cherry picked from commit b370fcc716b9cfd4d08e291f0009f02452c84d64) --- sys/netinet6/ip6_mroute.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 76e20b110d72..86b65fbbd047 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -297,26 +297,6 @@ VNET_DEFINE_STATIC(int, pim6); (g).s6_addr32[0] ^ (g).s6_addr32[1] ^ \ (g).s6_addr32[2] ^ (g).s6_addr32[3]) -/* - * Find a route for a given origin IPv6 address and Multicast group address. - */ -#define MF6CFIND(o, g, rt) do { \ - struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ - rt = NULL; \ - while (_rt) { \ - if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \ - IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \ - (_rt->mf6c_stall == NULL)) { \ - rt = _rt; \ - break; \ - } \ - _rt = _rt->mf6c_next; \ - } \ - if (rt == NULL) { \ - MRT6STAT_INC(mrt6s_mfc_misses); \ - } \ -} while (/*CONSTCOND*/ 0) - /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code @@ -367,6 +347,22 @@ static int X_ip6_mrouter_set(struct socket *, struct sockopt *); static int X_ip6_mrouter_get(struct socket *, struct sockopt *); static int X_mrt6_ioctl(u_long, caddr_t); +static struct mf6c * +mf6c_find(const struct in6_addr *origin, const struct in6_addr *group) +{ + MFC6_LOCK_ASSERT(); + + for (struct mf6c *rt = mf6ctable[MF6CHASH(*origin, *group)]; rt != NULL; + rt = rt->mf6c_next) { + if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr, origin) && + IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr, group) && + rt->mf6c_stall == NULL) + return (rt); + } + MRT6STAT_INC(mrt6s_mfc_misses); + return (NULL); +} + /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ @@ -495,7 +491,7 @@ get_sg_cnt(struct sioc_sg_req6 *req) MFC6_LOCK(); - MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt); + rt = mf6c_find(&req->src.sin6_addr, &req->grp.sin6_addr); if (rt == NULL) { ret = ESRCH; } else { @@ -818,9 +814,8 @@ add_m6fc(struct mf6cctl *mfccp) MFC6_LOCK(); - MF6CFIND(mfccp->mf6cc_origin.sin6_addr, - mfccp->mf6cc_mcastgrp.sin6_addr, rt); - + rt = mf6c_find(&mfccp->mf6cc_origin.sin6_addr, + &mfccp->mf6cc_mcastgrp.sin6_addr); /* If an entry already exists, just update the fields */ if (rt) { MRT6_DLOG(DEBUG_MFC, "no upcall o %s g %s p %x", @@ -1115,7 +1110,7 @@ X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) /* * Determine forwarding mifs from the forwarding cache table */ - MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt); + rt = mf6c_find(&ip6->ip6_src, &ip6->ip6_dst); MRT6STAT_INC(mrt6s_mfc_lookups); /* Entry exists, so forward if necessary */ From nobody Mon Feb 16 19:47: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 4fFCwp0R7Jz6SFnZ for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwn64Wkz3pPl for ; Mon, 16 Feb 2026 19:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rK5319jQBsYzN30x3L+dQChR9VA091JxJkdiSnHZO8s=; b=qE0gDF/7krpn8LgkseiJAes++eEIY9KvskLb1zNy78q85OpS3EDVNCcGRVPaVP+YrzECuc u2pyxgbHm01D3JYfVyFy6vBeQCsaTFCnaSCPevlBZzXpRfl4ou0ejvgjne6XL+J7b0YXhO cuM1Z3UYxjcIoV1YI5lownUdWbDPCL4xoxzVTojUEA9lNozay7SEEN9WjIWXZ2whQq6ONJ 71wDuIVGK4ayggIM8qH6qqhYDkYxxCo5pv/VbV5rpnLFIJ3Ax2l2FZkYCQySTjT1U6fqep P1eNshB2c8LbuWWYKMfrlEzu7qAKCP5G5agXB4sE5A6gI3KZDIv/aamKJMMO7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271257; a=rsa-sha256; cv=none; b=q4kdQaafQEQRkxy7iHF8AxpRFNRSwHU+N1pYPt8q/xdjieX3Gr8pCRu6w/J9rGWj4igcBW d/dwhS9gXAVMrByCfssq7Ca3pMYCwSjphLU/o81+GJkKvi6pk3p77Ir1sBvAARCosYhnt/ Ux/9WSmuxKcUjPxKgho5C9mG7QPSCcolrpzdHK5ADKF2diU1gvuXLS/htXsFgzFCwbsPGz xDIgHszSLu2RVjPuyhr6ZMQpiiORtdy3gGBddfqwtzWzZK28MWX9c5oHOhJaCpksfJj1hL A4Yamd60YIwGsQFJmKJibUMnZDvMHzyLnPEJPla0z4k5uANfFHx2j1zMNUxJ5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rK5319jQBsYzN30x3L+dQChR9VA091JxJkdiSnHZO8s=; b=sdkOHLwcDS/iU4lA8/kYxCYeZHfIFhdFhNfjEl+vGax515RilKxsJkIn3Bb8BMtjw0a7rE 6pItC9lHbP/zmF0Sc1nMZa3kramy5Yj2ujZ4zGp/OD6k0631vE8nnbcfOVTtN4XqiNKDEX ReyIZrfROvH4b/eksgiCxGyABX4mzVdeWZIshug2fOOxrCI6tkD5zJA41uW7OdWQ+6hsvR H2KMt0w1+/vxlBPTtqnDM3pYGopNSIgSi9WzAb0zWG6wXEYHPeawUl3F6d35O19E9gPx9A vLOuX6fx14KCMELKzfCl0GONHd1TezqdxdFMiTwp3LvSRUl7DFyFMfN0H1PxJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwn5gHjzdlQ for ; Mon, 16 Feb 2026 19:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4081a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 21fe380f2d83 - stable/14 - ip6_mroute: Fix the UPCALL_TIMING 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21fe380f2d83fdbbebd3a97aff801476e24e4a16 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:37 +0000 Message-Id: <69937459.4081a.27c9a9ef@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=21fe380f2d83fdbbebd3a97aff801476e24e4a16 commit 21fe380f2d83fdbbebd3a97aff801476e24e4a16 Author: Mark Johnston AuthorDate: 2026-02-02 14:57:49 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip6_mroute: Fix the UPCALL_TIMING build MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit 5bb953b095461b488b102ab3025f42cd2ef61f9d) --- sys/netinet6/ip6_mroute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 2f5b95f715b4..f152014c3421 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -323,7 +323,7 @@ VNET_DEFINE_STATIC(int, pim6); #ifdef UPCALL_TIMING #define UPCALL_MAX 50 static u_long upcall_data[UPCALL_MAX + 1]; -static void collate(); +static void collate(struct timeval *); #endif /* UPCALL_TIMING */ static int ip6_mrouter_init(struct socket *, int, int); From nobody Mon Feb 16 19:47: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 4fFCwn52WBz6SFyx for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwm6T24z3pGm for ; Mon, 16 Feb 2026 19:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8Uv9X57MEdnI+xNQ8tQrFZoUJ8yLMPHBeXIPD2yXLM=; b=j1UXXD9h+0QKU5u4hz8Y84RGKJkPHg0TDVVv6cydqkCQKcCr12KYJVvNIkOkvzkl/Q8Ly0 oduilQA9WGV11wsIcHpqPyuNGMznFnnNWuDR5JKkVGakt+5C2pNG6wSRcIup/I9k9Yluxw jUj9UnRzV5gr93QzbubF6RyMZr1l8NxZlYPXZQe2B9o4WMLn4paPg+LloVh0Te63xfkf04 VQmNQqW4A/F1N7J4c7Zgqj360zeuZbMk8pNSnyarIrxRDs6ZF2meHj9btGCbX/AWPCjLi8 B2OtA5kyXKNUd0juH6GDk/34alC1lJPFqZ0FFEZgppFACbcJzTHc7K0/vxkQgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271256; a=rsa-sha256; cv=none; b=bv0stYMaRH88hGHGO3h9Mxq5JP5EX1287Mijt/CNq/FhvYp+CV5FdHGjAlIG0zA+31iqNm dfy45KoiRYG70TkQe2kQSEy61OLFRu93U0mZ5Z201Y0j5AhyeTTKDTBCrEkBniE/ttWDB/ lyNb5zpCHPGevcDH0movIOa346UoIyWp90FwmbxrMfpleu6/iRfAjm99rBkM2zXusniEXH y/pRFeYtro1s3VjuItUu8EJ8vVH1Mbh+wwLL0gphDzJThZilCPq9sYyHCmULcBKWh672hy KYzzw+aiyExa5rY6oXil00sZqg1+IWXrApCWcxzc4vH8m4KKn3X0eZr1Cv2xBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8Uv9X57MEdnI+xNQ8tQrFZoUJ8yLMPHBeXIPD2yXLM=; b=A51MGe4A9X6fmzD31KoR3FoHZhvPzSTSw8ftCzEBlQAVlXYm324rFxCaAddPjNldDeKgdL re5X/q+4rAsjYtgb6flPA9uf5tCdI6HiXysQc584JLkAMSyqXLwrJtO0wY0FDz45+p2muU zUFF9yI7Yr1bgE4xgwDWdVQlCqMtr9rbPHRpZgCXOlZblc1fvP9F8Tdj7QQfrH+1Ld0KpQ rQpbqv3sFdNkDSn3f6UbdYs73SbAP4aP0/CaEG1g0KKIP9Jt/FLvF6BnUg/smK1NLFyGdc P2cI45kZrbk5o5dPXGFqUJgXvzhb1MjKX2e9PcV2+R0RrVl9/Kzoy5wGf0LdQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwm598GzdGw for ; Mon, 16 Feb 2026 19:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40a05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 80e444f1f926 - stable/14 - ip6_mroute: Remove an unhelpful comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 80e444f1f92670d88bad35e227427c19b98800bc Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:36 +0000 Message-Id: <69937458.40a05.25f1105f@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=80e444f1f92670d88bad35e227427c19b98800bc commit 80e444f1f92670d88bad35e227427c19b98800bc Author: Mark Johnston AuthorDate: 2026-02-02 14:59:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 16:09:28 +0000 ip6_mroute: Remove an unhelpful comment ifnets already track if_allmulti() calls in the if_amcount field. That field is older than the comment, so I'm not exactly sure what the intent was; let's just remove it. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit a45fb94801dffd414bdb1981def0e977ef0c774f) --- sys/netinet6/ip6_mroute.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 86b65fbbd047..2f5b95f715b4 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -257,10 +257,6 @@ static void expire_upcalls(void *); #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ -/* - * XXX TODO: maintain a count to if_allmulti() calls in struct ifnet. - */ - /* * 'Interfaces' associated with decapsulator (so we can tell * packets that went through it from ones that get reflected From nobody Mon Feb 16 19:47: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 4fFCwq4PBQz6SFlY for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwq1Mp8z3p8N for ; Mon, 16 Feb 2026 19:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271259; 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=/xLISd0UaFkcnrOTSKOwh0X2w0jVzax1QpQYDCNSBtc=; b=FYtwHvGWYDt6QfL6GfRTUq0ohGAbGi7tT4Gt0K9SxIxVN9ePfIk2dXFNZeU+mc3y4nLZbr eKElfieqAWmyXzX1NNILpLQb35vgbTZwr8b9/Vt+6UpZQcl2GDc5dyndMId+scL0xchwPu uL/LgWDn5iSJQL8UYVQxsCKBPErEPTrSsNUJA6O2UDlWeHbopT/J2bIckksVYmeIu6DD2w YxarnEIHW+eBmWTuWq3cC3pfr/TqV9rBRVw/2a08jypNGxRbPNRrcYLfzcUrC8nuVWVh1K gQQbpqNIk+CzV1KGkhzU4hDtDv1WUR7cxVoS1ZMx32swbvrwP5nGr1NbYtyFCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271259; a=rsa-sha256; cv=none; b=TJYRinaFY8EGEkrU5K2L5F7B/XzsKUavr+GYw4X14M2up+tQbrHnSU99Szyenm0KE/+Xsh NV3pZdWVm9mOoE98zrvtliUHMVjaY4TOx/EFt8m/RyoRTxyEpnqsAcEiqmj3FmBTY6SINT JTW/QBMi+0/Y+7WE2CmD0M5HfUG/N+NtUClan0i5Q/58dY+vQao9Rve2v1SvUfAHOO0gAg 00WojNJLEoqe2NLV9R45YihqYWTepKfkfef+6Gk6SMseGYcv6upcIWD2rpyg47u0x/jNqD 9+id2UVg0SxlgmUSpOWAtTJtQlkoK7frqGLHlN9mHT1KpjeLPdC8Ths48aXL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271259; 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=/xLISd0UaFkcnrOTSKOwh0X2w0jVzax1QpQYDCNSBtc=; b=c7tGKxjSlSIQMsB6ILv+Jlfk52uZLDxh6LGhxmDSGVnWCclQ1bPzZz/GR8/OyuyzLTIhEx ldzCVXGSN4BJDrMH8fNtPm+O27XSNpA5ghvV2Tyz9V+n1QZlJkkU4cfls12uCDL/8zWu/x 4qgc16auQhYKv305Tj4sYaBUeWydNbY4nzDm0apRVKsVKPKumA5MJxdUOjgDwz3TnSmcYv uDrAJHaUYvayy09ESGDKeod8UuExsE6/L9wfzr1HQilKy1ybvynjYxin5xVtdO/KTNlVDm Fb0URvPqqR+2TQVmgz0sM6VrboyizRE4NoN8vQN+hXwzvqq8hYyiBJ3drItKXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwp6wnhzdhn for ; Mon, 16 Feb 2026 19:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f7fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Mark Johnston Subject: git: 30aaec7a23cb - stable/14 - tests/mac_ipacl: restore sysctls after modification List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 30aaec7a23cb580fe7a1e953340e8ae03d340f80 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:38 +0000 Message-Id: <6993745a.3f7fd.2b078b1a@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=30aaec7a23cb580fe7a1e953340e8ae03d340f80 commit 30aaec7a23cb580fe7a1e953340e8ae03d340f80 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 18:41:12 +0000 tests/mac_ipacl: restore sysctls after modification While here, use 'required_kmods' instead of ad-hoc checks. Signed-off-by: Siva Mahadevan Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull request: https://github.com/freebsd/freebsd-src/pull/1856 (cherry picked from commit 79042fd7ed4187d2a74e37618f6fd77f448ca353) --- tests/sys/mac/ipacl/Makefile | 5 +++++ tests/sys/mac/ipacl/ipacl_test.sh | 16 ++++++++++++---- tests/sys/mac/ipacl/utils.subr | 4 ---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tests/sys/mac/ipacl/Makefile b/tests/sys/mac/ipacl/Makefile index 4a5dfaa015c3..bfac10e4655a 100644 --- a/tests/sys/mac/ipacl/Makefile +++ b/tests/sys/mac/ipacl/Makefile @@ -7,4 +7,9 @@ ATF_TESTS_SH+= ipacl_test ${PACKAGE}FILES+= utils.subr +.for t in ${ATF_TESTS_SH} +TEST_METADATA.$t+= required_kmods="mac_ipacl" +TEST_METADATA.$t+= is_exclusive="true" +.endfor + .include diff --git a/tests/sys/mac/ipacl/ipacl_test.sh b/tests/sys/mac/ipacl/ipacl_test.sh index 0de1b414857b..892f4c154b66 100644 --- a/tests/sys/mac/ipacl/ipacl_test.sh +++ b/tests/sys/mac/ipacl/ipacl_test.sh @@ -40,6 +40,9 @@ ipacl_v4_body() { ipacl_test_init + prev_ipacl_ipv4="$(sysctl -n security.mac.ipacl.ipv4)" + prev_ipacl_rules="$(sysctl -n security.mac.ipacl.rules)" + epairA=$(vnet_mkepair) epairB=$(vnet_mkepair) epairC=$(vnet_mkepair) @@ -130,8 +133,9 @@ ipacl_v4_body() atf_check -s not-exit:0 -e ignore \ jexec A ifconfig ${epairA}b 203.0.113.1/24 up - # Reset rules OID. - sysctl security.mac.ipacl.rules= + # Reset sysctls. + sysctl security.mac.ipacl.rules="${prev_ipacl_rules}" + sysctl security.mac.ipacl.ipv4="${prev_ipacl_ipv4}" } ipacl_v4_cleanup() @@ -151,6 +155,9 @@ ipacl_v6_body() { ipacl_test_init + prev_ipacl_ipv6="$(sysctl -n security.mac.ipacl.ipv6)" + prev_ipacl_rules="$(sysctl -n security.mac.ipacl.rules)" + epairA=$(vnet_mkepair) epairB=$(vnet_mkepair) epairC=$(vnet_mkepair) @@ -265,8 +272,9 @@ ipacl_v6_body() atf_check -s not-exit:0 -e ignore jexec A ifconfig \ ${epairA}b inet6 2001:db8::abcd/32 up - # Reset rules OID. - sysctl security.mac.ipacl.rules= + # Reset sysctls. + sysctl security.mac.ipacl.rules="${prev_ipacl_rules}" + sysctl security.mac.ipacl.ipv6="${prev_ipacl_ipv6}" } ipacl_v6_cleanup() diff --git a/tests/sys/mac/ipacl/utils.subr b/tests/sys/mac/ipacl/utils.subr index 1d80414bafea..2fff8b1862da 100644 --- a/tests/sys/mac/ipacl/utils.subr +++ b/tests/sys/mac/ipacl/utils.subr @@ -5,10 +5,6 @@ ipacl_test_init() { vnet_init - - if ! kldstat -q -m mac_ipacl; then - atf_skip "mac_ipacl is not loaded" - fi } ipacl_test_cleanup() From nobody Mon Feb 16 19:47: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 4fFCws0lxDz6SFtN for ; Mon, 16 Feb 2026 19:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwr0dsNz3pQ4 for ; Mon, 16 Feb 2026 19:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271260; 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=EdkPTmCKKZJVfYqD248Pp6y445UHsjFRb3qifp5DjwE=; b=fIsnovdy6PBuulRBD74kipNXewGeUkX7yfVhQZyLcasw69ZQbXQzLvf5bo95T0iji4V+mb 1dxyx6Z4QGehiZguCqQbEAh4PEXkVVwWR9JAxWKD1cl8/zJ24d0nMhcmK5O4Pi318OE7XZ eImqXAqCo6W7Wt2IAhXm7HiN9wCd14jJvcpqZT2b2PXXwYtc9R5ahkai/SS1sIJkIoauno Jza+qXThgUp47qnmeMI6H5mkJ7+t8KT7/hB9il/E5BFu8yKwJs/VNsgztx9Ut4HDTSAr2f Lh48kZMHDJMDlKm59u2oySrq4ogdehMM12yHAI23NP6n6bjXQReOzWslgWqKqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271260; a=rsa-sha256; cv=none; b=ZhgRTCYwYwg5GZqBGTM1eF0asIcledzoquFf3bmHnH3xFA1DlJDMl7LIck0ZTfU1p/tQjs UnPNXcfBM/UKhiNuj/CRNX85HBsm4tASKV+nGTLnUNMJd1XXPfW16WgnzT7ts/ShPV2J0n mY0DdlSs+nxMcZuOpdNjsFGTzz7h3NIROgtFdLiS0l711gopCMuDyaoTOTAfVoc7stSWMO W/N4joDbX/r5dFtYLbutxSUxKQMohWJ6I5Nqh6cuacCO6eMQc3j9MtC1kAdNSKzVE+aGi2 VF2n+fah88huwLs9ULpa/luQi8p/JsK0qColHIoRkB3zy3tI2fO9GVAwp8Qqpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271260; 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=EdkPTmCKKZJVfYqD248Pp6y445UHsjFRb3qifp5DjwE=; b=EMjLc4wAYEtPbZphrHqSl/4Ef6sYBF8+x7p5fqUns0guivewYjJexOEIgmL6kEF1+8XCvT irI3ajFMH9IBWEEAxA48MWXyZ2ztjiiZ2T5oyDJpXClxLkQ0DAE2WfJU2foSSGI3pxzZRL mP/4+125Gs8fn3WSoXlibnjBZYTrvGYlGgG57tt6cw+jTCTsQOdzLHNLVBi/1AzgYi14Af ZZ8nIc8QgZMYtDGe8TO+iWxOrJ9p8Y5HQCCgjjmrbrjOhISUXXmfR0WYF8QZlmjxI8eVC6 LbIehHd5kVrzRl4b15KBjJnk5Pty/0s4yViAX/Dc0elpxDF7FS9zh/L8AUTbHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwq6w5Szdvs for ; Mon, 16 Feb 2026 19:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe56 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Mark Johnston Subject: git: b4c9b7d8c7ea - stable/14 - tests/mac_portacl: restore sysctls after modification List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4c9b7d8c7eaf297981b6197f4d3f15631703e36 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:39 +0000 Message-Id: <6993745b.3fe56.4c9c189b@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c9b7d8c7eaf297981b6197f4d3f15631703e36 commit b4c9b7d8c7eaf297981b6197f4d3f15631703e36 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 19:41:59 +0000 tests/mac_portacl: restore sysctls after modification While here, use 'required_kmods' instead of ad-hoc checks. Signed-off-by: Siva Mahadevan Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1855 (cherry picked from commit 170aac93479467334062813c1175a80200400b79) --- tests/sys/mac/portacl/Makefile | 1 + tests/sys/mac/portacl/misc.sh | 12 ++---------- tests/sys/mac/portacl/nobody_test.sh | 1 + tests/sys/mac/portacl/root_test.sh | 1 + 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile index 47993fe54c54..a26ff4a7c80a 100644 --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -9,6 +9,7 @@ TAP_TESTS_SH+= nobody_test TAP_TESTS_SH+= root_test .for t in ${TAP_TESTS_SH} +TEST_METADATA.$t+= required_kmods="mac_portacl" TEST_METADATA.$t+= required_user="root" TEST_METADATA.$t+= timeout="450" .endfor diff --git a/tests/sys/mac/portacl/misc.sh b/tests/sys/mac/portacl/misc.sh index a1b729c87777..4d3f18fce1c1 100644 --- a/tests/sys/mac/portacl/misc.sh +++ b/tests/sys/mac/portacl/misc.sh @@ -1,15 +1,5 @@ #!/bin/sh -sysctl security.mac.portacl >/dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "1..0 # SKIP MAC_PORTACL is unavailable." - exit 0 -fi -if [ $(id -u) -ne 0 ]; then - echo "1..0 # SKIP testcases must be run as root" - exit 0 -fi - ntest=1 check_bind() { @@ -95,6 +85,7 @@ bind_test() { sysctl security.mac.portacl.rules= >/dev/null } +portacl_enabled=$(sysctl -n security.mac.portacl.enabled) reserved_high=$(sysctl -n net.inet.ip.portrange.reservedhigh) suser_exempt=$(sysctl -n security.mac.portacl.suser_exempt) port_high=$(sysctl -n security.mac.portacl.port_high) @@ -103,4 +94,5 @@ restore_settings() { sysctl -n net.inet.ip.portrange.reservedhigh=${reserved_high} >/dev/null sysctl -n security.mac.portacl.suser_exempt=${suser_exempt} >/dev/null sysctl -n security.mac.portacl.port_high=${port_high} >/dev/null + sysctl -n security.mac.portacl.enabled=${portacl_enabled} >/dev/null } diff --git a/tests/sys/mac/portacl/nobody_test.sh b/tests/sys/mac/portacl/nobody_test.sh index 7e64f68113ea..a3f2168dc81d 100644 --- a/tests/sys/mac/portacl/nobody_test.sh +++ b/tests/sys/mac/portacl/nobody_test.sh @@ -13,6 +13,7 @@ trap restore_settings EXIT INT TERM sysctl security.mac.portacl.suser_exempt=1 >/dev/null sysctl net.inet.ip.portrange.reservedhigh=78 >/dev/null +sysctl security.mac.portacl.enabled=1 >/dev/null bind_test fl fl uid nobody tcp 77 bind_test ok ok uid nobody tcp 7777 diff --git a/tests/sys/mac/portacl/root_test.sh b/tests/sys/mac/portacl/root_test.sh index daa5b147b4fa..d8898ff4f80e 100644 --- a/tests/sys/mac/portacl/root_test.sh +++ b/tests/sys/mac/portacl/root_test.sh @@ -10,6 +10,7 @@ echo "1..48" trap restore_settings EXIT INT TERM sysctl security.mac.portacl.suser_exempt=1 >/dev/null +sysctl security.mac.portacl.enabled=1 >/dev/null bind_test ok ok uid root tcp 77 bind_test ok ok uid root tcp 7777 From nobody Tue Feb 17 12:52: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 4fFffp4chJz6SNC0 for ; Tue, 17 Feb 2026 12:52: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 4fFffn747Hz3h5s for ; Tue, 17 Feb 2026 12:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771332722; 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=fx8mGZEVgkPxJCLSTjceuVbFeYEbQ5P79eDC6yGT7Eg=; b=qTwEo8z0vurybwXkZljNnePiq0zaHlzhfTzB/mHt4IJFdGYq4dnDMR6R1BYdi1wJqEdBvD 6+UCaQL5/luNAcmBunVQLFFdlbyfqqOqeIdP9AcaVJZdelU95bxLPToSWwFyPfpOlWeHJM N5nAwnssSWbwEd3TvRNs8WLaovm1ShjIbnx/5B/xgGY1BxNcHi+dL5Pt0iMXwfrzi8l7Tq clZeyNNPwh6NaHPeY+gyPWE9cXVRoIP97UqAXJvkre1PO0zUrj6B84shHXzb5hNWF8R2o/ +FVM6+kPEdR5+IDEDM4fDgXiKjrJm8f26QxVIcfK160igNZdmdG+QGAR1ZdAXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771332722; a=rsa-sha256; cv=none; b=wkWay+TKU/xb+myNQDBtRo5GakwbWcJzix8rKnLF/5m6gVVCN0MwD+REM/AaavWx139y/v gb+bobhKe99DLx/3GdtwUiPHPSL2aZ6WMXYSxQDZh2y9BJ2WGY2Ef4opOcLi1VRRgGBqkU cprgmJPublFaa8e4JD7yPdyCF6KSar9CGSBJfCAXGg5J+WlVMOvGh+vfxFd0I5boVnYWw5 6NsGuBDcT7aCY3sd4AKels9o/pTCDfo33VxG+aUFFJJhm7ND8sen8iC3vVBgPNhcDInQyf /dr/nOc3NuL7KNl+fbHujUDFS3euVctdJvvT85pqV6YXU1aYnX9dGdWG9MR0sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771332722; 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=fx8mGZEVgkPxJCLSTjceuVbFeYEbQ5P79eDC6yGT7Eg=; b=Uy+YlBUSjvIQIuHQ8Cg6PepXNRAxMvVx1/8Ki9VFlTMOqZtbxhBfllIiqMkVkQUfi3sxa1 NsVq0IKSTprCWWWkvLSvYp/2yIlIuIzRbWF3OkaLkSdpqDHdPULcYDt/zXane3BbQbsMvW vFv1SkiBxDxi1GCtopgI+PZ868ylv2OxtD5GF/sFk0B1c77vRsSTJQP5N9Wav+DtDjhICA nonbM/Gy2O4DSg3LvU7Opg+yiqyTUV2GcNCyYXqX+f7Sciu2DnMoR0U7S18z1pUcC5tYGE H3JMsj3LELo8+DSkTyIMR0F6qi2JjpQSD6XIjqnR18hhY9pWPMm2QfwuLSxXfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFffn6Ny6z19Dj for ; Tue, 17 Feb 2026 12:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b66a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 12:52:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Christos Margiolis Subject: git: 3bd7deffdda7 - stable/15 - mixer/tests: use require.kmods property instead of ad-hoc checks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 3bd7deffdda7f9778254f4670e138e4cbac6eb2d Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 12:52:01 +0000 Message-Id: <69946471.3b66a.51e457ec@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd7deffdda7f9778254f4670e138e4cbac6eb2d commit 3bd7deffdda7f9778254f4670e138e4cbac6eb2d Author: Siva Mahadevan AuthorDate: 2026-02-11 21:50:00 +0000 Commit: Christos Margiolis CommitDate: 2026-02-17 12:51:28 +0000 mixer/tests: use require.kmods property instead of ad-hoc checks Reviewed by: christos Approved by: lwhsu (mentor) Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55221 (cherry picked from commit 5fa297f4bcd277dca7eef03e68363fb1e721799e) --- usr.sbin/mixer/tests/Makefile | 3 ++- usr.sbin/mixer/tests/mixer_test.sh | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/usr.sbin/mixer/tests/Makefile b/usr.sbin/mixer/tests/Makefile index c8056169f9a4..a39a66cc8277 100644 --- a/usr.sbin/mixer/tests/Makefile +++ b/usr.sbin/mixer/tests/Makefile @@ -1,6 +1,7 @@ ATF_TESTS_SH+= mixer_test # mixer tests fiddle with a singleton dummy audio device. -TEST_METADATA.mixer_test= is_exclusive=true +TEST_METADATA.mixer_test= is_exclusive=true \ + required_kmods="snd_dummy" .include diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh index 45003251c460..c48512db5ec7 100755 --- a/usr.sbin/mixer/tests/mixer_test.sh +++ b/usr.sbin/mixer/tests/mixer_test.sh @@ -45,13 +45,6 @@ restore_conf() test -r "test_mixer_conf" && mixer $(cat test_mixer_conf) } -load_dummy() -{ - if ! kldload -n snd_dummy; then - atf_skip "cannot load snd_dummy.ko" - fi -} - set_default() { deflt_unit="$(mixer | grep ^pcm | cut -f1 -d:)" @@ -78,7 +71,6 @@ o_flag_head() } o_flag_body() { - load_dummy mixer_exists set_default @@ -96,7 +88,6 @@ d_flag_head() } d_flag_body() { - load_dummy mixer_exists set_default @@ -118,7 +109,6 @@ volume_head() } volume_body() { - load_dummy mixer_exists set_default save_conf @@ -204,7 +194,6 @@ mute_head() } mute_body() { - load_dummy mixer_exists set_default save_conf @@ -248,7 +237,6 @@ recsrc_head() } recsrc_body() { - load_dummy mixer_exists set_default save_conf From nobody Tue Feb 17 13:17: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 4fFgCn18Tvz6SQC7 for ; Tue, 17 Feb 2026 13:17: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 4fFgCm4jqPz3kmt for ; Tue, 17 Feb 2026 13:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771334228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7R9YOHRhYIRBOLD+ucVSEOhQQIhbFNaU32ZPwyfWE0=; b=FfMfDPjJT2OyHW3bwYPac0tQY0/oJ4prfgMpUkb9OGGBuUab/scodrc1JNKw9/ee53EWzk RVg7eKHPYHN4QUsrBpxPR0qCMGpoJZz/pogJau8flMQ/vRznD/7ANdY3IEurX5ePdO9ri6 TPCa/mJ0oIEKjS0PQp30oPkwcKje66m9nA3TaA+GLfhtQH2Lc6ECDJxh7aSlRQJ8BVN+9A snxGpuAmADaOkGqf8cuZPxypLrzrwB6D0/MYLmJZ8FuXQAPPSgHLQMLUJZWbRfLIEJEwG8 HFABNNaFPvNSW12SD636WV8g/PZh/Sro0J1Wp5O6rJiErX0aC3I+k8PJV+ljow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771334228; a=rsa-sha256; cv=none; b=ZiHO+xcunjBZ2RKmwsISf2VV2NlqaUtaBriJQl0f9rui2O86karMUCqGOdSSDL/D9eSxOB P7zoIleL5r8IuMJ1E/k1tjbgSj+Uj8nuQ/r2OxDHEP8TGdbl6MLdOvwVC5qaVi7CfztEjy NiE9HbyMk+ZHEHDXVOTiTghtdK38MbBxSpnw0FX3TE/rlf8hEUNuXvaFSoGZTjbb1rp51k 6huwlNNoJDR5V9jKVK/maT4sq/GDeX8uc8SrKry3Eg2Gt+UXL6Tm5cDQoowkiIxt+l4FrU c+RjoIgIu/aURUyLqOuCN4HXYp2H7QXlcQhg5fyopvVbScEK2HL0HWzFiDhQ9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771334228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7R9YOHRhYIRBOLD+ucVSEOhQQIhbFNaU32ZPwyfWE0=; b=yf7S7UlJ8FNezm91y7qtMDGQzSEHAQNGPPElhOU6NO8ungk9OiaQhT2zyUlQu+DsrCYuZs qHfybVezKppo1XU3kOv6pE+lgVVWqv8e/KyFymUOntl7ggWIRcMzd27n5mnNelV1KOGP2b 93xET77/5heIMwx37pDQ7Xbo5BmaZhKb4QL2FytGLpr0dSheMhfCvU7SgaZax363jj/HN9 BgqWxbxUxdFqZCKd5bs545efJq0JVrZOtGSLXj+9ZvAhCkk7o4fwC75nfEG7b/sVrLlHxF Zt3UzijiUSrDxADrnH95AqaE1EU9F9sQmfJbDK3xYUC1LMZmUOIZpqasjwiQWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFgCm48fQz19RZ for ; Tue, 17 Feb 2026 13:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f3ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 13:17:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: b6279be747fa - stable/15 - libc: Improve {,l,ll,imax}div(3) manpages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b6279be747facd85eb4490fc874148fede854d03 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 13:17:08 +0000 Message-Id: <69946a54.3f3ca.4d461241@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=b6279be747facd85eb4490fc874148fede854d03 commit b6279be747facd85eb4490fc874148fede854d03 Author: Aymeric Wibo AuthorDate: 2026-02-12 14:50:19 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-17 13:16:20 +0000 libc: Improve {,l,ll,imax}div(3) manpages Mainly rename numerator parameter of div(3) and ldiv(3) from num to numer, and explicitly specify what "numer", "denom", and "rem" mean in the manpages. MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc (partially) Sponsored by: Klara, Inc. (cherry picked from commit 0bba277f2223a31e4453ade39be110b1b3aeb1dd) --- lib/libc/stdlib/div.3 | 14 ++++++++------ lib/libc/stdlib/div.c | 6 +++--- lib/libc/stdlib/imaxdiv.3 | 6 +++--- lib/libc/stdlib/ldiv.3 | 14 ++++++++------ lib/libc/stdlib/ldiv.c | 8 +++----- lib/libc/stdlib/lldiv.3 | 6 +++--- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3 index 55c1bd107cb7..87b9665684fb 100644 --- a/lib/libc/stdlib/div.3 +++ b/lib/libc/stdlib/div.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 14, 2001 +.Dd February 12, 2026 .Dt DIV 3 .Os .Sh NAME @@ -38,21 +38,23 @@ .Sh SYNOPSIS .In stdlib.h .Ft div_t -.Fn div "int num" "int denom" +.Fn div "int numer" "int denom" .Sh DESCRIPTION The .Fn div function computes the value -.Fa num/denom -and returns the quotient and remainder in a structure named +.Fa numer Ns / Ns Fa denom +(numerator/denominator). +It returns a structure named .Fa div_t that contains two .Vt int members named .Va quot -and -.Va rem . +(quotient) and +.Va rem +(remainder). .Sh SEE ALSO .Xr imaxdiv 3 , .Xr ldiv 3 , diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c index 351dca870553..cdc6e1922060 100644 --- a/lib/libc/stdlib/div.c +++ b/lib/libc/stdlib/div.c @@ -35,12 +35,12 @@ #include /* div_t */ div_t -div(int num, int denom) +div(int numer, int denom) { div_t r; - r.quot = num / denom; - r.rem = num % denom; + r.quot = numer / denom; + r.rem = numer % denom; return (r); } diff --git a/lib/libc/stdlib/imaxdiv.3 b/lib/libc/stdlib/imaxdiv.3 index 1553a81edae2..9e51c47b53c3 100644 --- a/lib/libc/stdlib/imaxdiv.3 +++ b/lib/libc/stdlib/imaxdiv.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 14, 2001 +.Dd February 12, 2026 .Dt IMAXDIV 3 .Os .Sh NAME @@ -39,9 +39,9 @@ The .Fn imaxdiv function computes the value of .Fa numer -divided by +(numerator) divided by .Fa denom -and returns the stored result in the form of the +(denominator) and returns the stored result in the form of the .Vt imaxdiv_t type. .Pp diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3 index 66abb00d4d6c..c2ab444bdcab 100644 --- a/lib/libc/stdlib/ldiv.3 +++ b/lib/libc/stdlib/ldiv.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 3, 2022 +.Dd February 12, 2026 .Dt LDIV 3 .Os .Sh NAME @@ -40,21 +40,23 @@ .Sh SYNOPSIS .In stdlib.h .Ft ldiv_t -.Fn ldiv "long num" "long denom" +.Fn ldiv "long numer" "long denom" .Sh DESCRIPTION The .Fn ldiv function computes the value -.Fa num Ns / Ns Fa denom -and returns the quotient and remainder in a structure named +.Fa numer Ns / Ns Fa denom +(numerator/denominator). +It returns the quotient and remainder in a structure named .Vt ldiv_t that contains two .Vt long members named .Va quot -and -.Va rem . +(quotient) and +.Va rem +(remainder). .Sh SEE ALSO .Xr div 3 , .Xr imaxdiv 3 , diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c index 4c73bcc14af4..4e92c56dd3e2 100644 --- a/lib/libc/stdlib/ldiv.c +++ b/lib/libc/stdlib/ldiv.c @@ -35,14 +35,12 @@ #include /* ldiv_t */ ldiv_t -ldiv(long num, long denom) +ldiv(long numer, long denom) { ldiv_t r; - /* see div.c for comments */ - - r.quot = num / denom; - r.rem = num % denom; + r.quot = numer / denom; + r.rem = numer % denom; return (r); } diff --git a/lib/libc/stdlib/lldiv.3 b/lib/libc/stdlib/lldiv.3 index d1de4e9234e3..783ea3df6554 100644 --- a/lib/libc/stdlib/lldiv.3 +++ b/lib/libc/stdlib/lldiv.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 14, 2001 +.Dd February 12, 2026 .Dt LLDIV 3 .Os .Sh NAME @@ -39,9 +39,9 @@ The .Fn lldiv function computes the value of .Fa numer -divided by +(numerator) divided by .Fa denom -and returns the stored result in the form of the +(denominator) and returns the stored result in the form of the .Vt lldiv_t type. .Pp From nobody Tue Feb 17 13:17: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 4fFgCl6lf2z6SQ4B for ; Tue, 17 Feb 2026 13:17: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 4fFgCl3zsmz3l4c for ; Tue, 17 Feb 2026 13:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771334227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVebD7A9dvyLnzepdX9PiN5dNsjhh5vhq9OuZrHrDVk=; b=Dl1uGzY3ur0iNortrzBFVSiH5u/hi/lmKy1hVTTet0hi0y5APz3FFmD4ie0mTQ51//JdKS uWu+phlbDtARo8yEcpaTx6skhFFr2Crd9K27vouyzdc21r9He4B0OXkmrPn6Toj+Y5vBq8 5/8WrtVbgowh8GDwvoz7CnjVi94qQd4g0vkTrC0TH9qpbOxlaOpqpBabmM8YjTG/LJvmib zfBVjqr6FJNeiDILBSRXtJMLisZGCr5ggBOyI9AmdAHe1R+FMzZ9sGS9oQ2GkGl9h07GIP omET4Gfj9PL6lmo7xqALiCVG1LRfkVJ4dp9vBBeGCxrtC6D2368UriLyF21QcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771334227; a=rsa-sha256; cv=none; b=ZB68O3/df19U0p5tHy+/B4fKylEx4l17OeUA6qmW2YAxJpQmBbv9WNtpeJfVC9+BXK03oY BhnHWXJqd99D+ocM2hPNTvQMxMTVx8h2TYxiSsuj146JomBIxhQRlv1hz81LWXZu0y4Isk VUbk8ZYsEXQt7RrMk9hPPQnrdcB0Cfr/n2qjHEjpXlZvJFz21ncrSYfvEPMB29Af5yQme7 MPXfKALHIoNsrDgcWFl9tC+NhZBsMukpzEhnVd7rFVAE1WwXG0CF6tch+GunhOtNuYH1j2 HjagBB6ECJ+58GGP6g0XkuawyBG6XCXJmDfaKsynscO7V9o60FsNNfweQ0yGLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771334227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVebD7A9dvyLnzepdX9PiN5dNsjhh5vhq9OuZrHrDVk=; b=vgEJgbXZ9vb7t5+YAAkOVPMuAFCcyobk7ApfLvlsw9KkEs23H+gKxTrUuvAFgFaHAcY2Sr qwJPyI1FrZbE/rTHUcHS3d/+A6bYj6+e7ikviSide+TKpqqpqwnKYrCE6MlJ01tOEgLy07 GwdOaGd6oo556nfBed1X02BI4t1iTg77VnViLzBHprdad8QVlMP7wRQ7EIHBSYb0TsRvA2 qOJa/dlcBiaR7IJB8G9gPQoM22nwCoCO49G1H85RJIG6FDGH6ZnJJqpubfWQ5odWjZCSoz U3KY5/kvOBZxAaukc6HoJ8gOPv4fmdMTNaplto+oJXr+n9OS1zTIvRfaH8sJNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFgCl3SkFz19gS for ; Tue, 17 Feb 2026 13:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f5f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 13:17:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: 69a3d9ab8019 - stable/15 - touch: Fix setting time of created file if fstat() fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 69a3d9ab8019752608f2597e9f0c7a4b8c21a062 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 13:17:07 +0000 Message-Id: <69946a53.3f5f0.127b282b@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=69a3d9ab8019752608f2597e9f0c7a4b8c21a062 commit 69a3d9ab8019752608f2597e9f0c7a4b8c21a062 Author: Aymeric Wibo AuthorDate: 2026-02-04 20:58:13 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-17 13:14:14 +0000 touch: Fix setting time of created file if fstat() fails Previously, if creating the file and fstat() fails, we would've ended up calling utimensat() on that file anyways with whatever was in sb. Not that this is an error likely to happen... We don't check for the return value of close() as we aren't writing anything to the file and the file is always created on success of open(). Reviewed by: kevans Approved by: kevans Fixes: cb54c500d0e1 ("touch: don't leak descriptor if fstat(2) fails") Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55117 MFC after: 1 week (cherry picked from commit b8d55a86995b5a8db5d1651c8dc9fc5093b67d2c) --- usr.bin/touch/touch.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 70257e320a60..2be2e369596c 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -163,19 +163,14 @@ main(int argc, char *argv[]) /* Create the file. */ fd = open(*argv, O_WRONLY | O_CREAT, DEFFILEMODE); - if (fd == -1) { + if (fd < 0 || fstat(fd, &sb) < 0) { rval = 1; warn("%s", *argv); + if (fd >= 0) + (void)close(fd); continue; } - if (fstat(fd, &sb) < 0) { - warn("%s", *argv); - rval = 1; - } - if (close(fd) < 0) { - warn("%s", *argv); - rval = 1; - } + (void)close(fd); /* If using the current time, we're done. */ if (!timeset) From nobody Tue Feb 17 13:17: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 4fFgCl0mXkz6SQ45 for ; Tue, 17 Feb 2026 13:17: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 4fFgCk3CMLz3kwd for ; Tue, 17 Feb 2026 13:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771334226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W6BCBHVT8x4CmRy7JpS1rXhqvpsnwCvkXwy85HMhDuc=; b=UzrVu/cQDDfJgx/yttU4Es7f4QX1vXlKNwKcbZRRPdvr6uL+lyY1YVUoA+qnvy1KM9u4ha L+P30g/hhoPOZ+fE2upC9oCNa+SttcpAnzwUAfsxUJQP+wldFpZlM7bhqySoKtOJgC5p5y Wu3gjSznREUoVWMh2QxXKZf1fHKifLH6RGi81C3qiBLpD6epg6T6nTk5Sj9j/Xh+erzDv4 /c0cmdTapYDbbOBCbsZxn5Vu4TQVOkb1XAY0SSvMIZw9Gf6jIrHVrQRVHjUNTKP1kmyA2G mRJPSQhZFOlcC3Z6LoCyWvam66tC9GkG3NTlSwzDhcNlK2rxoN56nf8LcElgug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771334226; a=rsa-sha256; cv=none; b=TAJ9uLnbs3VyJ3z4fvhgBSPFxRHIo83U8Op7PKCoVSjSDTlGXNoVkObnQns7sV+hH7qExG +Ike31Ss8+F5y3ck94PBv96tDk4xSUG+WW5YYUGPphhQ1dsfkOmfBaMgWihyC3Y1e0jmyp 4HZk5GWWkHSVjdDzuHoj6VYuMOoAzGZYDUJR+CrpIs0lkZ2XPhN4LNTmxZPIXQde3A5Sew KvDLQQb4fWVBMGe7ECmtAYiA0ji5qosWXggvVsfFIDYmN0AdaneVA3kdzzMqFQUw21XJyM DLAlcXhCXEWRO9mfvQjzqmXZLcKC832c7vhuGhkcp6DRVGvmf9ZyzmhDz0KHVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771334226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W6BCBHVT8x4CmRy7JpS1rXhqvpsnwCvkXwy85HMhDuc=; b=RaddA3A+pK/JAF/Tt4vuYdoZMcQ5jf5gpQHSA7rE8jdyL+YVYbAhVM1JsGvyxUtr0Zh4nG qU5m/LwVPjhflB3HMkjeqVPY4j0rWX9LVaMHdGupbMW0t8K8XaErQBxACQY5RylocO5+dg KmBa6d5GDHQoGTbL1ElBrBUEC5N7wOQYcC5wYGwa1UNAtTuxOgIuo6R9oflG6Q2K3+Wsvt fR+vzb1k8fsiYVmnaav/GOvgB5P3by9hpBRZtI64tag36KZ937BsNcW822F1inELO39AjE 4IIsfbFOQUPRnZM52OasRsjw2dMbCZnDVQ2BqZTUeY+2ZnaIYqASr877GofFzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFgCk2grlz19YK for ; Tue, 17 Feb 2026 13:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f412 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 13:17:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: d93f337357a8 - stable/15 - EVENTHANDLER.9: EVENTHANDLER_REGISTER never fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d93f337357a8c557c98559a9a45051587e879c91 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 13:17:06 +0000 Message-Id: <69946a52.3f412.64811982@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=d93f337357a8c557c98559a9a45051587e879c91 commit d93f337357a8c557c98559a9a45051587e879c91 Author: Aymeric Wibo AuthorDate: 2026-01-31 15:54:11 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-17 13:12:13 +0000 EVENTHANDLER.9: EVENTHANDLER_REGISTER never fails Since ecdf4409f910 ("Rework the eventhandler locking [...]"), EVENTHANDLER_REGISTER() can never return NULL. Suggested by: olce Reviewed by: olce, ziaee, zlei Approved by: olce, zlei Fixes: ecdf4409f910 ("Rework the eventhandler locking [...]") Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55014 (cherry picked from commit 9d4bad45e233ca7d93666ff1feff6282a88f8a9d) --- share/man/man9/EVENTHANDLER.9 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9 index 4bf3eebaa445..c3e7c9519b3b 100644 --- a/share/man/man9/EVENTHANDLER.9 +++ b/share/man/man9/EVENTHANDLER.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 7, 2022 +.Dd January 31, 2025 .Dt EVENTHANDLER 9 .Os .Sh NAME @@ -125,7 +125,6 @@ as its first parameter along with any additional parameters passed in via macro .Fn EVENTHANDLER_INVOKE (see below). -If registration is successful, .Fn EVENTHANDLER_REGISTER returns a cookie of type .Vt eventhandler_tag . From nobody Tue Feb 17 14:29: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 4fFhqY48mhz6QHFW for ; Tue, 17 Feb 2026 14:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFhqY2Btgz3sdF for ; Tue, 17 Feb 2026 14:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771338585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QrWHrPoTis1m8pFWGHA+7KVcrCh9f5MgVkGtEUMaCzA=; b=ix3WzgXWa0kZFROLGK0+9TZ7BwEIiS/XwjkmuUqo/WV3H3FD92NLjpSdeooMx/hVrjjlIs Mff4p+KPLLitx2grXpvN8sGYe3RkckLqLWjcmIwmqclsuHwwxpoEYobCHJhSxFbR/rXUxA GmrvD15WtzBozeikD49kfEKDj0U0775Zys1s/pxBv4P0F85rOeAYDPG/a71NwiJB1Cm8Jq ZCYEaDvYfZjlqlXDxHBq+AdLU3dEV8c5pNTKOGTrGuQpP1HjIZUwwKRW1aAE1j4Effb/xx cp2Zy1eHChVGGzyXBx1cXB1xIo4WRJM5Px2JsdUkvCJ3cP2ztioN0HGlk2BqBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771338585; a=rsa-sha256; cv=none; b=HF1GepH+/8y5aT08Tqo6wqRVjdUV/x2+jj3ATIGi/rMiRSQOFITgQ12PB2+ni1JCM5l5Dq a5sYYCVXQeIv5pDtEisNMM3rAUnEqBir/bE3DNrftq0Ld+lTmqwcZ72/Uji/hY0anVDA5Q 3RZJZePBw8KioOnf5++fuqAOmfILAbRSp1amorLQfNICMtF2to/BhK/nwXfAXQArhz3iA7 gCdt4l9NvUjfslUv53h7xPvKi0WMzBRFn0HysSNdfwGA/hYvGN666nadC5Nd9B9S2x8i8Q wYtSjjNLdc8R7cNFuRcjA28MVcFmNlkMWDIZL0JWTmUNmVxf0nYk9DqzSh9xwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771338585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QrWHrPoTis1m8pFWGHA+7KVcrCh9f5MgVkGtEUMaCzA=; b=QlZsnIZnVkFFNuRjRfqIZmoBDnew0Vwd0bG+iHbw3KQv4er3LWfcuor2+Nq1DG8pkTdU6w ht6F+5rhr0hEgDZnqTj9bCviH7j1mm6AC9/CJ6Xb2XLTncurGicq9G7Ix70U9QlABtk5Ej 8RVKV8L0Qvi6BmkXQDRanNbfI/79m/4+dK2VbhAG6E998nd+Uyi2P4y+AdESVLLjePxxrb VPYoW95Gs5F2FS6FO8cxqnhJJ+jQvLxThyIy7o/EqYyjvGbrAy7v6dExGAK8kZ6GOK5qPs mSq3DsiotCN3ysZAoId+7hninoU1NJEte5pmkAUjtBl/Qy0ENLYy1E9O9pAmQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFhqY0xHFz1C0G for ; Tue, 17 Feb 2026 14:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4613e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 14:29:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f3a0e54656cc - stable/15 - pf: fix use of uninitialised variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f3a0e54656ccec66ae94af0d717918eafa7c632b Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 14:29:45 +0000 Message-Id: <69947b59.4613e.7fe2e0a8@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a0e54656ccec66ae94af0d717918eafa7c632b commit f3a0e54656ccec66ae94af0d717918eafa7c632b Author: Kristof Provost AuthorDate: 2026-02-03 12:17:08 +0000 Commit: Kristof Provost CommitDate: 2026-02-17 14:21:14 +0000 pf: fix use of uninitialised variable In pf_match_rule() we attempt to append matching rules to the end of 'match_rules'. We want to preserve the order to make the multiple pflog entries easier to understand. So we keep track of the last added rule item in 'rt'. However, that assumed that 'match_rules' was only ever added to in that one call to pf_match_rules(). This isn't always the case, for example if we have match rules in different anchors. In that case we'd end up using the uninitialised 'rt' variable in the SLIST_INSERT_AFTER call. Instead track the match rules and the last matching rule (to enable easy appending) in the struct pf_test_ctx. This also allows us to reduce the number of arguments for some functions, because we passed a ctx to most functions that needed 'match_rules'. While here also make pf_match_rules() static, because it's only ever used in pf.c Add a test case to exercise the relevant code path. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit fe9e4eb6f38ae004efb576bf44aded08852f9e6b) --- sys/net/pfvar.h | 7 +++--- sys/netpfil/pf/pf.c | 41 ++++++++++++++---------------- tests/sys/netpfil/pf/match.sh | 58 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 26 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index a6b2f8f11e0f..9e0917b501e7 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1165,6 +1165,8 @@ struct pf_test_ctx { int rewrite; u_short reason; struct pf_src_node *sns[PF_SN_MAX]; + struct pf_krule_slist *match_rules; + struct pf_krule_item *last_match_rule; struct pf_krule *nr; struct pf_krule *tr; struct pf_krule **rm; @@ -2724,10 +2726,7 @@ int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t); #ifdef _KERNEL void pf_print_host(struct pf_addr *, u_int16_t, sa_family_t); -enum pf_test_status pf_step_into_anchor(struct pf_test_ctx *, struct pf_krule *, - struct pf_krule_slist *match_rules); -enum pf_test_status pf_match_rule(struct pf_test_ctx *, struct pf_kruleset *, - struct pf_krule_slist *); +enum pf_test_status pf_step_into_anchor(struct pf_test_ctx *, struct pf_krule *); void pf_step_into_keth_anchor(struct pf_keth_anchor_stackframe *, int *, struct pf_keth_ruleset **, struct pf_keth_rule **, struct pf_keth_rule **, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index dee02d296f1f..882c7f4cc0dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -342,14 +342,14 @@ static int pf_dummynet_route(struct pf_pdesc *, struct ifnet *, const struct sockaddr *, struct mbuf **); static int pf_test_eth_rule(int, struct pfi_kkif *, struct mbuf **); +static enum pf_test_status pf_match_rule(struct pf_test_ctx *, struct pf_kruleset *); static int pf_test_rule(struct pf_krule **, struct pf_kstate **, struct pf_pdesc *, struct pf_krule **, struct pf_kruleset **, u_short *, struct inpcb *, struct pf_krule_slist *); static int pf_create_state(struct pf_krule *, struct pf_test_ctx *, - struct pf_kstate **, u_int16_t, u_int16_t, - struct pf_krule_slist *match_rules); + struct pf_kstate **, u_int16_t, u_int16_t); static int pf_state_key_addr_setup(struct pf_pdesc *, struct pf_state_key_cmp *, int); static int pf_tcp_track_full(struct pf_kstate *, @@ -4758,8 +4758,7 @@ pf_tag_packet(struct pf_pdesc *pd, int tag) } while (0) enum pf_test_status -pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r, - struct pf_krule_slist *match_rules) +pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r) { enum pf_test_status rv; @@ -4777,7 +4776,7 @@ pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r, struct pf_kanchor *child; rv = PF_TEST_OK; RB_FOREACH(child, pf_kanchor_node, &r->anchor->children) { - rv = pf_match_rule(ctx, &child->ruleset, match_rules); + rv = pf_match_rule(ctx, &child->ruleset); if ((rv == PF_TEST_QUICK) || (rv == PF_TEST_FAIL)) { /* * we either hit a rule with quick action @@ -4788,7 +4787,7 @@ pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r, } } } else { - rv = pf_match_rule(ctx, &r->anchor->ruleset, match_rules); + rv = pf_match_rule(ctx, &r->anchor->ruleset); /* * Unless errors occured, stop iff any rule matched * within quick anchors. @@ -5637,10 +5636,9 @@ pf_rule_apply_nat(struct pf_test_ctx *ctx, struct pf_krule *r) } enum pf_test_status -pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, - struct pf_krule_slist *match_rules) +pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset) { - struct pf_krule_item *ri, *rt; + struct pf_krule_item *ri; struct pf_krule *r; struct pf_krule *save_a; struct pf_kruleset *save_aruleset; @@ -5780,12 +5778,12 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, } ri->r = r; - if (SLIST_EMPTY(match_rules)) { - SLIST_INSERT_HEAD(match_rules, ri, entry); + if (SLIST_EMPTY(ctx->match_rules)) { + SLIST_INSERT_HEAD(ctx->match_rules, ri, entry); } else { - SLIST_INSERT_AFTER(rt, ri, entry); + SLIST_INSERT_AFTER(ctx->last_match_rule, ri, entry); } - rt = ri; + ctx->last_match_rule = ri; pf_rule_to_actions(r, &pd->act); if (r->log) @@ -5810,7 +5808,7 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, ctx->arsm = ctx->aruleset; } if (pd->act.log & PF_LOG_MATCHES) - pf_log_matches(pd, r, ctx->a, ruleset, match_rules); + pf_log_matches(pd, r, ctx->a, ruleset, ctx->match_rules); if (r->quick) { ctx->test_status = PF_TEST_QUICK; break; @@ -5827,7 +5825,7 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, * Note: we don't need to restore if we are not going * to continue with ruleset evaluation. */ - if (pf_step_into_anchor(ctx, r, match_rules) != PF_TEST_OK) { + if (pf_step_into_anchor(ctx, r) != PF_TEST_OK) { break; } ctx->a = save_a; @@ -5863,6 +5861,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ctx.rsm = rsm; ctx.th = &pd->hdr.tcp; ctx.reason = *reason; + ctx.match_rules = match_rules; pf_addrcpy(&pd->nsaddr, pd->src, pd->af); pf_addrcpy(&pd->ndaddr, pd->dst, pd->af); @@ -5960,7 +5959,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ruleset = *ctx.rsm; } else { ruleset = &pf_main_ruleset; - rv = pf_match_rule(&ctx, ruleset, match_rules); + rv = pf_match_rule(&ctx, ruleset); if (rv == PF_TEST_FAIL) { /* * Reason has been set in pf_match_rule() already. @@ -5997,7 +5996,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, PFLOG_PACKET(r->action, ctx.reason, r, ctx.a, ruleset, pd, 1, NULL); } if (pd->act.log & PF_LOG_MATCHES) - pf_log_matches(pd, r, ctx.a, ruleset, match_rules); + pf_log_matches(pd, r, ctx.a, ruleset, ctx.match_rules); if (pd->virtual_proto != PF_VPROTO_FRAGMENT && (r->action == PF_DROP) && ((r->rule_flag & PFRULE_RETURNRST) || @@ -6042,8 +6041,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, (pd->flags & PFDESC_TCP_NORM)))) { bool nat64; - action = pf_create_state(r, &ctx, sm, bproto_sum, bip_sum, - match_rules); + action = pf_create_state(r, &ctx, sm, bproto_sum, bip_sum); ctx.sk = ctx.nk = NULL; if (action != PF_PASS) { pf_udp_mapping_release(ctx.udp_mapping); @@ -6126,8 +6124,7 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_test_ctx *ctx, - struct pf_kstate **sm, u_int16_t bproto_sum, u_int16_t bip_sum, - struct pf_krule_slist *match_rules) + struct pf_kstate **sm, u_int16_t bproto_sum, u_int16_t bip_sum) { struct pf_pdesc *pd = ctx->pd; struct pf_kstate *s = NULL; @@ -6192,7 +6189,7 @@ pf_create_state(struct pf_krule *r, struct pf_test_ctx *ctx, s->rule = r; s->nat_rule = ctx->nr; s->anchor = ctx->a; - s->match_rules = *match_rules; + s->match_rules = *ctx->match_rules; memcpy(&s->act, &pd->act, sizeof(struct pf_rule_actions)); if (pd->act.allow_opts) diff --git a/tests/sys/netpfil/pf/match.sh b/tests/sys/netpfil/pf/match.sh index 58c1e021310a..992e32d9f887 100644 --- a/tests/sys/netpfil/pf/match.sh +++ b/tests/sys/netpfil/pf/match.sh @@ -177,9 +177,67 @@ allow_opts_cleanup() pft_cleanup } +atf_test_case "double_match" "cleanup" +double_match_head() +{ + atf_set descr 'Test two match statements in separate anchors' + atf_set require.user root +} + +double_match_body() +{ + pft_init + + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + vnet_mkjail rtr ${epair_one}a ${epair_two}a + vnet_mkjail srv ${epair_two}b + + ifconfig ${epair_one}b 192.0.2.2/24 up + + jexec rtr ifconfig ${epair_one}a 192.0.2.1/24 up + jexec rtr ifconfig ${epair_two}a 198.51.100.1/24 up + jexec rtr sysctl net.inet.ip.forwarding=1 + + jexec srv ifconfig ${epair_two}b 198.51.100.2/24 up + + route add default 192.0.2.1 + + # Sanity check + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + jexec rtr pfctl -e + pft_set_rules rtr \ + "nat on ${epair_two}a from 192.0.2.0/24 to any -> (${epair_two}a)" \ + "block all" \ + "anchor \"userrules\" all {\n \ + anchor \"one\" all { \n\ + match in tag \"allow\"\n\ + }\n\ + anchor \"two\" all { \n\ + match tag \"allow\"\n\ + }\n\ + }\n" \ + "pass quick tagged \"allow\"" + + atf_check -s exit:0 -o ignore \ + ping -c 1 198.51.100.2 + + jexec rtr pfctl -ss -vv + jexec rtr pfctl -sr -vv -a "*" + jexec rtr pfctl -sr -a "*" +} + +double_match_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "dummynet" atf_add_test_case "quick" atf_add_test_case "allow_opts" + atf_add_test_case "double_match" } From nobody Tue Feb 17 20:41: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 4fFs4J3TzNz6S32j for ; Tue, 17 Feb 2026 20:41: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 4fFs4J2kxpz3rd5 for ; Tue, 17 Feb 2026 20:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRQfXr+cW6ky3sevl15K0q052bb932TJxo/k3QjwGjM=; b=mQ/WKfoWy3quqdSWGUMztXRp7tmgxNFqRFaM475kbgLyT0BDZo38mR8A7rsxI+bRsxT+vv /3i8KPvJUuYev3loZqNgBbh0q7RHf3QLfakVprvyUHH43vWqkk+pcvsJZwRBWGCOCSVah4 qI2AxBXCu18v2dnbrdyE+umRA5wr/TmsZ17mAXqOKTwZLcEoHJt/SQxCXDCOSfMBlawRro lQCZUALFKVagFlBqQwQd8ci+kUl7Tyhz9R18kK7HQbqX9j74KCzc7FXUoGv7h9dMHBrvyW wU21lb5JlWwOqPCLwGwRhor69eXE3rlGnz3vmqGa/pi3LH83GFdpYYNb5rK73g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360880; a=rsa-sha256; cv=none; b=EsupmA/cJe0D+z5+FrdagXFjvHxzmMsGeqEU6jGZxwp3dm1lqxGGngjWRP2j3mTyP2s5gQ TECmZLn7DaQgtdSJA2G5/zGc1B2hV/7+srsRyY8Grd6FDrW/jlErP+sTu72cid8od6Uo18 N7WwWkYTfELHEW7iH3nFP44HCz0pyaIFP5DvMm7vd/9vtpkGLIW1YfFkDHNZr74UWwTuPq 27MzRZgVLyj7ohhl0R6LdhzAV8uIS4ofEQGvlCCc3uQ9jhRa1rEK3DOzaT7mxciLOtCwCn lD5M/E1KotvqaGO/sqsZD5jpDMa9K2MHU8Ue9u/b8r/7MQySpiPdUvNbIbmd5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRQfXr+cW6ky3sevl15K0q052bb932TJxo/k3QjwGjM=; b=o/kuznVsdXorkVMljbG2ZXqiSot3ZBMZNsNOn7pZdSPbkAHqOaw0jgRlnx1kdjvc4gw8Qh glYWG348ID2GrRqVNSWI6cNrZG5ECBSjL9XYGBMkZWhfhc7to74MfvhZxjTIchep6UWDmy 9YEci7AjdStKr0F9vqv6tyay8DtEwkACPDgAIJNS1dxvGDqXIe3gWYva/MGpPNQNcOhgTG 7KvbR6+G+BcbQQYTKBkPWLWMFdT190WB7LKDfkK7dQpiSOWLilfVClkKHOa8y50PbrxQ6L 8TYK4A3lgk8QKKhwkQHnEbZ06Z9k13VXZFo46NCHFrZd4Dfvh2irFls8JJYZyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4J2K41z92g for ; Tue, 17 Feb 2026 20:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d274 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: bcc06806430a - stable/15 - evdev: Allow setting of character device ownership and access mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bcc06806430aa0cba72d0355555453732a95bb08 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:20 +0000 Message-Id: <6994d270.1d274.5146e9e0@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=bcc06806430aa0cba72d0355555453732a95bb08 commit bcc06806430aa0cba72d0355555453732a95bb08 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:38:26 +0000 evdev: Allow setting of character device ownership and access mode by device driver. That is required as game pad and joystick events have to be accessible by ordinary users. MFC after: 1 month (cherry picked from commit ecccc9d99901dd874e8d122853026d7c28fa4fcf) --- sys/dev/evdev/cdev.c | 6 +++--- sys/dev/evdev/evdev.c | 17 ++++++++++++++++- sys/dev/evdev/evdev.h | 1 + sys/dev/evdev/evdev_private.h | 3 +++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c index dd4115cdfc71..2f47056081d2 100644 --- a/sys/dev/evdev/cdev.c +++ b/sys/dev/evdev/cdev.c @@ -772,9 +772,9 @@ evdev_cdev_create(struct evdev_dev *evdev) make_dev_args_init(&mda); mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME; mda.mda_devsw = &evdev_cdevsw; - mda.mda_uid = UID_ROOT; - mda.mda_gid = GID_WHEEL; - mda.mda_mode = 0600; + mda.mda_uid = evdev->ev_cdev_uid; + mda.mda_gid = evdev->ev_cdev_gid; + mda.mda_mode = evdev->ev_cdev_mode; mda.mda_si_drv1 = evdev; /* Try to coexist with cuse-backed input/event devices */ diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c index e71f4f389d5c..4dcd6f23d338 100644 --- a/sys/dev/evdev/evdev.c +++ b/sys/dev/evdev/evdev.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -94,8 +95,14 @@ static int evdev_check_event(struct evdev_dev *, uint16_t, uint16_t, int32_t); struct evdev_dev * evdev_alloc(void) { + struct evdev_dev *evdev; - return malloc(sizeof(struct evdev_dev), M_EVDEV, M_WAITOK | M_ZERO); + evdev = malloc(sizeof(struct evdev_dev), M_EVDEV, M_WAITOK | M_ZERO); + evdev->ev_cdev_uid = UID_ROOT; + evdev->ev_cdev_gid = GID_WHEEL; + evdev->ev_cdev_mode = S_IRUSR | S_IWUSR; + + return (evdev); } void @@ -584,6 +591,14 @@ evdev_set_flag(struct evdev_dev *evdev, uint16_t flag) bit_set(evdev->ev_flags, flag); } +void +evdev_set_cdev_mode(struct evdev_dev *evdev, uid_t uid, gid_t gid, int mode) +{ + evdev->ev_cdev_uid = uid; + evdev->ev_cdev_gid = gid; + evdev->ev_cdev_mode = mode; +} + static int evdev_check_event(struct evdev_dev *evdev, uint16_t type, uint16_t code, int32_t value) diff --git a/sys/dev/evdev/evdev.h b/sys/dev/evdev/evdev.h index 2ee374f184cc..d5aa58f0ccc4 100644 --- a/sys/dev/evdev/evdev.h +++ b/sys/dev/evdev/evdev.h @@ -153,6 +153,7 @@ void evdev_support_sw(struct evdev_dev *, uint16_t); void evdev_set_repeat_params(struct evdev_dev *, uint16_t, int); int evdev_set_report_size(struct evdev_dev *, size_t); void evdev_set_flag(struct evdev_dev *, uint16_t); +void evdev_set_cdev_mode(struct evdev_dev *, uid_t, gid_t, int); void *evdev_get_softc(struct evdev_dev *); bool evdev_is_grabbed(struct evdev_dev *); diff --git a/sys/dev/evdev/evdev_private.h b/sys/dev/evdev/evdev_private.h index 661259bd2594..4c371e538598 100644 --- a/sys/dev/evdev/evdev_private.h +++ b/sys/dev/evdev/evdev_private.h @@ -111,6 +111,9 @@ struct evdev_dev char ev_shortname[NAMELEN]; char ev_serial[NAMELEN]; struct cdev * ev_cdev; + uid_t ev_cdev_uid; + gid_t ev_cdev_gid; + int ev_cdev_mode; int ev_unit; enum evdev_lock_type ev_lock_type; struct mtx * ev_state_lock; /* State lock */ From nobody Tue Feb 17 20:41: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 4fFs4K5Ct8z6S3L1 for ; Tue, 17 Feb 2026 20:41: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 4fFs4K2xDtz3rm5 for ; Tue, 17 Feb 2026 20:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=COns/A1iyWn+kmpM2XTKHy8A/L7QwXnhqHBhFEBBFZs=; b=yelshvoqj+SsDUOm8cgBI4K4+jIzHDbKGvjCu1XUHCjQpc0uO1Vtwk3oK3BhWkd9Ce6zKu 7CtAyfsRaQKqLjgDSAMGNIjCefuHlOKG9TmkS2eLx6USXl0q4/pfAxSo+lGQ9qvo2BR1Uj oVr7oYSqd+Ji+NWXg5a/g5ZSbNGGVNzpx2hzkDIHWs1wL+xmaIXCyOrSNK/B+YZ/p5sU5+ QmpWPBgvqyaGPfNK3ZJAUHKt419p3VDOxgXV/Y7wbBXV3TIvP5feUKYm9aKkzDk6um34Tu WIKmk3bJCx+e+PkAcgX1j5iUSKtyuxzHutKphmpVvjouha4OhNnwyw9392Sm6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360881; a=rsa-sha256; cv=none; b=RXoFsAYwhJOW15IAIyJhFR7TSwyPEc39KP4yO40tDX4ur5Fy6M/7CJB54ONavTqbqZd3LW L+B6h9U+EQm/p/yk/AY3ERP+bDMU+C/x7KOR7jnp5A1hoSvoPDQClIunEkNdxCTlVw7kkR 4lyUzAy4fPAXNC20tmH+sx988VR996+Xh947yi2VTNSK4K0F9aurevDnQ8p33VIOPVTWqw a+e+yEyM1aQzi/9aLQvYeooujmFkujuG9yrk+h/zxTKPbk2xyEdb5INqUkcrKpV5t3p2xH KkHSOx5Jq9l8E6oiRIs8x5fb2qiKnUPx4a2tGlxkcKJY17H3H8hNSu7JBr+zGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=COns/A1iyWn+kmpM2XTKHy8A/L7QwXnhqHBhFEBBFZs=; b=B6wRvcHRhHdMHpuqPZKbNinIezD8dBGw532oSk5X+YzsOMgoY4nEtynnsbrPLUnF9oqU46 St64O7on5bsYzRWBx2xeHyNprWiEgcsFY3W6cGWPgqM2SSUtGUIQU4HezVB4AeR2ArnOTO l4CPyLCEUUXCeR80ZWZGKTML55GRKuy+UqywDvReTK2hGw3diHgzCHAkOhUaXUHNdfcqmk afpdobSy5Kx6+GAKIrKE5j2K+KU4UDNCNjmJGgR/BOGccp74gIoEsqBwHGld0kGjRwKmti Vz4EfGNuRbKN3ncLE2tie7tTrQGrC8clek24oxqrnzfoiaLTsKxktjn24pyhrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4K2Vhmz9RM for ; Tue, 17 Feb 2026 20:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f204 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: d0e1b3edee70 - stable/15 - hid: Make game controllers accessible to members of the game group List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d0e1b3edee707ed0af989e89b967c2f88c04ce41 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:21 +0000 Message-Id: <6994d271.1f204.7c49fe6f@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d0e1b3edee707ed0af989e89b967c2f88c04ce41 commit d0e1b3edee707ed0af989e89b967c2f88c04ce41 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:38:26 +0000 hid: Make game controllers accessible to members of the game group Their events have to be accessible by unprivileged users via e.g. libsdl. MFC after: 1 month (cherry picked from commit b6cad334e649f49c57da52b139de353ad9078985) --- share/man/man4/hgame.4 | 7 ++++--- share/man/man4/ps4dshock.4 | 5 ++++- share/man/man4/xb360gp.4 | 5 ++++- sys/dev/hid/hgame.c | 7 ++++++- sys/dev/hid/ps4dshock.c | 9 ++++++++- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/share/man/man4/hgame.4 b/share/man/man4/hgame.4 index f816d2a442d0..b662a07993ac 100644 --- a/share/man/man4/hgame.4 +++ b/share/man/man4/hgame.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 12, 2025 +.Dd November 30, 2025 .Dt HGAME 4 .Os .Sh NAME @@ -69,8 +69,9 @@ prompt, or add it to To give user applications access to the game controllers, allow user access to the .Pa /dev/input/event* -nodes with -.Xr devfs.rules 5 . +nodes with inclusion of user in the +.Em games +group. .Sh HARDWARE The .Nm diff --git a/share/man/man4/ps4dshock.4 b/share/man/man4/ps4dshock.4 index 282a58c49e63..f48e2c07c1b7 100644 --- a/share/man/man4/ps4dshock.4 +++ b/share/man/man4/ps4dshock.4 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 19, 2020 +.Dd November 30, 2025 .Dt PS4DSHOCK 4 .Os .Sh NAME @@ -55,6 +55,9 @@ The device presents the game controller as a .Ar evdev type device. +It is accessible to members of the +.Em games +group. .Sh SYSCTL VARIABLES Next parameters are available as .Xr sysctl 8 diff --git a/share/man/man4/xb360gp.4 b/share/man/man4/xb360gp.4 index 4e8d4b65fcfd..1ff42e970858 100644 --- a/share/man/man4/xb360gp.4 +++ b/share/man/man4/xb360gp.4 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 16, 2020 +.Dd November 30, 2025 .Dt XB360GP 4 .Os .Sh NAME @@ -56,6 +56,9 @@ The device presents the game controller as a .Ar evdev type device. +It is accessible to members of the +.Em games +group. .Sh SYSCTL VARIABLES The following variable is available as both .Xr sysctl 8 diff --git a/sys/dev/hid/hgame.c b/sys/dev/hid/hgame.c index b074f6145d0e..8dde6b5550c9 100644 --- a/sys/dev/hid/hgame.c +++ b/sys/dev/hid/hgame.c @@ -33,8 +33,10 @@ #include #include +#include #include #include +#include #include #include @@ -170,8 +172,11 @@ hgame_final_cb(HIDMAP_CB_ARGS) { struct evdev_dev *evdev = HIDMAP_CB_GET_EVDEV(); - if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) + if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_prop(evdev, INPUT_PROP_DIRECT); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); diff --git a/sys/dev/hid/ps4dshock.c b/sys/dev/hid/ps4dshock.c index d3c6b3eeadf9..1cd9cb13bad3 100644 --- a/sys/dev/hid/ps4dshock.c +++ b/sys/dev/hid/ps4dshock.c @@ -37,10 +37,12 @@ #include #include +#include #include #include #include #include +#include #include #include @@ -806,8 +808,11 @@ ps4dshock_final_cb(HIDMAP_CB_ARGS) { struct evdev_dev *evdev = HIDMAP_CB_GET_EVDEV(); - if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) + if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_prop(evdev, INPUT_PROP_DIRECT); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); @@ -886,6 +891,8 @@ ps4dsacc_final_cb(HIDMAP_CB_ARGS) if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_event(evdev, EV_ABS); evdev_support_prop(evdev, INPUT_PROP_ACCELEROMETER); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); From nobody Tue Feb 17 20:41: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 4fFs4L6GBcz6S3Bq for ; Tue, 17 Feb 2026 20:41: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 4fFs4L3Ml5z3rgb for ; Tue, 17 Feb 2026 20:41:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilD3cIUa+/A3aqexqYrhknJzABuJ4/dVtW+e1zt5Sq4=; b=dViVuqJpIngZemrLc6QiB9W2wVAc4LsGl4smQQ0ilc5u4NR4Sd7KVp0YrVOQ0xbSHdCyGG L6rQamugExhAx6aARsPLry1mOQEiuPbTS9yCe6iEVtU5j7wdoBO1G+Uk0OtDY1nY8b37n0 A7CpGMorNBAh5UGeJzFNH4ZupPxQWtbs9SkFHNP5cDFvkRMqx87rN/YG7MOj8XMflw4fog 1AVtD5qEQCciggqX0gAgIgjMNdJrhjMGvvd07K6aY665QABdieP3bpkM7CCZ4VsvD2fxFq 3/+bAiX4kuMd9iMYUgXu//dwLBnpJ0Hulc4U1pEMmoam0lwq281caWeU3i6zsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360882; a=rsa-sha256; cv=none; b=cR1RjSXDS0ceIrGvBPybnNCJqNqpBiHWHoT0WN/MJdlFMvhL6kYLtGE0k9wLKEEHMG07KN Wyps3+RhT37hIk8R6K0dAtVCKiX4SD+NIn2zsCZplntmKm0JDVJ9QRYgvpg8yLWGrDbijN 3eqNQ25ri9BpCPixWb8pHRfjzZkjS2BkoZWlLR2T7jw2IJ9OUYOVxVZQQW5G7IFdG6aRnF MwGHG3pakbHpUMN954yAllEFla89mYY7Ik4teTXpeWddCgiU41egElNzACdnyJs3EtK9pk dZuRoeTSIWy0D0LMIZN5hBYQO6RJ2FnpG9YJ+qI92Mk5r4cLBTy5nuNCNoxPlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilD3cIUa+/A3aqexqYrhknJzABuJ4/dVtW+e1zt5Sq4=; b=Cg8UFRnJfzDXGz6ZP4a4LKX5pP9hh9V9y2NMBpUtbo1A8uDPuiJBdGNOyTEkL4DKObvyRf cYb1TRBo77gf6+epl1v96nk+X6MT5maMmwwwIaT73St/sOnMYJfBXxXSbTG4r1fMePN1v9 2iafcBUNFNBa9ucu0aODXl/zMjSixScE/Gg2h+297TLJADV7+vyShvXIGMrqrZpCKZAkK/ 3zggKX9HUnyXC6CerQUmEQ3L4lit6s9ptlJ/mRl/wIKqTj6xPWhDAU53P3WVoSkv/a0fNl ayg3POPmkxlJeiyTyFEfkbdqkUGZGgJdRe5QQE38Kss5n8e96gEVlhyG/IaL/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 4fFs4L2wQTz9jB for ; Tue, 17 Feb 2026 20:41:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f38f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 11231c820699 - stable/15 - msconvd(8): Drop mentions of Bus/InPort mouse support in 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 11231c8206993e68001d17da8a2b45759715a17a Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:22 +0000 Message-Id: <6994d272.1f38f.c78b63c@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=11231c8206993e68001d17da8a2b45759715a17a commit 11231c8206993e68001d17da8a2b45759715a17a Author: Vladimir Kondratyev AuthorDate: 2025-12-01 21:09:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:38:26 +0000 msconvd(8): Drop mentions of Bus/InPort mouse support in manual page mse(4) was removed long ago. MFC after: 1 month (cherry picked from commit dc6f609685a9bc41c67d3c1219311e0096982865) --- usr.sbin/moused/msconvd/msconvd.8 | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/usr.sbin/moused/msconvd/msconvd.8 b/usr.sbin/moused/msconvd/msconvd.8 index 17434ecb9b60..b5d738d5b5ed 100644 --- a/usr.sbin/moused/msconvd/msconvd.8 +++ b/usr.sbin/moused/msconvd/msconvd.8 @@ -160,10 +160,11 @@ information are: .It Ar port Port (device file) name, i.e.\& .Pa /dev/cuau0 , +.Pa /dev/ums0 and .Pa /dev/psm0 . .It Ar if -Interface type: serial, bus, inport or ps/2. +Interface type: serial or ps/2. .It Ar type Protocol type. It is one of the types listed under the @@ -243,12 +244,6 @@ always choose or .Ar ps/2 , regardless of the brand and model of the mouse. -Likewise, if your -mouse is attached to the bus mouse port, choose -.Ar auto -or -.Ar busmouse . -Serial mouse protocols will not work with these mice. .Pp For the USB mouse, the protocol must be .Ar auto . @@ -304,14 +299,6 @@ Interlink VersaPad protocol. GTCO Digipad protocol. .El .Pp -For the bus and InPort mouse: -.Bl -tag -compact -width mousesystemsxxx -.It Ar busmouse -This is the only protocol type available for -the bus and InPort mouse and should be specified for any bus mice -and InPort mice, regardless of the brand. -.El -.Pp For the PS/2 mouse: .Bl -tag -compact -width mousesystemsxxx .It Ar ps/2 @@ -402,10 +389,6 @@ There is rule of thumb: .Pp .Bl -enum -compact -width 1.X .It -The bus and InPort mice always use -.Ar busmouse -protocol regardless of the brand of the mouse. -.It The .Ar ps/2 protocol should always be specified for the PS/2 mouse From nobody Tue Feb 17 20:41: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 4fFs4N6BQFz6S38q for ; Tue, 17 Feb 2026 20:41: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 4fFs4M5P8Pz3rmR for ; Tue, 17 Feb 2026 20:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360883; 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=r57QOGUXAY+A8iNGue9+q/01umunsQFy7MfAP7rdjrU=; b=XANq6LrceAylFwDUF/6sWwmsCZ8UDQsUh7XU4RgkuBP4vH4Dq4nkc40Zl5ilF8t5EFso1+ v+JmSzaVXhp+9gsG3tc7f9F7GGTOU0WCkiCNnOrA8CcyHnHz4jQGRaJhozJCDMgJ22rJHF G50iSDXZxyHtA11CqFSJfUSJFUvzWwAgvuNSC9j3a4V16vBblwO1LheugJ8qcncgXRrj6N mQJUrvke0yW746I9mhsi1KQYEcFSxkRsJb5szm0uDLXZkf410PvwJcwzTg7mIu+66ka55j VdBrBWdwYr9JdK0WKSP+F4HF9hwpDUfVJ0PevboXrJvGYq3G7XM9TgxPnP+4/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360883; a=rsa-sha256; cv=none; b=MrGE+NQj3/HZTTxE0932jATpfh6FHWVQVE1QC9+qwgpSOG7kuqnyJ/YL3Dc/bWQqKB3qBy 1BwNmj/JAZ1020MLKjtlGZJsr5b+9RDnypJ7ShV/yWzdCxOFvV1Z3q2m6L1O9a+l3WWptS FOghz71RhoVNRgM1hcRER1sO1MoFTAZWZxqhsP4L+tAaoiAxi3bRPNOYt/QqvIaO1YY+R+ +WFzORGea6wHiRoX0+rMz6FzB9PFMyryM88kB4yqUfhkXCaDx2a3yixk2zyTpQE4L2W80E 7npN/hBOoZaYT8Xxv8qXVuhf02JPZipzPfZ9XkAhJB3SLQu9tcLKEFBgBWDL9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360883; 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=r57QOGUXAY+A8iNGue9+q/01umunsQFy7MfAP7rdjrU=; b=dk510YwBCvx0XMqjWa5oZzpmLoo/UMDPbX8kbaaBt1TugUHUKuAhkd298tVbMEQb/DlzQj wVxhnc+Ft6YoHdqPMqtvX2oupRT/ykfebNRYWRldPYaRGl2wU1WGR+6NW5sxYUbgso4nKb GZr94tIekpLk/Oox2zwot03OBmATF9X7O8aATXMQhuRULqwQ2utEyPh9YoUN9+rI0jWMci TxVtqsKD7bQ/ILulgrX5jJgZ2oonXEh8AI6PgANkQaK4/YcLsK4Ssh1EZYtOUAJzcLdMtO msWpKP30EbteBa+X2UsX6rxBUfu42DXOYFmfRr05tQpN0MgsmNh09qStnl3TTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4M3m5Gz9XB for ; Tue, 17 Feb 2026 20:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ebb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Robert Wahlberg From: Vladimir Kondratyev Subject: git: 68ab94288203 - stable/15 - psm: Fix three finger tap on elantech v4 touchpads List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 68ab9428820348f1e3923532a041898bb95bcf5c Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:23 +0000 Message-Id: <6994d273.1ebb4.3837da6e@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=68ab9428820348f1e3923532a041898bb95bcf5c commit 68ab9428820348f1e3923532a041898bb95bcf5c Author: Robert Wahlberg AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:38:26 +0000 psm: Fix three finger tap on elantech v4 touchpads Fix an issue where a three finger tap would generate additional events when fingers moved slightly during the tap. Signed-off-by: Robert Wahlberg Pull Request: https://github.com/freebsd/freebsd-src/pull/1792 Reviewed by: wulf MFC after: 1 month (cherry picked from commit e3201cec8381c0582374f93991eff4a71bb95e9b) --- sys/dev/atkbdc/psm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 137758b104d3..d36396df0fa0 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -4666,6 +4666,13 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *ms, mask = sc->elanaction.mask; nfingers = bitcount(mask); + /* The motion packet can only update two fingers at a time. + * Copy the previous state to get all active fingers. */ + for (id = 0; id < ELANTECH_MAX_FINGERS; id++) + if (sc->elanaction.mask & (1 << id)) + f[id] = sc->elanaction.fingers[id]; + + /* Update finger positions from the new packet */ scale = (pb->ipacket[0] & 0x10) ? 5 : 1; for (i = 0; i <= 3; i += 3) { id = ((pb->ipacket[i] & 0xe0) >> 5) - 1; From nobody Tue Feb 17 20:41: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 4fFs4P1czdz6S37t for ; Tue, 17 Feb 2026 20:41: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 4fFs4N5Hw2z3rgx for ; Tue, 17 Feb 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rdh6wxYBs7LVPaVtgyEgdAuZ7b+cjUJvvOSkVxDEkAo=; b=bY8urSxN/zpoQsHiG/1KMNzMVb5dak1X6yPt+BRCeBGyyJg1dzl3uDpCMFskr5U6zseKM9 Tvhp4XcrMAys1RcqtCRII0nYi9F1s90wR1npl/MmsuKLSe0C72GMuy48yYQcWdKLRQIaqh 8Y4Gb51JVAf+BNryEu+QHLYYe95IROWqh/GylFap0XsTm2QBuFS6wSAr+IOvZ5zRK+LS1T 8c+u6qEeIDWgiQE/0VVoxx9Q4y+0/z5fdGAGm+/wYRtjAoupRWzwrmusKTNQXsejZ7dbmf N5fkHk8Ceys7l8RvIInfO8dOOu9GbLyMGWe5r64x5I8vOIx7EPJ6pFzOX+QqbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360884; a=rsa-sha256; cv=none; b=xWYEkJpRBCduA6d420+B3r2yuJJXsDJXqn6SaRHyjJyXN0pp4kUA3ZrXlueHoZ2OYRALMg qmyl8yw7rnIUyP0lnj1FG3T80KHm/Rk5jhPX9/98qn+10FIxqlC6drpMTqYm1uVkCfW3gT emtMKbdqbBG+rn2gy3P/s1s05z6HdFfuBNyGkbF78yGSDOLaGvS5zpnPYNAQkZPk/bj9qf 1I/krqaSRoSf+UpLBh8uveA866Me2ZnVseun6LJyncHif56nG3Wbg+ro6UhXJ605zejcDZ iBNHFHHxMdt6SY/a7yIo8ks4e+NCz2daUJUv/caRBc0gh5UCb2PAT/vHZmFRFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rdh6wxYBs7LVPaVtgyEgdAuZ7b+cjUJvvOSkVxDEkAo=; b=YmJo1XaUxmyAKIGh5pqw5aAslgzmkPO5Q/b4gGXm83/lOUuhEgtNMpz6uj1pzG7XNLGYOi H1dp/7GfGpk6MKX/oTxwXjOJQ+DAypAWij+Eb/bwhxdK0GEmrx3RebyhsT9hJBqIpUrc4L HmX+YULu2wy+o2hNXziggnnr9M3e76vGdzyHVAE+h00oy2Qi9S6LMEIyYkDYHJf/VwrAwW y265fmkuty/VKlBtD3vnYrNmlKJ6jRhErYv380053UT0FESONUJdhAwnC22AKiad+SYks6 O/sg7r9xl0gIQHiCbi06mbFqMF6HIV6yAV/qoihaM8GKDy+2QaqwMqqjSDvj9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4N4RmVz99c for ; Tue, 17 Feb 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e9a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 09f1db900c6c - stable/15 - evdev: Sync event codes with Linux kernel 6.18 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 09f1db900c6cd3937d9ee78d885cc30ab06a67f2 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:24 +0000 Message-Id: <6994d274.1e9a7.7ca202bf@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=09f1db900c6cd3937d9ee78d885cc30ab06a67f2 commit 09f1db900c6cd3937d9ee78d885cc30ab06a67f2 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:38:27 +0000 evdev: Sync event codes with Linux kernel 6.18 MFC after: 1 month (cherry picked from commit 8d9a5d44b155af7123893a6948ad7e86b48c57b3) --- sys/dev/evdev/input-event-codes.h | 28 ++++++++++++++- sys/dev/evdev/input.h | 73 +++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 30 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 59eb8e104c87..81c88ec86b9b 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -39,6 +39,7 @@ #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ +#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) @@ -531,6 +532,7 @@ #define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ #define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ #define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ +#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -612,8 +614,14 @@ #define BTN_DPAD_LEFT 0x222 #define BTN_DPAD_RIGHT 0x223 +#define BTN_GRIPL 0x224 +#define BTN_GRIPR 0x225 +#define BTN_GRIPL2 0x226 +#define BTN_GRIPR2 0x227 + #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ #define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ +#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ #define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ #define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ @@ -629,10 +637,24 @@ #define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ +#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ +#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +/* + * Keycodes for hotkeys toggling the electronic privacy screen found on some + * laptops on/off. Note when the embedded-controller turns on/off the eprivacy + * screen itself then the state should be reported through drm connecter props: + * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties + * Except when implementing the drm connecter properties API is not possible + * because e.g. the firmware does not allow querying the presence and/or status + * of the eprivacy screen at boot. + */ +#define KEY_EPRIVACY_SCREEN_ON 0x252 +#define KEY_EPRIVACY_SCREEN_OFF 0x253 + #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 #define KEY_KBDINPUTASSIST_PREVGROUP 0x262 @@ -773,6 +795,9 @@ #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc +/* Performance Boost key (Alienware)/G-Mode key (Dell) */ +#define KEY_PERFORMANCE 0x2bd + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 @@ -932,7 +957,8 @@ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ #define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_MAX 0x10 +#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) /* diff --git a/sys/dev/evdev/input.h b/sys/dev/evdev/input.h index 3b87101da75f..ce0fb616a3df 100644 --- a/sys/dev/evdev/input.h +++ b/sys/dev/evdev/input.h @@ -142,6 +142,8 @@ struct input_keymap_entry { #define BUS_RMI 0x1D #define BUS_CEC 0x1E #define BUS_INTEL_ISHTP 0x1F +#define BUS_AMD_SFH 0x20 +#define BUS_SDW 0x21 /* * MT_TOOL types @@ -203,20 +205,6 @@ struct ff_condition_effect { int16_t center; /* center of dead zone */ }; -/* - * Force feedback periodic effect types - */ - -#define FF_SQUARE 0x58 -#define FF_TRIANGLE 0x59 -#define FF_SINE 0x5a -#define FF_SAW_UP 0x5b -#define FF_SAW_DOWN 0x5c -#define FF_CUSTOM 0x5d - -#define FF_WAVEFORM_MIN FF_SQUARE -#define FF_WAVEFORM_MAX FF_CUSTOM - struct ff_periodic_effect { uint16_t waveform; uint16_t period; /* ms */ @@ -233,21 +221,14 @@ struct ff_rumble_effect { uint16_t weak_magnitude; /* magnitude of the light motor */ }; -/* - * Force feedback effect types - */ - -#define FF_RUMBLE 0x50 -#define FF_PERIODIC 0x51 -#define FF_CONSTANT 0x52 -#define FF_SPRING 0x53 -#define FF_FRICTION 0x54 -#define FF_DAMPER 0x55 -#define FF_INERTIA 0x56 -#define FF_RAMP 0x57 - -#define FF_EFFECT_MIN FF_RUMBLE -#define FF_EFFECT_MAX FF_RAMP +struct ff_haptic_effect { + uint16_t hid_usage; + uint16_t vendor_id; + uint8_t vendor_waveform_page; + uint16_t intensity; + uint16_t repeat_count; + uint16_t retrigger_period; +}; struct ff_effect { uint16_t type; @@ -262,9 +243,41 @@ struct ff_effect { struct ff_periodic_effect periodic; struct ff_condition_effect condition[2]; /* One for each axis */ struct ff_rumble_effect rumble; + struct ff_haptic_effect haptic; } u; }; +/* + * Force feedback effect types + */ + +#define FF_HAPTIC 0x4f +#define FF_RUMBLE 0x50 +#define FF_PERIODIC 0x51 +#define FF_CONSTANT 0x52 +#define FF_SPRING 0x53 +#define FF_FRICTION 0x54 +#define FF_DAMPER 0x55 +#define FF_INERTIA 0x56 +#define FF_RAMP 0x57 + +#define FF_EFFECT_MIN FF_HAPTIC +#define FF_EFFECT_MAX FF_RAMP + +/* + * Force feedback periodic effect types + */ + +#define FF_SQUARE 0x58 +#define FF_TRIANGLE 0x59 +#define FF_SINE 0x5a +#define FF_SAW_UP 0x5b +#define FF_SAW_DOWN 0x5c +#define FF_CUSTOM 0x5d + +#define FF_WAVEFORM_MIN FF_SQUARE +#define FF_WAVEFORM_MAX FF_CUSTOM + /* * force feedback device properties */ @@ -272,6 +285,8 @@ struct ff_effect { #define FF_GAIN 0x60 #define FF_AUTOCENTER 0x61 +#define FF_MAX_EFFECTS FF_GAIN + #define FF_MAX 0x7f #define FF_CNT (FF_MAX+1) From nobody Tue Feb 17 20:41: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 4fFs4Q0XZvz6S3By for ; Tue, 17 Feb 2026 20:41: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 4fFs4P5p7sz3rpS for ; Tue, 17 Feb 2026 20:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofRmCI/iOTtP5OA/J0GRD8paSQLJT4r73MX9w/s38eo=; b=AXaEvNbOPhNR7SiaPU12zW55cMzAvXSRztTBs5uFDn8YTmpieRrMmM7PxvFcrJj3mRqSsb C657V/oEHkwGuHwn8wFkrZP1fYMPozJ06xvJ0t5qPnYwRdfVIVLoTDpunXg87YpuGeVMOW yByk4PsZMxNQhQUf8gNBIPBnBeXCIxykVkDSh4NravYlQl0kprfNzuSYdDA55l927TgXid W+z6E+xjwPRoXP/1/sKu9JjMLnwI0dvGfzPCC97UyF/hTY6uvJiJlPsaqkBa7xG5aGXMD7 U1M8B3VMtBw+ucQashmCoDP/H0GIme5JCbNKbYzmKz4qS9RFGSHZ63wjcWk2jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360885; a=rsa-sha256; cv=none; b=jRkHfo8SdcR3EWoDwfzmxpB7UUVuayGCPO+qVUxBcjw4mp3bJOBBnJEZFgk7YRTlTYQxAT JkLbJwuZgkiZkQ1vxE/cdO2eHCH4cRPLYLKle0bcPVedgi7Kb79wuR5BzLK923148Q7i9B IrvcieNsZIZIm2aLkhLwmhhkr0+A+p7urLmiNCvfzS4fyERZnRGXZguGApFb58NbBUDj/M iwmMve9pDpFLwvJvTBl3ITCGvX0BppHhcOj+ii8klHqATsuDveUEeORBO7EEDMcBvuONLa otl/rrd4Efgr/zokvplmbTOvT+LdG28TG0W06Dxfja83aCR6w7klZ1Ux/Xmnhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofRmCI/iOTtP5OA/J0GRD8paSQLJT4r73MX9w/s38eo=; b=umEmlCMzc355Rp0ZCFugfqYQkKrJou+Sr6nSpUZ1su00jyX4lDgsTdjSIGXFcxzVYLo4ba L8N5k1ixc8enyui+XCRiPNlmtJCPkz9Hvgs+ARcOnPLAfN2ePxzNN82dk9jL/+u9i+ckaw M5HqhsEok4KhFKH/ffJzYIuRSR/9bMd8PtPGK1ABGNpFUSA8xXVa5vwR9mIYWh7fbv6nCJ a+G5tHQLlLYsB7aqvRFuTpdg94UtX7bnAng92tClwhZ/wWupoDbC2PNza8eaSWc8uKoJNr EiVeRjrbz0piJ2XwBlqM2IV7G39ECFuwjrz+ra8UzN8h2OWImSiS5tJP3dIpxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4P5JZxz9PZ for ; Tue, 17 Feb 2026 20:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f1a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5bf02d480f5b - stable/15 - evdev: Drop comments from input-event-codes.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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5bf02d480f5b1c89b7d9f04bbd4e7eca4e5cf1c5 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:25 +0000 Message-Id: <6994d275.1f1a4.14e82cf@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5bf02d480f5b1c89b7d9f04bbd4e7eca4e5cf1c5 commit 5bf02d480f5b1c89b7d9f04bbd4e7eca4e5cf1c5 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:38:27 +0000 evdev: Drop comments from input-event-codes.h They were copied intact from the Linux GPL-only file. Requested by: imp, glebius MFC after: 1 week (cherry picked from commit 89aa8a94053fdd22ed716fdf424a2d10e70b3188) --- sys/dev/evdev/input-event-codes.h | 485 ++++++++++++++------------------------ 1 file changed, 177 insertions(+), 308 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 81c88ec86b9b..4f1d0f96e400 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -28,26 +28,18 @@ #ifndef _EVDEV_INPUT_EVENT_CODES_H #define _EVDEV_INPUT_EVENT_CODES_H -/* - * Device properties and quirks - */ - -#define INPUT_PROP_POINTER 0x00 /* needs a pointer */ -#define INPUT_PROP_DIRECT 0x01 /* direct input devices */ -#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ -#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ -#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ -#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ -#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ -#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ +#define INPUT_PROP_POINTER 0x00 +#define INPUT_PROP_DIRECT 0x01 +#define INPUT_PROP_BUTTONPAD 0x02 +#define INPUT_PROP_SEMI_MT 0x03 +#define INPUT_PROP_TOPBUTTONPAD 0x04 +#define INPUT_PROP_POINTING_STICK 0x05 +#define INPUT_PROP_ACCELEROMETER 0x06 +#define INPUT_PROP_PRESSUREPAD 0x07 #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) -/* - * Event types - */ - #define EV_SYN 0x00 #define EV_KEY 0x01 #define EV_REL 0x02 @@ -63,10 +55,6 @@ #define EV_MAX 0x1f #define EV_CNT (EV_MAX+1) -/* - * Synchronization events. - */ - #define SYN_REPORT 0 #define SYN_CONFIG 1 #define SYN_MT_REPORT 2 @@ -74,17 +62,6 @@ #define SYN_MAX 0xf #define SYN_CNT (SYN_MAX+1) -/* - * Keys and buttons - * - * Most of the keys/buttons are modeled after USB HUT 1.12 - * (see http://www.usb.org/developers/hidpage). - * Abbreviations in the comments: - * AC - Application Control - * AL - Application Launch Button - * SC - System Control - */ - #define KEY_RESERVED 0 #define KEY_ESC 1 #define KEY_1 2 @@ -201,11 +178,11 @@ #define KEY_MUTE 113 #define KEY_VOLUMEDOWN 114 #define KEY_VOLUMEUP 115 -#define KEY_POWER 116 /* SC System Power Down */ +#define KEY_POWER 116 #define KEY_KPEQUAL 117 #define KEY_KPPLUSMINUS 118 #define KEY_PAUSE 119 -#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ +#define KEY_SCALE 120 #define KEY_KPCOMMA 121 #define KEY_HANGEUL 122 @@ -216,40 +193,40 @@ #define KEY_RIGHTMETA 126 #define KEY_COMPOSE 127 -#define KEY_STOP 128 /* AC Stop */ +#define KEY_STOP 128 #define KEY_AGAIN 129 -#define KEY_PROPS 130 /* AC Properties */ -#define KEY_UNDO 131 /* AC Undo */ +#define KEY_PROPS 130 +#define KEY_UNDO 131 #define KEY_FRONT 132 -#define KEY_COPY 133 /* AC Copy */ -#define KEY_OPEN 134 /* AC Open */ -#define KEY_PASTE 135 /* AC Paste */ -#define KEY_FIND 136 /* AC Search */ -#define KEY_CUT 137 /* AC Cut */ -#define KEY_HELP 138 /* AL Integrated Help Center */ -#define KEY_MENU 139 /* Menu (show menu) */ -#define KEY_CALC 140 /* AL Calculator */ +#define KEY_COPY 133 +#define KEY_OPEN 134 +#define KEY_PASTE 135 +#define KEY_FIND 136 +#define KEY_CUT 137 +#define KEY_HELP 138 +#define KEY_MENU 139 +#define KEY_CALC 140 #define KEY_SETUP 141 -#define KEY_SLEEP 142 /* SC System Sleep */ -#define KEY_WAKEUP 143 /* System Wake Up */ -#define KEY_FILE 144 /* AL Local Machine Browser */ +#define KEY_SLEEP 142 +#define KEY_WAKEUP 143 +#define KEY_FILE 144 #define KEY_SENDFILE 145 #define KEY_DELETEFILE 146 #define KEY_XFER 147 #define KEY_PROG1 148 #define KEY_PROG2 149 -#define KEY_WWW 150 /* AL Internet Browser */ +#define KEY_WWW 150 #define KEY_MSDOS 151 -#define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ +#define KEY_COFFEE 152 #define KEY_SCREENLOCK KEY_COFFEE -#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ +#define KEY_ROTATE_DISPLAY 153 #define KEY_DIRECTION KEY_ROTATE_DISPLAY #define KEY_CYCLEWINDOWS 154 #define KEY_MAIL 155 -#define KEY_BOOKMARKS 156 /* AC Bookmarks */ +#define KEY_BOOKMARKS 156 #define KEY_COMPUTER 157 -#define KEY_BACK 158 /* AC Back */ -#define KEY_FORWARD 159 /* AC Forward */ +#define KEY_BACK 158 +#define KEY_FORWARD 159 #define KEY_CLOSECD 160 #define KEY_EJECTCD 161 #define KEY_EJECTCLOSECD 162 @@ -259,20 +236,20 @@ #define KEY_STOPCD 166 #define KEY_RECORD 167 #define KEY_REWIND 168 -#define KEY_PHONE 169 /* Media Select Telephone */ +#define KEY_PHONE 169 #define KEY_ISO 170 -#define KEY_CONFIG 171 /* AL Consumer Control Configuration */ -#define KEY_HOMEPAGE 172 /* AC Home */ -#define KEY_REFRESH 173 /* AC Refresh */ -#define KEY_EXIT 174 /* AC Exit */ +#define KEY_CONFIG 171 +#define KEY_HOMEPAGE 172 +#define KEY_REFRESH 173 +#define KEY_EXIT 174 #define KEY_MOVE 175 #define KEY_EDIT 176 #define KEY_SCROLLUP 177 #define KEY_SCROLLDOWN 178 #define KEY_KPLEFTPAREN 179 #define KEY_KPRIGHTPAREN 180 -#define KEY_NEW 181 /* AC New */ -#define KEY_REDO 182 /* AC Redo/Repeat */ +#define KEY_NEW 181 +#define KEY_REDO 182 #define KEY_F13 183 #define KEY_F14 184 @@ -291,14 +268,14 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_ALL_APPLICATIONS 204 #define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 -#define KEY_CLOSE 206 /* AC Close */ +#define KEY_CLOSE 206 #define KEY_PLAY 207 #define KEY_FASTFORWARD 208 #define KEY_BASSBOOST 209 -#define KEY_PRINT 210 /* AC Print */ +#define KEY_PRINT 210 #define KEY_HP 211 #define KEY_CAMERA 212 #define KEY_SOUND 213 @@ -307,25 +284,24 @@ #define KEY_CHAT 216 #define KEY_SEARCH 217 #define KEY_CONNECT 218 -#define KEY_FINANCE 219 /* AL Checkbook/Finance */ +#define KEY_FINANCE 219 #define KEY_SPORT 220 #define KEY_SHOP 221 #define KEY_ALTERASE 222 -#define KEY_CANCEL 223 /* AC Cancel */ +#define KEY_CANCEL 223 #define KEY_BRIGHTNESSDOWN 224 #define KEY_BRIGHTNESSUP 225 #define KEY_MEDIA 226 -#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video - outputs (Monitor/LCD/TV-out/etc) */ +#define KEY_SWITCHVIDEOMODE 227 #define KEY_KBDILLUMTOGGLE 228 #define KEY_KBDILLUMDOWN 229 #define KEY_KBDILLUMUP 230 -#define KEY_SEND 231 /* AC Send */ -#define KEY_REPLY 232 /* AC Reply */ -#define KEY_FORWARDMAIL 233 /* AC Forward Msg */ -#define KEY_SAVE 234 /* AC Save */ +#define KEY_SEND 231 +#define KEY_REPLY 232 +#define KEY_FORWARDMAIL 233 +#define KEY_SAVE 234 #define KEY_DOCUMENTS 235 #define KEY_BATTERY 236 @@ -336,22 +312,18 @@ #define KEY_UNKNOWN 240 -#define KEY_VIDEO_NEXT 241 /* drive next video source */ -#define KEY_VIDEO_PREV 242 /* drive previous video source */ -#define KEY_BRIGHTNESS_CYCLE 243 /* brightness up, after max is min */ -#define KEY_BRIGHTNESS_AUTO 244 /* Set Auto Brightness: manual - brightness control is off, - rely on ambient */ +#define KEY_VIDEO_NEXT 241 +#define KEY_VIDEO_PREV 242 +#define KEY_BRIGHTNESS_CYCLE 243 +#define KEY_BRIGHTNESS_AUTO 244 #define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO -#define KEY_DISPLAY_OFF 245 /* display device to off state */ +#define KEY_DISPLAY_OFF 245 -#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ +#define KEY_WWAN 246 #define KEY_WIMAX KEY_WWAN -#define KEY_RFKILL 247 /* Key that controls all radios */ - -#define KEY_MICMUTE 248 /* Mute / unmute the microphone */ +#define KEY_RFKILL 247 -/* Code 255 is reserved for special needs of AT keyboard driver */ +#define KEY_MICMUTE 248 #define BTN_MISC 0x100 #define BTN_0 0x100 @@ -420,14 +392,14 @@ #define BTN_TOOL_FINGER 0x145 #define BTN_TOOL_MOUSE 0x146 #define BTN_TOOL_LENS 0x147 -#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ +#define BTN_TOOL_QUINTTAP 0x148 #define BTN_STYLUS3 0x149 #define BTN_TOUCH 0x14a #define BTN_STYLUS 0x14b #define BTN_STYLUS2 0x14c #define BTN_TOOL_DOUBLETAP 0x14d #define BTN_TOOL_TRIPLETAP 0x14e -#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */ +#define BTN_TOOL_QUADTAP 0x14f #define BTN_WHEEL 0x150 #define BTN_GEAR_DOWN 0x150 @@ -439,56 +411,56 @@ #define KEY_CLEAR 0x163 #define KEY_POWER2 0x164 #define KEY_OPTION 0x165 -#define KEY_INFO 0x166 /* AL OEM Features/Tips/Tutorial */ +#define KEY_INFO 0x166 #define KEY_TIME 0x167 #define KEY_VENDOR 0x168 #define KEY_ARCHIVE 0x169 -#define KEY_PROGRAM 0x16a /* Media Select Program Guide */ +#define KEY_PROGRAM 0x16a #define KEY_CHANNEL 0x16b #define KEY_FAVORITES 0x16c #define KEY_EPG 0x16d -#define KEY_PVR 0x16e /* Media Select Home */ +#define KEY_PVR 0x16e #define KEY_MHP 0x16f #define KEY_LANGUAGE 0x170 #define KEY_TITLE 0x171 #define KEY_SUBTITLE 0x172 #define KEY_ANGLE 0x173 -#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */ +#define KEY_FULL_SCREEN 0x174 #define KEY_ZOOM KEY_FULL_SCREEN #define KEY_MODE 0x175 #define KEY_KEYBOARD 0x176 -#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */ +#define KEY_ASPECT_RATIO 0x177 #define KEY_SCREEN KEY_ASPECT_RATIO -#define KEY_PC 0x178 /* Media Select Computer */ -#define KEY_TV 0x179 /* Media Select TV */ -#define KEY_TV2 0x17a /* Media Select Cable */ -#define KEY_VCR 0x17b /* Media Select VCR */ -#define KEY_VCR2 0x17c /* VCR Plus */ -#define KEY_SAT 0x17d /* Media Select Satellite */ +#define KEY_PC 0x178 +#define KEY_TV 0x179 +#define KEY_TV2 0x17a +#define KEY_VCR 0x17b +#define KEY_VCR2 0x17c +#define KEY_SAT 0x17d #define KEY_SAT2 0x17e -#define KEY_CD 0x17f /* Media Select CD */ -#define KEY_TAPE 0x180 /* Media Select Tape */ +#define KEY_CD 0x17f +#define KEY_TAPE 0x180 #define KEY_RADIO 0x181 -#define KEY_TUNER 0x182 /* Media Select Tuner */ +#define KEY_TUNER 0x182 #define KEY_PLAYER 0x183 #define KEY_TEXT 0x184 -#define KEY_DVD 0x185 /* Media Select DVD */ +#define KEY_DVD 0x185 #define KEY_AUX 0x186 #define KEY_MP3 0x187 -#define KEY_AUDIO 0x188 /* AL Audio Browser */ -#define KEY_VIDEO 0x189 /* AL Movie Browser */ +#define KEY_AUDIO 0x188 +#define KEY_VIDEO 0x189 #define KEY_DIRECTORY 0x18a #define KEY_LIST 0x18b -#define KEY_MEMO 0x18c /* Media Select Messages */ +#define KEY_MEMO 0x18c #define KEY_CALENDAR 0x18d #define KEY_RED 0x18e #define KEY_GREEN 0x18f #define KEY_YELLOW 0x190 #define KEY_BLUE 0x191 -#define KEY_CHANNELUP 0x192 /* Channel Increment */ -#define KEY_CHANNELDOWN 0x193 /* Channel Decrement */ +#define KEY_CHANNELUP 0x192 +#define KEY_CHANNELDOWN 0x193 #define KEY_FIRST 0x194 -#define KEY_LAST 0x195 /* Recall Last */ +#define KEY_LAST 0x195 #define KEY_AB 0x196 #define KEY_NEXT 0x197 #define KEY_RESTART 0x198 @@ -499,40 +471,40 @@ #define KEY_DIGITS 0x19d #define KEY_TEEN 0x19e #define KEY_TWEN 0x19f -#define KEY_VIDEOPHONE 0x1a0 /* Media Select Video Phone */ -#define KEY_GAMES 0x1a1 /* Media Select Games */ -#define KEY_ZOOMIN 0x1a2 /* AC Zoom In */ -#define KEY_ZOOMOUT 0x1a3 /* AC Zoom Out */ -#define KEY_ZOOMRESET 0x1a4 /* AC Zoom */ -#define KEY_WORDPROCESSOR 0x1a5 /* AL Word Processor */ -#define KEY_EDITOR 0x1a6 /* AL Text Editor */ -#define KEY_SPREADSHEET 0x1a7 /* AL Spreadsheet */ -#define KEY_GRAPHICSEDITOR 0x1a8 /* AL Graphics Editor */ -#define KEY_PRESENTATION 0x1a9 /* AL Presentation App */ -#define KEY_DATABASE 0x1aa /* AL Database App */ -#define KEY_NEWS 0x1ab /* AL Newsreader */ -#define KEY_VOICEMAIL 0x1ac /* AL Voicemail */ -#define KEY_ADDRESSBOOK 0x1ad /* AL Contacts/Address Book */ -#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */ -#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ +#define KEY_VIDEOPHONE 0x1a0 +#define KEY_GAMES 0x1a1 +#define KEY_ZOOMIN 0x1a2 +#define KEY_ZOOMOUT 0x1a3 +#define KEY_ZOOMRESET 0x1a4 +#define KEY_WORDPROCESSOR 0x1a5 +#define KEY_EDITOR 0x1a6 +#define KEY_SPREADSHEET 0x1a7 +#define KEY_GRAPHICSEDITOR 0x1a8 +#define KEY_PRESENTATION 0x1a9 +#define KEY_DATABASE 0x1aa +#define KEY_NEWS 0x1ab +#define KEY_VOICEMAIL 0x1ac +#define KEY_ADDRESSBOOK 0x1ad +#define KEY_MESSENGER 0x1ae +#define KEY_DISPLAYTOGGLE 0x1af #define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE -#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ -#define KEY_LOGOFF 0x1b1 /* AL Logoff */ +#define KEY_SPELLCHECK 0x1b0 +#define KEY_LOGOFF 0x1b1 #define KEY_DOLLAR 0x1b2 #define KEY_EURO 0x1b3 -#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ +#define KEY_FRAMEBACK 0x1b4 #define KEY_FRAMEFORWARD 0x1b5 -#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ -#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ -#define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ -#define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ -#define KEY_IMAGES 0x1ba /* AL Image Browser */ -#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ -#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ -#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ -#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ +#define KEY_CONTEXT_MENU 0x1b6 +#define KEY_MEDIA_REPEAT 0x1b7 +#define KEY_10CHANNELSUP 0x1b8 +#define KEY_10CHANNELSDOWN 0x1b9 +#define KEY_IMAGES 0x1ba +#define KEY_NOTIFICATION_CENTER 0x1bc +#define KEY_PICKUP_PHONE 0x1bd +#define KEY_HANGUP_PHONE 0x1be +#define KEY_LINK_PHONE 0x1bf #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -573,8 +545,8 @@ #define KEY_BRL_DOT9 0x1f9 #define KEY_BRL_DOT10 0x1fa -#define KEY_NUMERIC_0 0x200 /* used by phones, remote controls, */ -#define KEY_NUMERIC_1 0x201 /* and other keypads */ +#define KEY_NUMERIC_0 0x200 +#define KEY_NUMERIC_1 0x201 #define KEY_NUMERIC_2 0x202 #define KEY_NUMERIC_3 0x203 #define KEY_NUMERIC_4 0x204 @@ -585,15 +557,14 @@ #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b -#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ +#define KEY_NUMERIC_A 0x20c #define KEY_NUMERIC_B 0x20d #define KEY_NUMERIC_C 0x20e #define KEY_NUMERIC_D 0x20f - #define KEY_CAMERA_FOCUS 0x210 -#define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ +#define KEY_WPS_BUTTON 0x211 -#define KEY_TOUCHPAD_TOGGLE 0x212 /* Request switch touchpad on or off */ +#define KEY_TOUCHPAD_TOGGLE 0x212 #define KEY_TOUCHPAD_ON 0x213 #define KEY_TOUCHPAD_OFF 0x214 @@ -603,11 +574,10 @@ #define KEY_CAMERA_DOWN 0x218 #define KEY_CAMERA_LEFT 0x219 #define KEY_CAMERA_RIGHT 0x21a - #define KEY_ATTENDANT_ON 0x21b #define KEY_ATTENDANT_OFF 0x21c -#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ -#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ +#define KEY_ATTENDANT_TOGGLE 0x21d +#define KEY_LIGHTS_TOGGLE 0x21e #define BTN_DPAD_UP 0x220 #define BTN_DPAD_DOWN 0x221 @@ -619,94 +589,69 @@ #define BTN_GRIPL2 0x226 #define BTN_GRIPR2 0x227 -#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ -#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ -#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ - -#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ -#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ -#define KEY_JOURNAL 0x242 /* AL Log/Journal/Timecard */ -#define KEY_CONTROLPANEL 0x243 /* AL Control Panel */ -#define KEY_APPSELECT 0x244 /* AL Select Task/Application */ -#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ -#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ -#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ -#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ -#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ -#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ -#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ -#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ -#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ - -#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ -#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ - -/* - * Keycodes for hotkeys toggling the electronic privacy screen found on some - * laptops on/off. Note when the embedded-controller turns on/off the eprivacy - * screen itself then the state should be reported through drm connecter props: - * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties - * Except when implementing the drm connecter properties API is not possible - * because e.g. the firmware does not allow querying the presence and/or status - * of the eprivacy screen at boot. - */ +#define KEY_ALS_TOGGLE 0x230 +#define KEY_ROTATE_LOCK_TOGGLE 0x231 +#define KEY_REFRESH_RATE_TOGGLE 0x232 + +#define KEY_BUTTONCONFIG 0x240 +#define KEY_TASKMANAGER 0x241 +#define KEY_JOURNAL 0x242 +#define KEY_CONTROLPANEL 0x243 +#define KEY_APPSELECT 0x244 +#define KEY_SCREENSAVER 0x245 +#define KEY_VOICECOMMAND 0x246 +#define KEY_ASSISTANT 0x247 +#define KEY_KBD_LAYOUT_NEXT 0x248 +#define KEY_EMOJI_PICKER 0x249 +#define KEY_DICTATE 0x24a +#define KEY_CAMERA_ACCESS_ENABLE 0x24b +#define KEY_CAMERA_ACCESS_DISABLE 0x24c +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d +#define KEY_ACCESSIBILITY 0x24e +#define KEY_DO_NOT_DISTURB 0x24f + +#define KEY_BRIGHTNESS_MIN 0x250 +#define KEY_BRIGHTNESS_MAX 0x251 + #define KEY_EPRIVACY_SCREEN_ON 0x252 #define KEY_EPRIVACY_SCREEN_OFF 0x253 #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 -#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 -#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 -#define KEY_KBDINPUTASSIST_ACCEPT 0x264 -#define KEY_KBDINPUTASSIST_CANCEL 0x265 +#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 +#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 +#define KEY_KBDINPUTASSIST_ACCEPT 0x264 +#define KEY_KBDINPUTASSIST_CANCEL 0x265 -/* Diagonal movement keys */ #define KEY_RIGHT_UP 0x266 #define KEY_RIGHT_DOWN 0x267 #define KEY_LEFT_UP 0x268 #define KEY_LEFT_DOWN 0x269 -#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */ -/* Show Top Menu of the Media (e.g. DVD) */ +#define KEY_ROOT_MENU 0x26a #define KEY_MEDIA_TOP_MENU 0x26b #define KEY_NUMERIC_11 0x26c #define KEY_NUMERIC_12 0x26d -/* - * Toggle Audio Description: refers to an audio service that helps blind and - * visually impaired consumers understand the action in a program. Note: in - * some countries this is referred to as "Video Description". - */ #define KEY_AUDIO_DESC 0x26e #define KEY_3D_MODE 0x26f #define KEY_NEXT_FAVORITE 0x270 #define KEY_STOP_RECORD 0x271 #define KEY_PAUSE_RECORD 0x272 -#define KEY_VOD 0x273 /* Video on Demand */ +#define KEY_VOD 0x273 #define KEY_UNMUTE 0x274 #define KEY_FASTREVERSE 0x275 #define KEY_SLOWREVERSE 0x276 -/* - * Control a data application associated with the currently viewed channel, - * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) - */ #define KEY_DATA 0x277 #define KEY_ONSCREEN_KEYBOARD 0x278 -/* Electronic privacy screen control */ #define KEY_PRIVACY_SCREEN_TOGGLE 0x279 -/* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a -/* Move the focus to the next or previous user controllable element within a UI container */ #define KEY_NEXT_ELEMENT 0x27b #define KEY_PREVIOUS_ELEMENT 0x27c -/* Toggle Autopilot engagement */ #define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d -/* Shortcut Keys */ #define KEY_MARK_WAYPOINT 0x27e #define KEY_SOS 0x27f #define KEY_NAV_CHART 0x280 @@ -720,21 +665,6 @@ #define KEY_NAV_INFO 0x288 #define KEY_BRIGHTNESS_MENU 0x289 -/* - * Some keyboards have keys which do not have a defined meaning, these keys - * are intended to be programmed / bound to macros by the user. For most - * keyboards with these macro-keys the key-sequence to inject, or action to - * take, is all handled by software on the host side. So from the kernel's - * point of view these are just normal keys. - * - * The KEY_MACRO# codes below are intended for such keys, which may be labeled - * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys - * where the marking on the key does indicate a defined meaning / purpose. - * - * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing - * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO - * define MUST be added. - */ #define KEY_MACRO1 0x290 #define KEY_MACRO2 0x291 #define KEY_MACRO3 0x292 @@ -766,16 +696,6 @@ #define KEY_MACRO29 0x2ac #define KEY_MACRO30 0x2ad -/* - * Some keyboards with the macro-keys described above have some extra keys - * for controlling the host-side software responsible for the macro handling: - * -A macro recording start/stop key. Note that not all keyboards which emit - * KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if - * KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START - * should be interpreted as a recording start/stop toggle; - * -Keys for switching between different macro (pre)sets, either a key for - * cycling through the configured presets or keys to directly select a preset. - */ #define KEY_MACRO_RECORD_START 0x2b0 #define KEY_MACRO_RECORD_STOP 0x2b1 #define KEY_MACRO_PRESET_CYCLE 0x2b2 @@ -783,19 +703,12 @@ #define KEY_MACRO_PRESET2 0x2b4 #define KEY_MACRO_PRESET3 0x2b5 -/* - * Some keyboards have a buildin LCD panel where the contents are controlled - * by the host. Often these have a number of keys directly below the LCD - * intended for controlling a menu shown on the LCD. These keys often don't - * have any labeling so we just name them KEY_KBD_LCD_MENU# - */ #define KEY_KBD_LCD_MENU1 0x2b8 #define KEY_KBD_LCD_MENU2 0x2b9 #define KEY_KBD_LCD_MENU3 0x2ba #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc -/* Performance Boost key (Alienware)/G-Mode key (Dell) */ #define KEY_PERFORMANCE 0x2bd #define BTN_TRIGGER_HAPPY 0x2c0 @@ -840,15 +753,10 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 -/* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff #define KEY_CNT (KEY_MAX+1) -/* - * Relative axes - */ - #define REL_X 0x00 #define REL_Y 0x01 #define REL_Z 0x02 @@ -859,23 +767,12 @@ #define REL_DIAL 0x07 #define REL_WHEEL 0x08 #define REL_MISC 0x09 -/* - * 0x0a is reserved and should not be used in input drivers. - * It was used by HID as REL_MISC+1 and userspace needs to detect if - * the next REL_* event is correct or is just REL_MISC + n. - * We define here REL_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define REL_RESERVED 0x0a #define REL_WHEEL_HI_RES 0x0b #define REL_HWHEEL_HI_RES 0x0c #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) -/* - * Absolute axes - */ - #define ABS_X 0x00 #define ABS_Y 0x01 #define ABS_Z 0x02 @@ -906,65 +803,49 @@ #define ABS_MISC 0x28 -/* - * 0x2e is reserved and should not be used in input drivers. - * It was used by HID as ABS_MISC+6 and userspace needs to detect if - * the next ABS_* event is correct or is just ABS_MISC + n. - * We define here ABS_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define ABS_RESERVED 0x2e -#define ABS_MT_SLOT 0x2f /* MT slot being modified */ -#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ -#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ -#define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */ -#define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */ -#define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */ -#define ABS_MT_POSITION_X 0x35 /* Center X touch position */ -#define ABS_MT_POSITION_Y 0x36 /* Center Y touch position */ -#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ -#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ -#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ -#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ -#define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ -#define ABS_MT_TOOL_X 0x3c /* Center X tool position */ -#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */ +#define ABS_MT_SLOT 0x2f +#define ABS_MT_TOUCH_MAJOR 0x30 +#define ABS_MT_TOUCH_MINOR 0x31 +#define ABS_MT_WIDTH_MAJOR 0x32 +#define ABS_MT_WIDTH_MINOR 0x33 +#define ABS_MT_ORIENTATION 0x34 +#define ABS_MT_POSITION_X 0x35 +#define ABS_MT_POSITION_Y 0x36 +#define ABS_MT_TOOL_TYPE 0x37 +#define ABS_MT_BLOB_ID 0x38 +#define ABS_MT_TRACKING_ID 0x39 +#define ABS_MT_PRESSURE 0x3a +#define ABS_MT_DISTANCE 0x3b +#define ABS_MT_TOOL_X 0x3c +#define ABS_MT_TOOL_Y 0x3d #define ABS_MAX 0x3f #define ABS_CNT (ABS_MAX+1) -/* - * Switch events - */ - -#define SW_LID 0x00 /* set = lid shut */ -#define SW_TABLET_MODE 0x01 /* set = tablet mode */ -#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ -#define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any" - set = radio enabled */ -#define SW_RADIO SW_RFKILL_ALL /* deprecated */ -#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ -#define SW_DOCK 0x05 /* set = plugged into dock */ -#define SW_LINEOUT_INSERT 0x06 /* set = inserted */ -#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ -#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ -#define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ -#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ -#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ -#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ -#define SW_LINEIN_INSERT 0x0d /* set = inserted */ -#define SW_MUTE_DEVICE 0x0e /* set = device disabled */ -#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_LID 0x00 +#define SW_TABLET_MODE 0x01 +#define SW_HEADPHONE_INSERT 0x02 +#define SW_RFKILL_ALL 0x03 +#define SW_RADIO SW_RFKILL_ALL +#define SW_MICROPHONE_INSERT 0x04 +#define SW_DOCK 0x05 +#define SW_LINEOUT_INSERT 0x06 +#define SW_JACK_PHYSICAL_INSERT 0x07 +#define SW_VIDEOOUT_INSERT 0x08 +#define SW_CAMERA_LENS_COVER 0x09 +#define SW_KEYPAD_SLIDE 0x0a +#define SW_FRONT_PROXIMITY 0x0b +#define SW_ROTATE_LOCK 0x0c +#define SW_LINEIN_INSERT 0x0d +#define SW_MUTE_DEVICE 0x0e +#define SW_PEN_INSERTED 0x0f +#define SW_MACHINE_COVER 0x10 +#define SW_USB_INSERT 0x11 #define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) -/* - * Misc events - */ - #define MSC_SERIAL 0x00 #define MSC_PULSELED 0x01 #define MSC_GESTURE 0x02 @@ -974,10 +855,6 @@ #define MSC_MAX 0x07 #define MSC_CNT (MSC_MAX+1) -/* - * LEDs - */ - #define LED_NUML 0x00 #define LED_CAPSL 0x01 #define LED_SCROLLL 0x02 @@ -992,19 +869,11 @@ #define LED_MAX 0x0f #define LED_CNT (LED_MAX+1) -/* - * Autorepeat values - */ - #define REP_DELAY 0x00 #define REP_PERIOD 0x01 #define REP_MAX 0x01 #define REP_CNT (REP_MAX+1) -/* - * Sounds - */ - #define SND_CLICK 0x00 #define SND_BELL 0x01 #define SND_TONE 0x02 From nobody Tue Feb 17 20:41: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 4fFs4p0Rn2z6S3CG for ; Tue, 17 Feb 2026 20:41: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 4fFs4n5Kg8z3sN7 for ; Tue, 17 Feb 2026 20:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zE9wmuvFrKX8BhoV8MXOGFzBhgUrweq6OJ848NGRw3o=; b=OvYjYjH9bKOBjJKEbeoEYPyRkWfpDQ9dRkCu4GUqwnB4kuPGJwEHX44GCdZ+DCgZaioeor GUzpQCJnjalW5VrghpSVmwri7lluKc6pp4m64S+TCeJRQuk2Nu7h2SAjFiqpEVWD+pK13Z QhM3MsTVXN01ol/dMlrLUvU4b5mIUO+FU5Cm9f88T+ktGHa9m7OVSjJRuViIelyZdKu3fV BzYq7rwMaZV65cr3h1SyNTTg7jkbMQ8ZiwhqoJIAlxFWteK3dZJebjmMSX2n/mDA9B3Zjc E/WPEwLyAlg2PxXZVkRBQOFMydY2OUy+wWpFpaYHeiX/JsisB+lJr/q7PC2qjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360905; a=rsa-sha256; cv=none; b=VLfGSixmCiEwk4rP/az3tro5Bv7HlEs0uJGRjc3gv14qrUlLtix/bHWT01hqPZ1um6UOIP Ss06HFcG3IzZUh48qdVKGa3Bow//X8NnqQ34VRxaIQ3sJk5rJWLPBEcVxWY4AdqtC9M1ly fiNlCNlNcR5hcgKEiw5VPlO1JolLHm8FrJK1xtM9NKPO+AyriUY6yU8BM3rNYqRC5AhrFu vHWscimneKcpuFI94w2ueNbQhLFO6tkjQueEaDBjdH5IOXzUT7wp7OJlNpV4OoLAwLEGHY ELmnlYeoMbLapRgtIR0uDhnqnvfuzt+F8RCU1gxtkStBJpdH2edQDCz3dPORQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zE9wmuvFrKX8BhoV8MXOGFzBhgUrweq6OJ848NGRw3o=; b=SQfcPDIxXMZlboWOVVh2eFInxtLwAuvKUq1GcSxHEosvVRV58nVPokgQBozS4cShEV5Otg P354oTvB0FC7w7mat8aAt0DSD2bVBs8SQE8dncucENgnetcjjEO7p9LvsseidQIHNcEvLr OSXnuJL8QvMUW5ocEwIxZbL63eZrHovffjpG+jBEazptmj5JGHk0BYskgHSmtI4B6MwLQ0 E6ADVtHVVGIE5ZDAIF00Wf58DaZ03/52ijrq6Bft/5QMMOcO+B/nXTYbKAjbzBO9YBc0Vj xOgy6IsLT8T49ZxY3eYNgYcmgiM+jz0+uHQszQKTINrQiocIJTD+up5V/5wBQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4n4sbVz9K3 for ; Tue, 17 Feb 2026 20:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 0280fef4ba5e - stable/14 - evdev: Drop comments from input-event-codes.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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0280fef4ba5e3baeac7511deea50b91466a69e95 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:45 +0000 Message-Id: <6994d289.1ffc2.5c9aacf9@gitrepo.freebsd.org> The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=0280fef4ba5e3baeac7511deea50b91466a69e95 commit 0280fef4ba5e3baeac7511deea50b91466a69e95 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:40:16 +0000 evdev: Drop comments from input-event-codes.h They were copied intact from the Linux GPL-only file. Requested by: imp, glebius MFC after: 1 week (cherry picked from commit 89aa8a94053fdd22ed716fdf424a2d10e70b3188) --- sys/dev/evdev/input-event-codes.h | 485 ++++++++++++++------------------------ 1 file changed, 177 insertions(+), 308 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 81c88ec86b9b..4f1d0f96e400 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -28,26 +28,18 @@ #ifndef _EVDEV_INPUT_EVENT_CODES_H #define _EVDEV_INPUT_EVENT_CODES_H -/* - * Device properties and quirks - */ - -#define INPUT_PROP_POINTER 0x00 /* needs a pointer */ -#define INPUT_PROP_DIRECT 0x01 /* direct input devices */ -#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ -#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ -#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ -#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ -#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ -#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ +#define INPUT_PROP_POINTER 0x00 +#define INPUT_PROP_DIRECT 0x01 +#define INPUT_PROP_BUTTONPAD 0x02 +#define INPUT_PROP_SEMI_MT 0x03 +#define INPUT_PROP_TOPBUTTONPAD 0x04 +#define INPUT_PROP_POINTING_STICK 0x05 +#define INPUT_PROP_ACCELEROMETER 0x06 +#define INPUT_PROP_PRESSUREPAD 0x07 #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) -/* - * Event types - */ - #define EV_SYN 0x00 #define EV_KEY 0x01 #define EV_REL 0x02 @@ -63,10 +55,6 @@ #define EV_MAX 0x1f #define EV_CNT (EV_MAX+1) -/* - * Synchronization events. - */ - #define SYN_REPORT 0 #define SYN_CONFIG 1 #define SYN_MT_REPORT 2 @@ -74,17 +62,6 @@ #define SYN_MAX 0xf #define SYN_CNT (SYN_MAX+1) -/* - * Keys and buttons - * - * Most of the keys/buttons are modeled after USB HUT 1.12 - * (see http://www.usb.org/developers/hidpage). - * Abbreviations in the comments: - * AC - Application Control - * AL - Application Launch Button - * SC - System Control - */ - #define KEY_RESERVED 0 #define KEY_ESC 1 #define KEY_1 2 @@ -201,11 +178,11 @@ #define KEY_MUTE 113 #define KEY_VOLUMEDOWN 114 #define KEY_VOLUMEUP 115 -#define KEY_POWER 116 /* SC System Power Down */ +#define KEY_POWER 116 #define KEY_KPEQUAL 117 #define KEY_KPPLUSMINUS 118 #define KEY_PAUSE 119 -#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ +#define KEY_SCALE 120 #define KEY_KPCOMMA 121 #define KEY_HANGEUL 122 @@ -216,40 +193,40 @@ #define KEY_RIGHTMETA 126 #define KEY_COMPOSE 127 -#define KEY_STOP 128 /* AC Stop */ +#define KEY_STOP 128 #define KEY_AGAIN 129 -#define KEY_PROPS 130 /* AC Properties */ -#define KEY_UNDO 131 /* AC Undo */ +#define KEY_PROPS 130 +#define KEY_UNDO 131 #define KEY_FRONT 132 -#define KEY_COPY 133 /* AC Copy */ -#define KEY_OPEN 134 /* AC Open */ -#define KEY_PASTE 135 /* AC Paste */ -#define KEY_FIND 136 /* AC Search */ -#define KEY_CUT 137 /* AC Cut */ -#define KEY_HELP 138 /* AL Integrated Help Center */ -#define KEY_MENU 139 /* Menu (show menu) */ -#define KEY_CALC 140 /* AL Calculator */ +#define KEY_COPY 133 +#define KEY_OPEN 134 +#define KEY_PASTE 135 +#define KEY_FIND 136 +#define KEY_CUT 137 +#define KEY_HELP 138 +#define KEY_MENU 139 +#define KEY_CALC 140 #define KEY_SETUP 141 -#define KEY_SLEEP 142 /* SC System Sleep */ -#define KEY_WAKEUP 143 /* System Wake Up */ -#define KEY_FILE 144 /* AL Local Machine Browser */ +#define KEY_SLEEP 142 +#define KEY_WAKEUP 143 +#define KEY_FILE 144 #define KEY_SENDFILE 145 #define KEY_DELETEFILE 146 #define KEY_XFER 147 #define KEY_PROG1 148 #define KEY_PROG2 149 -#define KEY_WWW 150 /* AL Internet Browser */ +#define KEY_WWW 150 #define KEY_MSDOS 151 -#define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ +#define KEY_COFFEE 152 #define KEY_SCREENLOCK KEY_COFFEE -#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ +#define KEY_ROTATE_DISPLAY 153 #define KEY_DIRECTION KEY_ROTATE_DISPLAY #define KEY_CYCLEWINDOWS 154 #define KEY_MAIL 155 -#define KEY_BOOKMARKS 156 /* AC Bookmarks */ +#define KEY_BOOKMARKS 156 #define KEY_COMPUTER 157 -#define KEY_BACK 158 /* AC Back */ -#define KEY_FORWARD 159 /* AC Forward */ +#define KEY_BACK 158 +#define KEY_FORWARD 159 #define KEY_CLOSECD 160 #define KEY_EJECTCD 161 #define KEY_EJECTCLOSECD 162 @@ -259,20 +236,20 @@ #define KEY_STOPCD 166 #define KEY_RECORD 167 #define KEY_REWIND 168 -#define KEY_PHONE 169 /* Media Select Telephone */ +#define KEY_PHONE 169 #define KEY_ISO 170 -#define KEY_CONFIG 171 /* AL Consumer Control Configuration */ -#define KEY_HOMEPAGE 172 /* AC Home */ -#define KEY_REFRESH 173 /* AC Refresh */ -#define KEY_EXIT 174 /* AC Exit */ +#define KEY_CONFIG 171 +#define KEY_HOMEPAGE 172 +#define KEY_REFRESH 173 +#define KEY_EXIT 174 #define KEY_MOVE 175 #define KEY_EDIT 176 #define KEY_SCROLLUP 177 #define KEY_SCROLLDOWN 178 #define KEY_KPLEFTPAREN 179 #define KEY_KPRIGHTPAREN 180 -#define KEY_NEW 181 /* AC New */ -#define KEY_REDO 182 /* AC Redo/Repeat */ +#define KEY_NEW 181 +#define KEY_REDO 182 #define KEY_F13 183 #define KEY_F14 184 @@ -291,14 +268,14 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_ALL_APPLICATIONS 204 #define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 -#define KEY_CLOSE 206 /* AC Close */ +#define KEY_CLOSE 206 #define KEY_PLAY 207 #define KEY_FASTFORWARD 208 #define KEY_BASSBOOST 209 -#define KEY_PRINT 210 /* AC Print */ +#define KEY_PRINT 210 #define KEY_HP 211 #define KEY_CAMERA 212 #define KEY_SOUND 213 @@ -307,25 +284,24 @@ #define KEY_CHAT 216 #define KEY_SEARCH 217 #define KEY_CONNECT 218 -#define KEY_FINANCE 219 /* AL Checkbook/Finance */ +#define KEY_FINANCE 219 #define KEY_SPORT 220 #define KEY_SHOP 221 #define KEY_ALTERASE 222 -#define KEY_CANCEL 223 /* AC Cancel */ +#define KEY_CANCEL 223 #define KEY_BRIGHTNESSDOWN 224 #define KEY_BRIGHTNESSUP 225 #define KEY_MEDIA 226 -#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video - outputs (Monitor/LCD/TV-out/etc) */ +#define KEY_SWITCHVIDEOMODE 227 #define KEY_KBDILLUMTOGGLE 228 #define KEY_KBDILLUMDOWN 229 #define KEY_KBDILLUMUP 230 -#define KEY_SEND 231 /* AC Send */ -#define KEY_REPLY 232 /* AC Reply */ -#define KEY_FORWARDMAIL 233 /* AC Forward Msg */ -#define KEY_SAVE 234 /* AC Save */ +#define KEY_SEND 231 +#define KEY_REPLY 232 +#define KEY_FORWARDMAIL 233 +#define KEY_SAVE 234 #define KEY_DOCUMENTS 235 #define KEY_BATTERY 236 @@ -336,22 +312,18 @@ #define KEY_UNKNOWN 240 -#define KEY_VIDEO_NEXT 241 /* drive next video source */ -#define KEY_VIDEO_PREV 242 /* drive previous video source */ -#define KEY_BRIGHTNESS_CYCLE 243 /* brightness up, after max is min */ -#define KEY_BRIGHTNESS_AUTO 244 /* Set Auto Brightness: manual - brightness control is off, - rely on ambient */ +#define KEY_VIDEO_NEXT 241 +#define KEY_VIDEO_PREV 242 +#define KEY_BRIGHTNESS_CYCLE 243 +#define KEY_BRIGHTNESS_AUTO 244 #define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO -#define KEY_DISPLAY_OFF 245 /* display device to off state */ +#define KEY_DISPLAY_OFF 245 -#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ +#define KEY_WWAN 246 #define KEY_WIMAX KEY_WWAN -#define KEY_RFKILL 247 /* Key that controls all radios */ - -#define KEY_MICMUTE 248 /* Mute / unmute the microphone */ +#define KEY_RFKILL 247 -/* Code 255 is reserved for special needs of AT keyboard driver */ +#define KEY_MICMUTE 248 #define BTN_MISC 0x100 #define BTN_0 0x100 @@ -420,14 +392,14 @@ #define BTN_TOOL_FINGER 0x145 #define BTN_TOOL_MOUSE 0x146 #define BTN_TOOL_LENS 0x147 -#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ +#define BTN_TOOL_QUINTTAP 0x148 #define BTN_STYLUS3 0x149 #define BTN_TOUCH 0x14a #define BTN_STYLUS 0x14b #define BTN_STYLUS2 0x14c #define BTN_TOOL_DOUBLETAP 0x14d #define BTN_TOOL_TRIPLETAP 0x14e -#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */ +#define BTN_TOOL_QUADTAP 0x14f #define BTN_WHEEL 0x150 #define BTN_GEAR_DOWN 0x150 @@ -439,56 +411,56 @@ #define KEY_CLEAR 0x163 #define KEY_POWER2 0x164 #define KEY_OPTION 0x165 -#define KEY_INFO 0x166 /* AL OEM Features/Tips/Tutorial */ +#define KEY_INFO 0x166 #define KEY_TIME 0x167 #define KEY_VENDOR 0x168 #define KEY_ARCHIVE 0x169 -#define KEY_PROGRAM 0x16a /* Media Select Program Guide */ +#define KEY_PROGRAM 0x16a #define KEY_CHANNEL 0x16b #define KEY_FAVORITES 0x16c #define KEY_EPG 0x16d -#define KEY_PVR 0x16e /* Media Select Home */ +#define KEY_PVR 0x16e #define KEY_MHP 0x16f #define KEY_LANGUAGE 0x170 #define KEY_TITLE 0x171 #define KEY_SUBTITLE 0x172 #define KEY_ANGLE 0x173 -#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */ +#define KEY_FULL_SCREEN 0x174 #define KEY_ZOOM KEY_FULL_SCREEN #define KEY_MODE 0x175 #define KEY_KEYBOARD 0x176 -#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */ +#define KEY_ASPECT_RATIO 0x177 #define KEY_SCREEN KEY_ASPECT_RATIO -#define KEY_PC 0x178 /* Media Select Computer */ -#define KEY_TV 0x179 /* Media Select TV */ -#define KEY_TV2 0x17a /* Media Select Cable */ -#define KEY_VCR 0x17b /* Media Select VCR */ -#define KEY_VCR2 0x17c /* VCR Plus */ -#define KEY_SAT 0x17d /* Media Select Satellite */ +#define KEY_PC 0x178 +#define KEY_TV 0x179 +#define KEY_TV2 0x17a +#define KEY_VCR 0x17b +#define KEY_VCR2 0x17c +#define KEY_SAT 0x17d #define KEY_SAT2 0x17e -#define KEY_CD 0x17f /* Media Select CD */ -#define KEY_TAPE 0x180 /* Media Select Tape */ +#define KEY_CD 0x17f +#define KEY_TAPE 0x180 #define KEY_RADIO 0x181 -#define KEY_TUNER 0x182 /* Media Select Tuner */ +#define KEY_TUNER 0x182 #define KEY_PLAYER 0x183 #define KEY_TEXT 0x184 -#define KEY_DVD 0x185 /* Media Select DVD */ +#define KEY_DVD 0x185 #define KEY_AUX 0x186 #define KEY_MP3 0x187 -#define KEY_AUDIO 0x188 /* AL Audio Browser */ -#define KEY_VIDEO 0x189 /* AL Movie Browser */ +#define KEY_AUDIO 0x188 +#define KEY_VIDEO 0x189 #define KEY_DIRECTORY 0x18a #define KEY_LIST 0x18b -#define KEY_MEMO 0x18c /* Media Select Messages */ +#define KEY_MEMO 0x18c #define KEY_CALENDAR 0x18d #define KEY_RED 0x18e #define KEY_GREEN 0x18f #define KEY_YELLOW 0x190 #define KEY_BLUE 0x191 -#define KEY_CHANNELUP 0x192 /* Channel Increment */ -#define KEY_CHANNELDOWN 0x193 /* Channel Decrement */ +#define KEY_CHANNELUP 0x192 +#define KEY_CHANNELDOWN 0x193 #define KEY_FIRST 0x194 -#define KEY_LAST 0x195 /* Recall Last */ +#define KEY_LAST 0x195 #define KEY_AB 0x196 #define KEY_NEXT 0x197 #define KEY_RESTART 0x198 @@ -499,40 +471,40 @@ #define KEY_DIGITS 0x19d #define KEY_TEEN 0x19e #define KEY_TWEN 0x19f -#define KEY_VIDEOPHONE 0x1a0 /* Media Select Video Phone */ -#define KEY_GAMES 0x1a1 /* Media Select Games */ -#define KEY_ZOOMIN 0x1a2 /* AC Zoom In */ -#define KEY_ZOOMOUT 0x1a3 /* AC Zoom Out */ -#define KEY_ZOOMRESET 0x1a4 /* AC Zoom */ -#define KEY_WORDPROCESSOR 0x1a5 /* AL Word Processor */ -#define KEY_EDITOR 0x1a6 /* AL Text Editor */ -#define KEY_SPREADSHEET 0x1a7 /* AL Spreadsheet */ -#define KEY_GRAPHICSEDITOR 0x1a8 /* AL Graphics Editor */ -#define KEY_PRESENTATION 0x1a9 /* AL Presentation App */ -#define KEY_DATABASE 0x1aa /* AL Database App */ -#define KEY_NEWS 0x1ab /* AL Newsreader */ -#define KEY_VOICEMAIL 0x1ac /* AL Voicemail */ -#define KEY_ADDRESSBOOK 0x1ad /* AL Contacts/Address Book */ -#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */ -#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ +#define KEY_VIDEOPHONE 0x1a0 +#define KEY_GAMES 0x1a1 +#define KEY_ZOOMIN 0x1a2 +#define KEY_ZOOMOUT 0x1a3 +#define KEY_ZOOMRESET 0x1a4 +#define KEY_WORDPROCESSOR 0x1a5 +#define KEY_EDITOR 0x1a6 +#define KEY_SPREADSHEET 0x1a7 +#define KEY_GRAPHICSEDITOR 0x1a8 +#define KEY_PRESENTATION 0x1a9 +#define KEY_DATABASE 0x1aa +#define KEY_NEWS 0x1ab +#define KEY_VOICEMAIL 0x1ac +#define KEY_ADDRESSBOOK 0x1ad +#define KEY_MESSENGER 0x1ae +#define KEY_DISPLAYTOGGLE 0x1af #define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE -#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ -#define KEY_LOGOFF 0x1b1 /* AL Logoff */ +#define KEY_SPELLCHECK 0x1b0 +#define KEY_LOGOFF 0x1b1 #define KEY_DOLLAR 0x1b2 #define KEY_EURO 0x1b3 -#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ +#define KEY_FRAMEBACK 0x1b4 #define KEY_FRAMEFORWARD 0x1b5 -#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ -#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ -#define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ -#define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ -#define KEY_IMAGES 0x1ba /* AL Image Browser */ -#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ -#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ -#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ -#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ +#define KEY_CONTEXT_MENU 0x1b6 +#define KEY_MEDIA_REPEAT 0x1b7 +#define KEY_10CHANNELSUP 0x1b8 +#define KEY_10CHANNELSDOWN 0x1b9 +#define KEY_IMAGES 0x1ba +#define KEY_NOTIFICATION_CENTER 0x1bc +#define KEY_PICKUP_PHONE 0x1bd +#define KEY_HANGUP_PHONE 0x1be +#define KEY_LINK_PHONE 0x1bf #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -573,8 +545,8 @@ #define KEY_BRL_DOT9 0x1f9 #define KEY_BRL_DOT10 0x1fa -#define KEY_NUMERIC_0 0x200 /* used by phones, remote controls, */ -#define KEY_NUMERIC_1 0x201 /* and other keypads */ +#define KEY_NUMERIC_0 0x200 +#define KEY_NUMERIC_1 0x201 #define KEY_NUMERIC_2 0x202 #define KEY_NUMERIC_3 0x203 #define KEY_NUMERIC_4 0x204 @@ -585,15 +557,14 @@ #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b -#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ +#define KEY_NUMERIC_A 0x20c #define KEY_NUMERIC_B 0x20d #define KEY_NUMERIC_C 0x20e #define KEY_NUMERIC_D 0x20f - #define KEY_CAMERA_FOCUS 0x210 -#define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ +#define KEY_WPS_BUTTON 0x211 -#define KEY_TOUCHPAD_TOGGLE 0x212 /* Request switch touchpad on or off */ +#define KEY_TOUCHPAD_TOGGLE 0x212 #define KEY_TOUCHPAD_ON 0x213 #define KEY_TOUCHPAD_OFF 0x214 @@ -603,11 +574,10 @@ #define KEY_CAMERA_DOWN 0x218 #define KEY_CAMERA_LEFT 0x219 #define KEY_CAMERA_RIGHT 0x21a - #define KEY_ATTENDANT_ON 0x21b #define KEY_ATTENDANT_OFF 0x21c -#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ -#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ +#define KEY_ATTENDANT_TOGGLE 0x21d +#define KEY_LIGHTS_TOGGLE 0x21e #define BTN_DPAD_UP 0x220 #define BTN_DPAD_DOWN 0x221 @@ -619,94 +589,69 @@ #define BTN_GRIPL2 0x226 #define BTN_GRIPR2 0x227 -#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ -#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ -#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ - -#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ -#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ -#define KEY_JOURNAL 0x242 /* AL Log/Journal/Timecard */ -#define KEY_CONTROLPANEL 0x243 /* AL Control Panel */ -#define KEY_APPSELECT 0x244 /* AL Select Task/Application */ -#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ -#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ -#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ -#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ -#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ -#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ -#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ -#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ -#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ - -#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ -#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ - -/* - * Keycodes for hotkeys toggling the electronic privacy screen found on some - * laptops on/off. Note when the embedded-controller turns on/off the eprivacy - * screen itself then the state should be reported through drm connecter props: - * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties - * Except when implementing the drm connecter properties API is not possible - * because e.g. the firmware does not allow querying the presence and/or status - * of the eprivacy screen at boot. - */ +#define KEY_ALS_TOGGLE 0x230 +#define KEY_ROTATE_LOCK_TOGGLE 0x231 +#define KEY_REFRESH_RATE_TOGGLE 0x232 + +#define KEY_BUTTONCONFIG 0x240 +#define KEY_TASKMANAGER 0x241 +#define KEY_JOURNAL 0x242 +#define KEY_CONTROLPANEL 0x243 +#define KEY_APPSELECT 0x244 +#define KEY_SCREENSAVER 0x245 +#define KEY_VOICECOMMAND 0x246 +#define KEY_ASSISTANT 0x247 +#define KEY_KBD_LAYOUT_NEXT 0x248 +#define KEY_EMOJI_PICKER 0x249 +#define KEY_DICTATE 0x24a +#define KEY_CAMERA_ACCESS_ENABLE 0x24b +#define KEY_CAMERA_ACCESS_DISABLE 0x24c +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d +#define KEY_ACCESSIBILITY 0x24e +#define KEY_DO_NOT_DISTURB 0x24f + +#define KEY_BRIGHTNESS_MIN 0x250 +#define KEY_BRIGHTNESS_MAX 0x251 + #define KEY_EPRIVACY_SCREEN_ON 0x252 #define KEY_EPRIVACY_SCREEN_OFF 0x253 #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 -#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 -#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 -#define KEY_KBDINPUTASSIST_ACCEPT 0x264 -#define KEY_KBDINPUTASSIST_CANCEL 0x265 +#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 +#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 +#define KEY_KBDINPUTASSIST_ACCEPT 0x264 +#define KEY_KBDINPUTASSIST_CANCEL 0x265 -/* Diagonal movement keys */ #define KEY_RIGHT_UP 0x266 #define KEY_RIGHT_DOWN 0x267 #define KEY_LEFT_UP 0x268 #define KEY_LEFT_DOWN 0x269 -#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */ -/* Show Top Menu of the Media (e.g. DVD) */ +#define KEY_ROOT_MENU 0x26a #define KEY_MEDIA_TOP_MENU 0x26b #define KEY_NUMERIC_11 0x26c #define KEY_NUMERIC_12 0x26d -/* - * Toggle Audio Description: refers to an audio service that helps blind and - * visually impaired consumers understand the action in a program. Note: in - * some countries this is referred to as "Video Description". - */ #define KEY_AUDIO_DESC 0x26e #define KEY_3D_MODE 0x26f #define KEY_NEXT_FAVORITE 0x270 #define KEY_STOP_RECORD 0x271 #define KEY_PAUSE_RECORD 0x272 -#define KEY_VOD 0x273 /* Video on Demand */ +#define KEY_VOD 0x273 #define KEY_UNMUTE 0x274 #define KEY_FASTREVERSE 0x275 #define KEY_SLOWREVERSE 0x276 -/* - * Control a data application associated with the currently viewed channel, - * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) - */ #define KEY_DATA 0x277 #define KEY_ONSCREEN_KEYBOARD 0x278 -/* Electronic privacy screen control */ #define KEY_PRIVACY_SCREEN_TOGGLE 0x279 -/* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a -/* Move the focus to the next or previous user controllable element within a UI container */ #define KEY_NEXT_ELEMENT 0x27b #define KEY_PREVIOUS_ELEMENT 0x27c -/* Toggle Autopilot engagement */ #define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d -/* Shortcut Keys */ #define KEY_MARK_WAYPOINT 0x27e #define KEY_SOS 0x27f #define KEY_NAV_CHART 0x280 @@ -720,21 +665,6 @@ #define KEY_NAV_INFO 0x288 #define KEY_BRIGHTNESS_MENU 0x289 -/* - * Some keyboards have keys which do not have a defined meaning, these keys - * are intended to be programmed / bound to macros by the user. For most - * keyboards with these macro-keys the key-sequence to inject, or action to - * take, is all handled by software on the host side. So from the kernel's - * point of view these are just normal keys. - * - * The KEY_MACRO# codes below are intended for such keys, which may be labeled - * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys - * where the marking on the key does indicate a defined meaning / purpose. - * - * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing - * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO - * define MUST be added. - */ #define KEY_MACRO1 0x290 #define KEY_MACRO2 0x291 #define KEY_MACRO3 0x292 @@ -766,16 +696,6 @@ #define KEY_MACRO29 0x2ac #define KEY_MACRO30 0x2ad -/* - * Some keyboards with the macro-keys described above have some extra keys - * for controlling the host-side software responsible for the macro handling: - * -A macro recording start/stop key. Note that not all keyboards which emit - * KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if - * KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START - * should be interpreted as a recording start/stop toggle; - * -Keys for switching between different macro (pre)sets, either a key for - * cycling through the configured presets or keys to directly select a preset. - */ #define KEY_MACRO_RECORD_START 0x2b0 #define KEY_MACRO_RECORD_STOP 0x2b1 #define KEY_MACRO_PRESET_CYCLE 0x2b2 @@ -783,19 +703,12 @@ #define KEY_MACRO_PRESET2 0x2b4 #define KEY_MACRO_PRESET3 0x2b5 -/* - * Some keyboards have a buildin LCD panel where the contents are controlled - * by the host. Often these have a number of keys directly below the LCD - * intended for controlling a menu shown on the LCD. These keys often don't - * have any labeling so we just name them KEY_KBD_LCD_MENU# - */ #define KEY_KBD_LCD_MENU1 0x2b8 #define KEY_KBD_LCD_MENU2 0x2b9 #define KEY_KBD_LCD_MENU3 0x2ba #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc -/* Performance Boost key (Alienware)/G-Mode key (Dell) */ #define KEY_PERFORMANCE 0x2bd #define BTN_TRIGGER_HAPPY 0x2c0 @@ -840,15 +753,10 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 -/* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff #define KEY_CNT (KEY_MAX+1) -/* - * Relative axes - */ - #define REL_X 0x00 #define REL_Y 0x01 #define REL_Z 0x02 @@ -859,23 +767,12 @@ #define REL_DIAL 0x07 #define REL_WHEEL 0x08 #define REL_MISC 0x09 -/* - * 0x0a is reserved and should not be used in input drivers. - * It was used by HID as REL_MISC+1 and userspace needs to detect if - * the next REL_* event is correct or is just REL_MISC + n. - * We define here REL_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define REL_RESERVED 0x0a #define REL_WHEEL_HI_RES 0x0b #define REL_HWHEEL_HI_RES 0x0c #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) -/* - * Absolute axes - */ - #define ABS_X 0x00 #define ABS_Y 0x01 #define ABS_Z 0x02 @@ -906,65 +803,49 @@ #define ABS_MISC 0x28 -/* - * 0x2e is reserved and should not be used in input drivers. - * It was used by HID as ABS_MISC+6 and userspace needs to detect if - * the next ABS_* event is correct or is just ABS_MISC + n. - * We define here ABS_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define ABS_RESERVED 0x2e -#define ABS_MT_SLOT 0x2f /* MT slot being modified */ -#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ -#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ -#define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */ -#define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */ -#define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */ -#define ABS_MT_POSITION_X 0x35 /* Center X touch position */ -#define ABS_MT_POSITION_Y 0x36 /* Center Y touch position */ -#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ -#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ -#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ -#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ -#define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ -#define ABS_MT_TOOL_X 0x3c /* Center X tool position */ -#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */ +#define ABS_MT_SLOT 0x2f +#define ABS_MT_TOUCH_MAJOR 0x30 +#define ABS_MT_TOUCH_MINOR 0x31 +#define ABS_MT_WIDTH_MAJOR 0x32 +#define ABS_MT_WIDTH_MINOR 0x33 +#define ABS_MT_ORIENTATION 0x34 +#define ABS_MT_POSITION_X 0x35 +#define ABS_MT_POSITION_Y 0x36 +#define ABS_MT_TOOL_TYPE 0x37 +#define ABS_MT_BLOB_ID 0x38 +#define ABS_MT_TRACKING_ID 0x39 +#define ABS_MT_PRESSURE 0x3a +#define ABS_MT_DISTANCE 0x3b +#define ABS_MT_TOOL_X 0x3c +#define ABS_MT_TOOL_Y 0x3d #define ABS_MAX 0x3f #define ABS_CNT (ABS_MAX+1) -/* - * Switch events - */ - -#define SW_LID 0x00 /* set = lid shut */ -#define SW_TABLET_MODE 0x01 /* set = tablet mode */ -#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ -#define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any" - set = radio enabled */ -#define SW_RADIO SW_RFKILL_ALL /* deprecated */ -#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ -#define SW_DOCK 0x05 /* set = plugged into dock */ -#define SW_LINEOUT_INSERT 0x06 /* set = inserted */ -#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ -#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ -#define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ -#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ -#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ -#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ -#define SW_LINEIN_INSERT 0x0d /* set = inserted */ -#define SW_MUTE_DEVICE 0x0e /* set = device disabled */ -#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_LID 0x00 +#define SW_TABLET_MODE 0x01 +#define SW_HEADPHONE_INSERT 0x02 +#define SW_RFKILL_ALL 0x03 +#define SW_RADIO SW_RFKILL_ALL +#define SW_MICROPHONE_INSERT 0x04 +#define SW_DOCK 0x05 +#define SW_LINEOUT_INSERT 0x06 +#define SW_JACK_PHYSICAL_INSERT 0x07 +#define SW_VIDEOOUT_INSERT 0x08 +#define SW_CAMERA_LENS_COVER 0x09 +#define SW_KEYPAD_SLIDE 0x0a +#define SW_FRONT_PROXIMITY 0x0b +#define SW_ROTATE_LOCK 0x0c +#define SW_LINEIN_INSERT 0x0d +#define SW_MUTE_DEVICE 0x0e +#define SW_PEN_INSERTED 0x0f +#define SW_MACHINE_COVER 0x10 +#define SW_USB_INSERT 0x11 #define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) -/* - * Misc events - */ - #define MSC_SERIAL 0x00 #define MSC_PULSELED 0x01 #define MSC_GESTURE 0x02 @@ -974,10 +855,6 @@ #define MSC_MAX 0x07 #define MSC_CNT (MSC_MAX+1) -/* - * LEDs - */ - #define LED_NUML 0x00 #define LED_CAPSL 0x01 #define LED_SCROLLL 0x02 @@ -992,19 +869,11 @@ #define LED_MAX 0x0f #define LED_CNT (LED_MAX+1) -/* - * Autorepeat values - */ - #define REP_DELAY 0x00 #define REP_PERIOD 0x01 #define REP_MAX 0x01 #define REP_CNT (REP_MAX+1) -/* - * Sounds - */ - #define SND_CLICK 0x00 #define SND_BELL 0x01 #define SND_TONE 0x02 From nobody Tue Feb 17 20:41: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 4fFs4m60XFz6S3R3 for ; Tue, 17 Feb 2026 20:41: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 4fFs4m54gDz3sW9 for ; Tue, 17 Feb 2026 20:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SPMaX+GLwOVV3Hu0Lh2zLWaLdyX1QwJqX6GBsitWo84=; b=TYli8Ddgbg1PfVuH/wt/mSIjTUoCVx8W2afa51LmIB0MKLKREqInjq3dxt/xsbzwjkOjd6 okioVDBXk5J0G1LauOF/jvt5Lw1vhtesNY41HfiRsvTHrBmnJOfExrjRQYi+c4fzEm797A 82G7izCOkMSKeVVp5m8k5n+J/FHM18tw0rHgDVobUqAEbjO93VwS3wgr66yTixAYuPjuf/ wuGQlRlsg05/2WeI7YtDgX0smJJ6C9VDdvmnNSGcQ9Uci5xCuTjjpy7SKwdFGKm3VAKiLv 8zyWzpx+2Fw7QGi7dCTGVfbMUCYk09HY9s6zXCp5sv7ymsW8LKuC8JiQ4ABb1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771360904; a=rsa-sha256; cv=none; b=WhT8jWE9ZY4D8ZkIwOmEWVI6VHUDx1c/nMeEJRYr6XKOxirmRDGqzfHey8DxnNcCyRX8Vt wX1CN89bPAPlA8RfgwRe8VBVX2yTm4hoOf5DPtQkK6HXJnly3KWu4s/0j9pyudfG0HpLN6 IIISduVsCiXvgGLPHbg2efZBfjTq7QazLheghvMqcMr9ve6HrUughLFnMP0CGdRriB1QwN UrkyNq5UGXXP3icyxpNxuPDXT8M+RoXv58GxrWhwO6Z/NkH79tIhlqAJ6U42rGo5MIokpf aLt5IoLd3bobwrv2biYUHMH59dVEoyTNrjFeO2o4T3teGOUm4irXD9wyWAMqjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771360904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SPMaX+GLwOVV3Hu0Lh2zLWaLdyX1QwJqX6GBsitWo84=; b=UJ7r5qaY1QFxDcDmfeBLA9aRzphidqT2kubqZDLsQEK1Se5e+TY6oMeu1nPZ+DMx2hjZlC j+InFKCSxuMHz5de2P8NHKv93xZzCsqOAAmiWYDXjy3DPY8ajOmhroZPi3Wr/W3322+7VQ D82E/jZSFvvHm5wXIuWjMXmDM6ngnl9eiFEd0hV0q4vXmNUmsc44lm897jdjEV88Q0NpjN CScRek/y4kSiF42H66WlEXe62o7eZZ0Eij6e7ygy210sDI0+nejDMcqZJT1AecsOgHirX6 /J+cy3z4fkJgnadIOVLAPtoCMo0OKgrHG3qqkZ0H7j4cXePLGq2BZvwfq3QZVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFs4m4FrTz99h for ; Tue, 17 Feb 2026 20:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f1a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:41:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 4291d770fd8a - stable/14 - evdev: Sync event codes with Linux kernel 6.18 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4291d770fd8a9190f06910a91fb6bd6e77ded9ef Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:41:44 +0000 Message-Id: <6994d288.1f1a8.4068ca47@gitrepo.freebsd.org> The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=4291d770fd8a9190f06910a91fb6bd6e77ded9ef commit 4291d770fd8a9190f06910a91fb6bd6e77ded9ef Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 20:40:09 +0000 evdev: Sync event codes with Linux kernel 6.18 MFC after: 1 month (cherry picked from commit 8d9a5d44b155af7123893a6948ad7e86b48c57b3) --- sys/dev/evdev/input-event-codes.h | 28 ++++++++++++++- sys/dev/evdev/input.h | 73 +++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 30 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 59eb8e104c87..81c88ec86b9b 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -39,6 +39,7 @@ #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ +#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) @@ -531,6 +532,7 @@ #define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ #define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ #define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ +#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -612,8 +614,14 @@ #define BTN_DPAD_LEFT 0x222 #define BTN_DPAD_RIGHT 0x223 +#define BTN_GRIPL 0x224 +#define BTN_GRIPR 0x225 +#define BTN_GRIPL2 0x226 +#define BTN_GRIPR2 0x227 + #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ #define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ +#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ #define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ #define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ @@ -629,10 +637,24 @@ #define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ +#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ +#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +/* + * Keycodes for hotkeys toggling the electronic privacy screen found on some + * laptops on/off. Note when the embedded-controller turns on/off the eprivacy + * screen itself then the state should be reported through drm connecter props: + * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties + * Except when implementing the drm connecter properties API is not possible + * because e.g. the firmware does not allow querying the presence and/or status + * of the eprivacy screen at boot. + */ +#define KEY_EPRIVACY_SCREEN_ON 0x252 +#define KEY_EPRIVACY_SCREEN_OFF 0x253 + #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 #define KEY_KBDINPUTASSIST_PREVGROUP 0x262 @@ -773,6 +795,9 @@ #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc +/* Performance Boost key (Alienware)/G-Mode key (Dell) */ +#define KEY_PERFORMANCE 0x2bd + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 @@ -932,7 +957,8 @@ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ #define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_MAX 0x10 +#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) /* diff --git a/sys/dev/evdev/input.h b/sys/dev/evdev/input.h index 3b87101da75f..ce0fb616a3df 100644 --- a/sys/dev/evdev/input.h +++ b/sys/dev/evdev/input.h @@ -142,6 +142,8 @@ struct input_keymap_entry { #define BUS_RMI 0x1D #define BUS_CEC 0x1E #define BUS_INTEL_ISHTP 0x1F +#define BUS_AMD_SFH 0x20 +#define BUS_SDW 0x21 /* * MT_TOOL types @@ -203,20 +205,6 @@ struct ff_condition_effect { int16_t center; /* center of dead zone */ }; -/* - * Force feedback periodic effect types - */ - -#define FF_SQUARE 0x58 -#define FF_TRIANGLE 0x59 -#define FF_SINE 0x5a -#define FF_SAW_UP 0x5b -#define FF_SAW_DOWN 0x5c -#define FF_CUSTOM 0x5d - -#define FF_WAVEFORM_MIN FF_SQUARE -#define FF_WAVEFORM_MAX FF_CUSTOM - struct ff_periodic_effect { uint16_t waveform; uint16_t period; /* ms */ @@ -233,21 +221,14 @@ struct ff_rumble_effect { uint16_t weak_magnitude; /* magnitude of the light motor */ }; -/* - * Force feedback effect types - */ - -#define FF_RUMBLE 0x50 -#define FF_PERIODIC 0x51 -#define FF_CONSTANT 0x52 -#define FF_SPRING 0x53 -#define FF_FRICTION 0x54 -#define FF_DAMPER 0x55 -#define FF_INERTIA 0x56 -#define FF_RAMP 0x57 - -#define FF_EFFECT_MIN FF_RUMBLE -#define FF_EFFECT_MAX FF_RAMP +struct ff_haptic_effect { + uint16_t hid_usage; + uint16_t vendor_id; + uint8_t vendor_waveform_page; + uint16_t intensity; + uint16_t repeat_count; + uint16_t retrigger_period; +}; struct ff_effect { uint16_t type; @@ -262,9 +243,41 @@ struct ff_effect { struct ff_periodic_effect periodic; struct ff_condition_effect condition[2]; /* One for each axis */ struct ff_rumble_effect rumble; + struct ff_haptic_effect haptic; } u; }; +/* + * Force feedback effect types + */ + +#define FF_HAPTIC 0x4f +#define FF_RUMBLE 0x50 +#define FF_PERIODIC 0x51 +#define FF_CONSTANT 0x52 +#define FF_SPRING 0x53 +#define FF_FRICTION 0x54 +#define FF_DAMPER 0x55 +#define FF_INERTIA 0x56 +#define FF_RAMP 0x57 + +#define FF_EFFECT_MIN FF_HAPTIC +#define FF_EFFECT_MAX FF_RAMP + +/* + * Force feedback periodic effect types + */ + +#define FF_SQUARE 0x58 +#define FF_TRIANGLE 0x59 +#define FF_SINE 0x5a +#define FF_SAW_UP 0x5b +#define FF_SAW_DOWN 0x5c +#define FF_CUSTOM 0x5d + +#define FF_WAVEFORM_MIN FF_SQUARE +#define FF_WAVEFORM_MAX FF_CUSTOM + /* * force feedback device properties */ @@ -272,6 +285,8 @@ struct ff_effect { #define FF_GAIN 0x60 #define FF_AUTOCENTER 0x61 +#define FF_MAX_EFFECTS FF_GAIN + #define FF_MAX 0x7f #define FF_CNT (FF_MAX+1) From nobody Tue Feb 17 22:20: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 4fFvGV2wXJz6S9j8 for ; Tue, 17 Feb 2026 22:20: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 4fFvGT5kfVz49R5 for ; Tue, 17 Feb 2026 22:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771366817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zdmtV5LdxKP2aOYh+o3Lu5DuW/FAue55NzkvBJS1oI=; b=G20bnN0gyMFcPPDukvQDGA3zC+UcGnuUVh2kh6y51TUWmEai/nmTIVwdq5sPd1au4U7hGd GMvK+7W6B78GiLrb8JPhxUehjCwXAIoBYrDW5W8oK6njAGLYGqqYxzAZYJG2bl3zJuvfBH hsVL04dDQK8Pm1w2BBInWQB3lDlWRXRceFsDIo3WmRvpDM+1b4Qewz95W7JH7p6Usr2gTy Klf74ENrgGh8qSLEofBReFHuIE2TDsB5AznM0cbb45Be46TF8OjNFZKFgcuQbkGYZv52le QJUzlupSnmyyfN27qGz/d17LrZwuNZSox9s1Z6YcTF4FTNokIMguEde4yH5yvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771366817; a=rsa-sha256; cv=none; b=uJgA/TDFVs9TILlW7MsTfQq44ifkzG5/U8mW4cxZ39CxdeCvwJnX0ux1FzJjKG40mzz9SV k0w3jOAS4EVxbuOnjffbl1uHO3s9bGcJ13EesQIPtHA6sEu3YZZMI7+nIQohY3fmHJVPXB gH63mNYBeD7ssi3xiMiGf43MAYil2qhjnptmbBbCh4SLEDYEIIEjWOK8qQyIiylA85Vtmj ZYPvQAgBqAvMWWqpydbA1wuGVNF76qONCK3qzvx7CORgf4QYBd9YXxGqeqjPAFbE+WlfBW Jo7oZviBBTR6OMKnpfs7u7PlTdpUd3BD6t0vg4TFalOCDYHfQJZrQC7uWQUoEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771366817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zdmtV5LdxKP2aOYh+o3Lu5DuW/FAue55NzkvBJS1oI=; b=TzdK062fGSVlhLd+MGdm/ijqD7FCPZmHSPH9fZaFAvL09oBRGnsIrrKUXVovpBycFE9Kh8 dIpCABWqh39EFLXQdz3ga79IDapi2HudVYYJHeRXcdlIoU5Hbzebs/D8wuWHTvFWMHb83Z DoJc0Pcgj2rYefL1xTx7+tr5HKAtUbOYnQ0HVtK/4Vmg6RyyWYQ5gy02s2CAMSi08cMzy+ EWrBm7gX9lb8hwWlkjE7PYsEO92QGb5yp2EOCye12xh+KJn3wIsuZg0fqEv2Mn0L/BnfBb eHr8fPb3hZmFmkOa7+lHNFo8MYl/EwaCtozuuU52FLxt0ghyRx9vO9N9IxbCBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFvGT4nRszCxb for ; Tue, 17 Feb 2026 22:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31913 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 22:20:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 262ea9d9a9aa - stable/13 - evdev: Sync event codes with Linux kernel 6.18 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 262ea9d9a9aa09cf8e38478c33f6301d7db448fa Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 22:20:17 +0000 Message-Id: <6994e9a1.31913.63f32a6c@gitrepo.freebsd.org> The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=262ea9d9a9aa09cf8e38478c33f6301d7db448fa commit 262ea9d9a9aa09cf8e38478c33f6301d7db448fa Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 22:19:50 +0000 evdev: Sync event codes with Linux kernel 6.18 MFC after: 1 month (cherry picked from commit 8d9a5d44b155af7123893a6948ad7e86b48c57b3) --- sys/dev/evdev/input-event-codes.h | 28 ++++++++++++++- sys/dev/evdev/input.h | 73 +++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 30 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 59eb8e104c87..81c88ec86b9b 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -39,6 +39,7 @@ #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ +#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) @@ -531,6 +532,7 @@ #define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ #define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ #define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ +#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -612,8 +614,14 @@ #define BTN_DPAD_LEFT 0x222 #define BTN_DPAD_RIGHT 0x223 +#define BTN_GRIPL 0x224 +#define BTN_GRIPR 0x225 +#define BTN_GRIPL2 0x226 +#define BTN_GRIPR2 0x227 + #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ #define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ +#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ #define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ #define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ @@ -629,10 +637,24 @@ #define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ +#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ +#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +/* + * Keycodes for hotkeys toggling the electronic privacy screen found on some + * laptops on/off. Note when the embedded-controller turns on/off the eprivacy + * screen itself then the state should be reported through drm connecter props: + * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties + * Except when implementing the drm connecter properties API is not possible + * because e.g. the firmware does not allow querying the presence and/or status + * of the eprivacy screen at boot. + */ +#define KEY_EPRIVACY_SCREEN_ON 0x252 +#define KEY_EPRIVACY_SCREEN_OFF 0x253 + #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 #define KEY_KBDINPUTASSIST_PREVGROUP 0x262 @@ -773,6 +795,9 @@ #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc +/* Performance Boost key (Alienware)/G-Mode key (Dell) */ +#define KEY_PERFORMANCE 0x2bd + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 @@ -932,7 +957,8 @@ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ #define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_MAX 0x10 +#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) /* diff --git a/sys/dev/evdev/input.h b/sys/dev/evdev/input.h index 3b87101da75f..ce0fb616a3df 100644 --- a/sys/dev/evdev/input.h +++ b/sys/dev/evdev/input.h @@ -142,6 +142,8 @@ struct input_keymap_entry { #define BUS_RMI 0x1D #define BUS_CEC 0x1E #define BUS_INTEL_ISHTP 0x1F +#define BUS_AMD_SFH 0x20 +#define BUS_SDW 0x21 /* * MT_TOOL types @@ -203,20 +205,6 @@ struct ff_condition_effect { int16_t center; /* center of dead zone */ }; -/* - * Force feedback periodic effect types - */ - -#define FF_SQUARE 0x58 -#define FF_TRIANGLE 0x59 -#define FF_SINE 0x5a -#define FF_SAW_UP 0x5b -#define FF_SAW_DOWN 0x5c -#define FF_CUSTOM 0x5d - -#define FF_WAVEFORM_MIN FF_SQUARE -#define FF_WAVEFORM_MAX FF_CUSTOM - struct ff_periodic_effect { uint16_t waveform; uint16_t period; /* ms */ @@ -233,21 +221,14 @@ struct ff_rumble_effect { uint16_t weak_magnitude; /* magnitude of the light motor */ }; -/* - * Force feedback effect types - */ - -#define FF_RUMBLE 0x50 -#define FF_PERIODIC 0x51 -#define FF_CONSTANT 0x52 -#define FF_SPRING 0x53 -#define FF_FRICTION 0x54 -#define FF_DAMPER 0x55 -#define FF_INERTIA 0x56 -#define FF_RAMP 0x57 - -#define FF_EFFECT_MIN FF_RUMBLE -#define FF_EFFECT_MAX FF_RAMP +struct ff_haptic_effect { + uint16_t hid_usage; + uint16_t vendor_id; + uint8_t vendor_waveform_page; + uint16_t intensity; + uint16_t repeat_count; + uint16_t retrigger_period; +}; struct ff_effect { uint16_t type; @@ -262,9 +243,41 @@ struct ff_effect { struct ff_periodic_effect periodic; struct ff_condition_effect condition[2]; /* One for each axis */ struct ff_rumble_effect rumble; + struct ff_haptic_effect haptic; } u; }; +/* + * Force feedback effect types + */ + +#define FF_HAPTIC 0x4f +#define FF_RUMBLE 0x50 +#define FF_PERIODIC 0x51 +#define FF_CONSTANT 0x52 +#define FF_SPRING 0x53 +#define FF_FRICTION 0x54 +#define FF_DAMPER 0x55 +#define FF_INERTIA 0x56 +#define FF_RAMP 0x57 + +#define FF_EFFECT_MIN FF_HAPTIC +#define FF_EFFECT_MAX FF_RAMP + +/* + * Force feedback periodic effect types + */ + +#define FF_SQUARE 0x58 +#define FF_TRIANGLE 0x59 +#define FF_SINE 0x5a +#define FF_SAW_UP 0x5b +#define FF_SAW_DOWN 0x5c +#define FF_CUSTOM 0x5d + +#define FF_WAVEFORM_MIN FF_SQUARE +#define FF_WAVEFORM_MAX FF_CUSTOM + /* * force feedback device properties */ @@ -272,6 +285,8 @@ struct ff_effect { #define FF_GAIN 0x60 #define FF_AUTOCENTER 0x61 +#define FF_MAX_EFFECTS FF_GAIN + #define FF_MAX 0x7f #define FF_CNT (FF_MAX+1) From nobody Tue Feb 17 22:20: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 4fFvGW1NTVz6S9wd for ; Tue, 17 Feb 2026 22:20: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 4fFvGV5zqHz49Lw for ; Tue, 17 Feb 2026 22:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771366818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lrdwNMV2axD1EBJN5Uo9Kz66lH/vt16v2BN4HN+/6xQ=; b=v5Y4dDphiODfvIVlnolb3gcKadYmLdbthOJdOOFHddq0KentrGD5baWmBPx6/ZIjJxYP2c eGEwoaxG6FFwOztLCAK4WCKVTO65RCpSzR6pXNGuGD5SPEF/mzsKBUfxX8wiv+SXRaOCP2 gBErIi6+AVQR0prAH1Q0K1X/k/Ax24BBvQaipVh7dXEQ+RVVq/ghRJlnDBrqDsExYkkigZ KzKLm3Vmsx5SxtDLXQqpDDYZ+/kHGGkNKAglYp6jbcoyLBlqR5QX+Q56bDGH2r5SXdtNss 4hbm9OLraKds9+DNk2xsB2nfHPBto2jWzlAaYMySLwhYu0yxeDPsur6s2TWaig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771366818; a=rsa-sha256; cv=none; b=JAZAU0og4s4846MNIXRmGVZjMO94HPQK0ZmXrVmPJQ3L8tf87uMkxjmf5FgrUVg+5mARcY YG+QNM3D98yqAupWUvPCE4slTSZmovPG5xc4iz0mMkGGmguFshsRPqRGafUCGguQgVfUCT Xkv7C23KSTsGaWwFgUIrSXMKYwFWgAQPrppCRxvM82IfbnLqF3WT3BFXgRx1b/mvAN7PhC acfmuJYs06R4S74sQAFSQEbUx75CwUdzy2yzBgNbgFX+SF5Xe9UyVvXDuD7yxw6KIbnaj+ 6rlS6zqa3g7/YA6oJQbbQl5cZHpyoMX7OvLDI3q6vliX74YIYRF0SmH8iaPcog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771366818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lrdwNMV2axD1EBJN5Uo9Kz66lH/vt16v2BN4HN+/6xQ=; b=THcpebuOjJ55uSLf6Lyqp6Xoz+B5/wjblibnFgwud22cGI1gCaoQms37+nZJzP2TZOCw2y SSZfPyyprqwHQG+2ZDcJ3rUlsLHxPOWDXpyKV7mQDGpl6aWLqnw/uFffuFl7G/aL0UWSdx EVkO/SAw0CV+34mFJ7O30orpSdEiR5IeAXI0fwl0JoDixsEpUsc44DwczANvVh1GBiML8m N3hSpy1XSmHq/ehATddFfsJjWIXMEA/mIy0j1zYJz2XG10hTUPpjowkYa2895emW82r6sb 2oaStn51jPyLNzdFMjVkX1xsBKhgvhFkR4wts059XQgIvp0TfVtWjV1y0UB3rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFvGV5HkNzCxf for ; Tue, 17 Feb 2026 22:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 22:20:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: b66993bd51d3 - stable/13 - evdev: Drop comments from input-event-codes.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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b66993bd51d32d673c2da708a0430a528a82b100 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 22:20:18 +0000 Message-Id: <6994e9a2.30f46.69f3d26e@gitrepo.freebsd.org> The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b66993bd51d32d673c2da708a0430a528a82b100 commit b66993bd51d32d673c2da708a0430a528a82b100 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-17 22:19:56 +0000 evdev: Drop comments from input-event-codes.h They were copied intact from the Linux GPL-only file. Requested by: imp, glebius MFC after: 1 week (cherry picked from commit 89aa8a94053fdd22ed716fdf424a2d10e70b3188) --- sys/dev/evdev/input-event-codes.h | 485 ++++++++++++++------------------------ 1 file changed, 177 insertions(+), 308 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 81c88ec86b9b..4f1d0f96e400 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -28,26 +28,18 @@ #ifndef _EVDEV_INPUT_EVENT_CODES_H #define _EVDEV_INPUT_EVENT_CODES_H -/* - * Device properties and quirks - */ - -#define INPUT_PROP_POINTER 0x00 /* needs a pointer */ -#define INPUT_PROP_DIRECT 0x01 /* direct input devices */ -#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ -#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ -#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ -#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ -#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ -#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ +#define INPUT_PROP_POINTER 0x00 +#define INPUT_PROP_DIRECT 0x01 +#define INPUT_PROP_BUTTONPAD 0x02 +#define INPUT_PROP_SEMI_MT 0x03 +#define INPUT_PROP_TOPBUTTONPAD 0x04 +#define INPUT_PROP_POINTING_STICK 0x05 +#define INPUT_PROP_ACCELEROMETER 0x06 +#define INPUT_PROP_PRESSUREPAD 0x07 #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) -/* - * Event types - */ - #define EV_SYN 0x00 #define EV_KEY 0x01 #define EV_REL 0x02 @@ -63,10 +55,6 @@ #define EV_MAX 0x1f #define EV_CNT (EV_MAX+1) -/* - * Synchronization events. - */ - #define SYN_REPORT 0 #define SYN_CONFIG 1 #define SYN_MT_REPORT 2 @@ -74,17 +62,6 @@ #define SYN_MAX 0xf #define SYN_CNT (SYN_MAX+1) -/* - * Keys and buttons - * - * Most of the keys/buttons are modeled after USB HUT 1.12 - * (see http://www.usb.org/developers/hidpage). - * Abbreviations in the comments: - * AC - Application Control - * AL - Application Launch Button - * SC - System Control - */ - #define KEY_RESERVED 0 #define KEY_ESC 1 #define KEY_1 2 @@ -201,11 +178,11 @@ #define KEY_MUTE 113 #define KEY_VOLUMEDOWN 114 #define KEY_VOLUMEUP 115 -#define KEY_POWER 116 /* SC System Power Down */ +#define KEY_POWER 116 #define KEY_KPEQUAL 117 #define KEY_KPPLUSMINUS 118 #define KEY_PAUSE 119 -#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ +#define KEY_SCALE 120 #define KEY_KPCOMMA 121 #define KEY_HANGEUL 122 @@ -216,40 +193,40 @@ #define KEY_RIGHTMETA 126 #define KEY_COMPOSE 127 -#define KEY_STOP 128 /* AC Stop */ +#define KEY_STOP 128 #define KEY_AGAIN 129 -#define KEY_PROPS 130 /* AC Properties */ -#define KEY_UNDO 131 /* AC Undo */ +#define KEY_PROPS 130 +#define KEY_UNDO 131 #define KEY_FRONT 132 -#define KEY_COPY 133 /* AC Copy */ -#define KEY_OPEN 134 /* AC Open */ -#define KEY_PASTE 135 /* AC Paste */ -#define KEY_FIND 136 /* AC Search */ -#define KEY_CUT 137 /* AC Cut */ -#define KEY_HELP 138 /* AL Integrated Help Center */ -#define KEY_MENU 139 /* Menu (show menu) */ -#define KEY_CALC 140 /* AL Calculator */ +#define KEY_COPY 133 +#define KEY_OPEN 134 +#define KEY_PASTE 135 +#define KEY_FIND 136 +#define KEY_CUT 137 +#define KEY_HELP 138 +#define KEY_MENU 139 +#define KEY_CALC 140 #define KEY_SETUP 141 -#define KEY_SLEEP 142 /* SC System Sleep */ -#define KEY_WAKEUP 143 /* System Wake Up */ -#define KEY_FILE 144 /* AL Local Machine Browser */ +#define KEY_SLEEP 142 +#define KEY_WAKEUP 143 +#define KEY_FILE 144 #define KEY_SENDFILE 145 #define KEY_DELETEFILE 146 #define KEY_XFER 147 #define KEY_PROG1 148 #define KEY_PROG2 149 -#define KEY_WWW 150 /* AL Internet Browser */ +#define KEY_WWW 150 #define KEY_MSDOS 151 -#define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ +#define KEY_COFFEE 152 #define KEY_SCREENLOCK KEY_COFFEE -#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ +#define KEY_ROTATE_DISPLAY 153 #define KEY_DIRECTION KEY_ROTATE_DISPLAY #define KEY_CYCLEWINDOWS 154 #define KEY_MAIL 155 -#define KEY_BOOKMARKS 156 /* AC Bookmarks */ +#define KEY_BOOKMARKS 156 #define KEY_COMPUTER 157 -#define KEY_BACK 158 /* AC Back */ -#define KEY_FORWARD 159 /* AC Forward */ +#define KEY_BACK 158 +#define KEY_FORWARD 159 #define KEY_CLOSECD 160 #define KEY_EJECTCD 161 #define KEY_EJECTCLOSECD 162 @@ -259,20 +236,20 @@ #define KEY_STOPCD 166 #define KEY_RECORD 167 #define KEY_REWIND 168 -#define KEY_PHONE 169 /* Media Select Telephone */ +#define KEY_PHONE 169 #define KEY_ISO 170 -#define KEY_CONFIG 171 /* AL Consumer Control Configuration */ -#define KEY_HOMEPAGE 172 /* AC Home */ -#define KEY_REFRESH 173 /* AC Refresh */ -#define KEY_EXIT 174 /* AC Exit */ +#define KEY_CONFIG 171 +#define KEY_HOMEPAGE 172 +#define KEY_REFRESH 173 +#define KEY_EXIT 174 #define KEY_MOVE 175 #define KEY_EDIT 176 #define KEY_SCROLLUP 177 #define KEY_SCROLLDOWN 178 #define KEY_KPLEFTPAREN 179 #define KEY_KPRIGHTPAREN 180 -#define KEY_NEW 181 /* AC New */ -#define KEY_REDO 182 /* AC Redo/Repeat */ +#define KEY_NEW 181 +#define KEY_REDO 182 #define KEY_F13 183 #define KEY_F14 184 @@ -291,14 +268,14 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_ALL_APPLICATIONS 204 #define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 -#define KEY_CLOSE 206 /* AC Close */ +#define KEY_CLOSE 206 #define KEY_PLAY 207 #define KEY_FASTFORWARD 208 #define KEY_BASSBOOST 209 -#define KEY_PRINT 210 /* AC Print */ +#define KEY_PRINT 210 #define KEY_HP 211 #define KEY_CAMERA 212 #define KEY_SOUND 213 @@ -307,25 +284,24 @@ #define KEY_CHAT 216 #define KEY_SEARCH 217 #define KEY_CONNECT 218 -#define KEY_FINANCE 219 /* AL Checkbook/Finance */ +#define KEY_FINANCE 219 #define KEY_SPORT 220 #define KEY_SHOP 221 #define KEY_ALTERASE 222 -#define KEY_CANCEL 223 /* AC Cancel */ +#define KEY_CANCEL 223 #define KEY_BRIGHTNESSDOWN 224 #define KEY_BRIGHTNESSUP 225 #define KEY_MEDIA 226 -#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video - outputs (Monitor/LCD/TV-out/etc) */ +#define KEY_SWITCHVIDEOMODE 227 #define KEY_KBDILLUMTOGGLE 228 #define KEY_KBDILLUMDOWN 229 #define KEY_KBDILLUMUP 230 -#define KEY_SEND 231 /* AC Send */ -#define KEY_REPLY 232 /* AC Reply */ -#define KEY_FORWARDMAIL 233 /* AC Forward Msg */ -#define KEY_SAVE 234 /* AC Save */ +#define KEY_SEND 231 +#define KEY_REPLY 232 +#define KEY_FORWARDMAIL 233 +#define KEY_SAVE 234 #define KEY_DOCUMENTS 235 #define KEY_BATTERY 236 @@ -336,22 +312,18 @@ #define KEY_UNKNOWN 240 -#define KEY_VIDEO_NEXT 241 /* drive next video source */ -#define KEY_VIDEO_PREV 242 /* drive previous video source */ -#define KEY_BRIGHTNESS_CYCLE 243 /* brightness up, after max is min */ -#define KEY_BRIGHTNESS_AUTO 244 /* Set Auto Brightness: manual - brightness control is off, - rely on ambient */ +#define KEY_VIDEO_NEXT 241 +#define KEY_VIDEO_PREV 242 +#define KEY_BRIGHTNESS_CYCLE 243 +#define KEY_BRIGHTNESS_AUTO 244 #define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO -#define KEY_DISPLAY_OFF 245 /* display device to off state */ +#define KEY_DISPLAY_OFF 245 -#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ +#define KEY_WWAN 246 #define KEY_WIMAX KEY_WWAN -#define KEY_RFKILL 247 /* Key that controls all radios */ - -#define KEY_MICMUTE 248 /* Mute / unmute the microphone */ +#define KEY_RFKILL 247 -/* Code 255 is reserved for special needs of AT keyboard driver */ +#define KEY_MICMUTE 248 #define BTN_MISC 0x100 #define BTN_0 0x100 @@ -420,14 +392,14 @@ #define BTN_TOOL_FINGER 0x145 #define BTN_TOOL_MOUSE 0x146 #define BTN_TOOL_LENS 0x147 -#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ +#define BTN_TOOL_QUINTTAP 0x148 #define BTN_STYLUS3 0x149 #define BTN_TOUCH 0x14a #define BTN_STYLUS 0x14b #define BTN_STYLUS2 0x14c #define BTN_TOOL_DOUBLETAP 0x14d #define BTN_TOOL_TRIPLETAP 0x14e -#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */ +#define BTN_TOOL_QUADTAP 0x14f #define BTN_WHEEL 0x150 #define BTN_GEAR_DOWN 0x150 @@ -439,56 +411,56 @@ #define KEY_CLEAR 0x163 #define KEY_POWER2 0x164 #define KEY_OPTION 0x165 -#define KEY_INFO 0x166 /* AL OEM Features/Tips/Tutorial */ +#define KEY_INFO 0x166 #define KEY_TIME 0x167 #define KEY_VENDOR 0x168 #define KEY_ARCHIVE 0x169 -#define KEY_PROGRAM 0x16a /* Media Select Program Guide */ +#define KEY_PROGRAM 0x16a #define KEY_CHANNEL 0x16b #define KEY_FAVORITES 0x16c #define KEY_EPG 0x16d -#define KEY_PVR 0x16e /* Media Select Home */ +#define KEY_PVR 0x16e #define KEY_MHP 0x16f #define KEY_LANGUAGE 0x170 #define KEY_TITLE 0x171 #define KEY_SUBTITLE 0x172 #define KEY_ANGLE 0x173 -#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */ +#define KEY_FULL_SCREEN 0x174 #define KEY_ZOOM KEY_FULL_SCREEN #define KEY_MODE 0x175 #define KEY_KEYBOARD 0x176 -#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */ +#define KEY_ASPECT_RATIO 0x177 #define KEY_SCREEN KEY_ASPECT_RATIO -#define KEY_PC 0x178 /* Media Select Computer */ -#define KEY_TV 0x179 /* Media Select TV */ -#define KEY_TV2 0x17a /* Media Select Cable */ -#define KEY_VCR 0x17b /* Media Select VCR */ -#define KEY_VCR2 0x17c /* VCR Plus */ -#define KEY_SAT 0x17d /* Media Select Satellite */ +#define KEY_PC 0x178 +#define KEY_TV 0x179 +#define KEY_TV2 0x17a +#define KEY_VCR 0x17b +#define KEY_VCR2 0x17c +#define KEY_SAT 0x17d #define KEY_SAT2 0x17e -#define KEY_CD 0x17f /* Media Select CD */ -#define KEY_TAPE 0x180 /* Media Select Tape */ +#define KEY_CD 0x17f +#define KEY_TAPE 0x180 #define KEY_RADIO 0x181 -#define KEY_TUNER 0x182 /* Media Select Tuner */ +#define KEY_TUNER 0x182 #define KEY_PLAYER 0x183 #define KEY_TEXT 0x184 -#define KEY_DVD 0x185 /* Media Select DVD */ +#define KEY_DVD 0x185 #define KEY_AUX 0x186 #define KEY_MP3 0x187 -#define KEY_AUDIO 0x188 /* AL Audio Browser */ -#define KEY_VIDEO 0x189 /* AL Movie Browser */ +#define KEY_AUDIO 0x188 +#define KEY_VIDEO 0x189 #define KEY_DIRECTORY 0x18a #define KEY_LIST 0x18b -#define KEY_MEMO 0x18c /* Media Select Messages */ +#define KEY_MEMO 0x18c #define KEY_CALENDAR 0x18d #define KEY_RED 0x18e #define KEY_GREEN 0x18f #define KEY_YELLOW 0x190 #define KEY_BLUE 0x191 -#define KEY_CHANNELUP 0x192 /* Channel Increment */ -#define KEY_CHANNELDOWN 0x193 /* Channel Decrement */ +#define KEY_CHANNELUP 0x192 +#define KEY_CHANNELDOWN 0x193 #define KEY_FIRST 0x194 -#define KEY_LAST 0x195 /* Recall Last */ +#define KEY_LAST 0x195 #define KEY_AB 0x196 #define KEY_NEXT 0x197 #define KEY_RESTART 0x198 @@ -499,40 +471,40 @@ #define KEY_DIGITS 0x19d #define KEY_TEEN 0x19e #define KEY_TWEN 0x19f -#define KEY_VIDEOPHONE 0x1a0 /* Media Select Video Phone */ -#define KEY_GAMES 0x1a1 /* Media Select Games */ -#define KEY_ZOOMIN 0x1a2 /* AC Zoom In */ -#define KEY_ZOOMOUT 0x1a3 /* AC Zoom Out */ -#define KEY_ZOOMRESET 0x1a4 /* AC Zoom */ -#define KEY_WORDPROCESSOR 0x1a5 /* AL Word Processor */ -#define KEY_EDITOR 0x1a6 /* AL Text Editor */ -#define KEY_SPREADSHEET 0x1a7 /* AL Spreadsheet */ -#define KEY_GRAPHICSEDITOR 0x1a8 /* AL Graphics Editor */ -#define KEY_PRESENTATION 0x1a9 /* AL Presentation App */ -#define KEY_DATABASE 0x1aa /* AL Database App */ -#define KEY_NEWS 0x1ab /* AL Newsreader */ -#define KEY_VOICEMAIL 0x1ac /* AL Voicemail */ -#define KEY_ADDRESSBOOK 0x1ad /* AL Contacts/Address Book */ -#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */ -#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ +#define KEY_VIDEOPHONE 0x1a0 +#define KEY_GAMES 0x1a1 +#define KEY_ZOOMIN 0x1a2 +#define KEY_ZOOMOUT 0x1a3 +#define KEY_ZOOMRESET 0x1a4 +#define KEY_WORDPROCESSOR 0x1a5 +#define KEY_EDITOR 0x1a6 +#define KEY_SPREADSHEET 0x1a7 +#define KEY_GRAPHICSEDITOR 0x1a8 +#define KEY_PRESENTATION 0x1a9 +#define KEY_DATABASE 0x1aa +#define KEY_NEWS 0x1ab +#define KEY_VOICEMAIL 0x1ac +#define KEY_ADDRESSBOOK 0x1ad +#define KEY_MESSENGER 0x1ae +#define KEY_DISPLAYTOGGLE 0x1af #define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE -#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ -#define KEY_LOGOFF 0x1b1 /* AL Logoff */ +#define KEY_SPELLCHECK 0x1b0 +#define KEY_LOGOFF 0x1b1 #define KEY_DOLLAR 0x1b2 #define KEY_EURO 0x1b3 -#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ +#define KEY_FRAMEBACK 0x1b4 #define KEY_FRAMEFORWARD 0x1b5 -#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ -#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ -#define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ -#define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ -#define KEY_IMAGES 0x1ba /* AL Image Browser */ -#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ -#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ -#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ -#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ +#define KEY_CONTEXT_MENU 0x1b6 +#define KEY_MEDIA_REPEAT 0x1b7 +#define KEY_10CHANNELSUP 0x1b8 +#define KEY_10CHANNELSDOWN 0x1b9 +#define KEY_IMAGES 0x1ba +#define KEY_NOTIFICATION_CENTER 0x1bc +#define KEY_PICKUP_PHONE 0x1bd +#define KEY_HANGUP_PHONE 0x1be +#define KEY_LINK_PHONE 0x1bf #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -573,8 +545,8 @@ #define KEY_BRL_DOT9 0x1f9 #define KEY_BRL_DOT10 0x1fa -#define KEY_NUMERIC_0 0x200 /* used by phones, remote controls, */ -#define KEY_NUMERIC_1 0x201 /* and other keypads */ +#define KEY_NUMERIC_0 0x200 +#define KEY_NUMERIC_1 0x201 #define KEY_NUMERIC_2 0x202 #define KEY_NUMERIC_3 0x203 #define KEY_NUMERIC_4 0x204 @@ -585,15 +557,14 @@ #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b -#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ +#define KEY_NUMERIC_A 0x20c #define KEY_NUMERIC_B 0x20d #define KEY_NUMERIC_C 0x20e #define KEY_NUMERIC_D 0x20f - #define KEY_CAMERA_FOCUS 0x210 -#define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ +#define KEY_WPS_BUTTON 0x211 -#define KEY_TOUCHPAD_TOGGLE 0x212 /* Request switch touchpad on or off */ +#define KEY_TOUCHPAD_TOGGLE 0x212 #define KEY_TOUCHPAD_ON 0x213 #define KEY_TOUCHPAD_OFF 0x214 @@ -603,11 +574,10 @@ #define KEY_CAMERA_DOWN 0x218 #define KEY_CAMERA_LEFT 0x219 #define KEY_CAMERA_RIGHT 0x21a - #define KEY_ATTENDANT_ON 0x21b #define KEY_ATTENDANT_OFF 0x21c -#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ -#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ +#define KEY_ATTENDANT_TOGGLE 0x21d +#define KEY_LIGHTS_TOGGLE 0x21e #define BTN_DPAD_UP 0x220 #define BTN_DPAD_DOWN 0x221 @@ -619,94 +589,69 @@ #define BTN_GRIPL2 0x226 #define BTN_GRIPR2 0x227 -#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ -#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ -#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ - -#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ -#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ -#define KEY_JOURNAL 0x242 /* AL Log/Journal/Timecard */ -#define KEY_CONTROLPANEL 0x243 /* AL Control Panel */ -#define KEY_APPSELECT 0x244 /* AL Select Task/Application */ -#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ -#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ -#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ -#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ -#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ -#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ -#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ -#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ -#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ - -#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ -#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ - -/* - * Keycodes for hotkeys toggling the electronic privacy screen found on some - * laptops on/off. Note when the embedded-controller turns on/off the eprivacy - * screen itself then the state should be reported through drm connecter props: - * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties - * Except when implementing the drm connecter properties API is not possible - * because e.g. the firmware does not allow querying the presence and/or status - * of the eprivacy screen at boot. - */ +#define KEY_ALS_TOGGLE 0x230 +#define KEY_ROTATE_LOCK_TOGGLE 0x231 +#define KEY_REFRESH_RATE_TOGGLE 0x232 + +#define KEY_BUTTONCONFIG 0x240 +#define KEY_TASKMANAGER 0x241 +#define KEY_JOURNAL 0x242 +#define KEY_CONTROLPANEL 0x243 +#define KEY_APPSELECT 0x244 +#define KEY_SCREENSAVER 0x245 +#define KEY_VOICECOMMAND 0x246 +#define KEY_ASSISTANT 0x247 +#define KEY_KBD_LAYOUT_NEXT 0x248 +#define KEY_EMOJI_PICKER 0x249 +#define KEY_DICTATE 0x24a +#define KEY_CAMERA_ACCESS_ENABLE 0x24b +#define KEY_CAMERA_ACCESS_DISABLE 0x24c +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d +#define KEY_ACCESSIBILITY 0x24e +#define KEY_DO_NOT_DISTURB 0x24f + +#define KEY_BRIGHTNESS_MIN 0x250 +#define KEY_BRIGHTNESS_MAX 0x251 + #define KEY_EPRIVACY_SCREEN_ON 0x252 #define KEY_EPRIVACY_SCREEN_OFF 0x253 #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 -#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 -#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 -#define KEY_KBDINPUTASSIST_ACCEPT 0x264 -#define KEY_KBDINPUTASSIST_CANCEL 0x265 +#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 +#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 +#define KEY_KBDINPUTASSIST_ACCEPT 0x264 +#define KEY_KBDINPUTASSIST_CANCEL 0x265 -/* Diagonal movement keys */ #define KEY_RIGHT_UP 0x266 #define KEY_RIGHT_DOWN 0x267 #define KEY_LEFT_UP 0x268 #define KEY_LEFT_DOWN 0x269 -#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */ -/* Show Top Menu of the Media (e.g. DVD) */ +#define KEY_ROOT_MENU 0x26a #define KEY_MEDIA_TOP_MENU 0x26b #define KEY_NUMERIC_11 0x26c #define KEY_NUMERIC_12 0x26d -/* - * Toggle Audio Description: refers to an audio service that helps blind and - * visually impaired consumers understand the action in a program. Note: in - * some countries this is referred to as "Video Description". - */ #define KEY_AUDIO_DESC 0x26e #define KEY_3D_MODE 0x26f #define KEY_NEXT_FAVORITE 0x270 #define KEY_STOP_RECORD 0x271 #define KEY_PAUSE_RECORD 0x272 -#define KEY_VOD 0x273 /* Video on Demand */ +#define KEY_VOD 0x273 #define KEY_UNMUTE 0x274 #define KEY_FASTREVERSE 0x275 #define KEY_SLOWREVERSE 0x276 -/* - * Control a data application associated with the currently viewed channel, - * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) - */ #define KEY_DATA 0x277 #define KEY_ONSCREEN_KEYBOARD 0x278 -/* Electronic privacy screen control */ #define KEY_PRIVACY_SCREEN_TOGGLE 0x279 -/* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a -/* Move the focus to the next or previous user controllable element within a UI container */ #define KEY_NEXT_ELEMENT 0x27b #define KEY_PREVIOUS_ELEMENT 0x27c -/* Toggle Autopilot engagement */ #define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d -/* Shortcut Keys */ #define KEY_MARK_WAYPOINT 0x27e #define KEY_SOS 0x27f #define KEY_NAV_CHART 0x280 @@ -720,21 +665,6 @@ #define KEY_NAV_INFO 0x288 #define KEY_BRIGHTNESS_MENU 0x289 -/* - * Some keyboards have keys which do not have a defined meaning, these keys - * are intended to be programmed / bound to macros by the user. For most - * keyboards with these macro-keys the key-sequence to inject, or action to - * take, is all handled by software on the host side. So from the kernel's - * point of view these are just normal keys. - * - * The KEY_MACRO# codes below are intended for such keys, which may be labeled - * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys - * where the marking on the key does indicate a defined meaning / purpose. - * - * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing - * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO - * define MUST be added. - */ #define KEY_MACRO1 0x290 #define KEY_MACRO2 0x291 #define KEY_MACRO3 0x292 @@ -766,16 +696,6 @@ #define KEY_MACRO29 0x2ac #define KEY_MACRO30 0x2ad -/* - * Some keyboards with the macro-keys described above have some extra keys - * for controlling the host-side software responsible for the macro handling: - * -A macro recording start/stop key. Note that not all keyboards which emit - * KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if - * KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START - * should be interpreted as a recording start/stop toggle; - * -Keys for switching between different macro (pre)sets, either a key for - * cycling through the configured presets or keys to directly select a preset. - */ #define KEY_MACRO_RECORD_START 0x2b0 #define KEY_MACRO_RECORD_STOP 0x2b1 #define KEY_MACRO_PRESET_CYCLE 0x2b2 @@ -783,19 +703,12 @@ #define KEY_MACRO_PRESET2 0x2b4 #define KEY_MACRO_PRESET3 0x2b5 -/* - * Some keyboards have a buildin LCD panel where the contents are controlled - * by the host. Often these have a number of keys directly below the LCD - * intended for controlling a menu shown on the LCD. These keys often don't - * have any labeling so we just name them KEY_KBD_LCD_MENU# - */ #define KEY_KBD_LCD_MENU1 0x2b8 #define KEY_KBD_LCD_MENU2 0x2b9 #define KEY_KBD_LCD_MENU3 0x2ba #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc -/* Performance Boost key (Alienware)/G-Mode key (Dell) */ #define KEY_PERFORMANCE 0x2bd #define BTN_TRIGGER_HAPPY 0x2c0 @@ -840,15 +753,10 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 -/* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff #define KEY_CNT (KEY_MAX+1) -/* - * Relative axes - */ - #define REL_X 0x00 #define REL_Y 0x01 #define REL_Z 0x02 @@ -859,23 +767,12 @@ #define REL_DIAL 0x07 #define REL_WHEEL 0x08 #define REL_MISC 0x09 -/* - * 0x0a is reserved and should not be used in input drivers. - * It was used by HID as REL_MISC+1 and userspace needs to detect if - * the next REL_* event is correct or is just REL_MISC + n. - * We define here REL_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define REL_RESERVED 0x0a #define REL_WHEEL_HI_RES 0x0b #define REL_HWHEEL_HI_RES 0x0c #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) -/* - * Absolute axes - */ - #define ABS_X 0x00 #define ABS_Y 0x01 #define ABS_Z 0x02 @@ -906,65 +803,49 @@ #define ABS_MISC 0x28 -/* - * 0x2e is reserved and should not be used in input drivers. - * It was used by HID as ABS_MISC+6 and userspace needs to detect if - * the next ABS_* event is correct or is just ABS_MISC + n. - * We define here ABS_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define ABS_RESERVED 0x2e -#define ABS_MT_SLOT 0x2f /* MT slot being modified */ -#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ -#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ -#define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */ -#define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */ -#define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */ -#define ABS_MT_POSITION_X 0x35 /* Center X touch position */ -#define ABS_MT_POSITION_Y 0x36 /* Center Y touch position */ -#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ -#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ -#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ -#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ -#define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ -#define ABS_MT_TOOL_X 0x3c /* Center X tool position */ -#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */ +#define ABS_MT_SLOT 0x2f +#define ABS_MT_TOUCH_MAJOR 0x30 +#define ABS_MT_TOUCH_MINOR 0x31 +#define ABS_MT_WIDTH_MAJOR 0x32 +#define ABS_MT_WIDTH_MINOR 0x33 +#define ABS_MT_ORIENTATION 0x34 +#define ABS_MT_POSITION_X 0x35 +#define ABS_MT_POSITION_Y 0x36 +#define ABS_MT_TOOL_TYPE 0x37 +#define ABS_MT_BLOB_ID 0x38 +#define ABS_MT_TRACKING_ID 0x39 +#define ABS_MT_PRESSURE 0x3a +#define ABS_MT_DISTANCE 0x3b +#define ABS_MT_TOOL_X 0x3c +#define ABS_MT_TOOL_Y 0x3d #define ABS_MAX 0x3f #define ABS_CNT (ABS_MAX+1) -/* - * Switch events - */ - -#define SW_LID 0x00 /* set = lid shut */ -#define SW_TABLET_MODE 0x01 /* set = tablet mode */ -#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ -#define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any" - set = radio enabled */ -#define SW_RADIO SW_RFKILL_ALL /* deprecated */ -#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ -#define SW_DOCK 0x05 /* set = plugged into dock */ -#define SW_LINEOUT_INSERT 0x06 /* set = inserted */ -#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ -#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ -#define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ -#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ -#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ -#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ -#define SW_LINEIN_INSERT 0x0d /* set = inserted */ -#define SW_MUTE_DEVICE 0x0e /* set = device disabled */ -#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_LID 0x00 +#define SW_TABLET_MODE 0x01 +#define SW_HEADPHONE_INSERT 0x02 +#define SW_RFKILL_ALL 0x03 +#define SW_RADIO SW_RFKILL_ALL +#define SW_MICROPHONE_INSERT 0x04 +#define SW_DOCK 0x05 +#define SW_LINEOUT_INSERT 0x06 +#define SW_JACK_PHYSICAL_INSERT 0x07 +#define SW_VIDEOOUT_INSERT 0x08 +#define SW_CAMERA_LENS_COVER 0x09 +#define SW_KEYPAD_SLIDE 0x0a +#define SW_FRONT_PROXIMITY 0x0b +#define SW_ROTATE_LOCK 0x0c +#define SW_LINEIN_INSERT 0x0d +#define SW_MUTE_DEVICE 0x0e +#define SW_PEN_INSERTED 0x0f +#define SW_MACHINE_COVER 0x10 +#define SW_USB_INSERT 0x11 #define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) -/* - * Misc events - */ - #define MSC_SERIAL 0x00 #define MSC_PULSELED 0x01 #define MSC_GESTURE 0x02 @@ -974,10 +855,6 @@ #define MSC_MAX 0x07 #define MSC_CNT (MSC_MAX+1) -/* - * LEDs - */ - #define LED_NUML 0x00 #define LED_CAPSL 0x01 #define LED_SCROLLL 0x02 @@ -992,19 +869,11 @@ #define LED_MAX 0x0f #define LED_CNT (LED_MAX+1) -/* - * Autorepeat values - */ - #define REP_DELAY 0x00 #define REP_PERIOD 0x01 #define REP_MAX 0x01 #define REP_CNT (REP_MAX+1) -/* - * Sounds - */ - #define SND_CLICK 0x00 #define SND_BELL 0x01 #define SND_TONE 0x02 From nobody Tue Feb 17 23:57: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 4fFxR93WMhz6SK26 for ; Tue, 17 Feb 2026 23:57: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 4fFxR92bFxz4Q85 for ; Tue, 17 Feb 2026 23:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=upVKnb6gMWen9kZ91nAj8Apn9tFBjLSyLMFlz7vvrHU=; b=Dq4EnxEPjFHU4DMxVIygS0lpeEeQRXHN0ic5ghCqmXr3OP9YkwUshV2M2Unpbc1XGoSsZS Zh7CDxawc33cTnl8NYljRyRTXQbFdTZI6xhBoRj+dlfQOZ3X0JLTq7tXzA7sxhpAA6Cuqq hRsegEDX7wgaS1ywtWc9F8Fc0oQRtCoGIY1bXH++qr0ARPazfU2Xo1ZF1dXEOyjHWCvoQw crNUkeCLLKP4cg8ek+wAggGWg9SAWlNz1f76qwTdJcy5JcqjkwS1Squ1ATOKtIRJ2nXN+d sX+iinuooXfcmceATLiGL+UIdSrd8hV205f63PPtbHg6WXG7dn6YKJOIJLyFBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771372677; a=rsa-sha256; cv=none; b=ZgRBX9slp4CVhdLfI27FRYyDjvXiFVJFVTDsrZ1U+yZvuhoYR21ss7NBuMD1eK22sGp1Em 4W51Nz1MFuilstHzRmHWcMQV30LndB94r00rvQChSsZSzdIQ4QbTHr4s8GKQL29/88eFw/ Du8kk7nWTz5vNg9eQcchwVGtnpQMp46BS5il1VHD52vzBn5WNP2Ozm3Ldz0y1/w4PS56B1 KD+v9TPIbYD0OSU86NMKdwVZd1OxIN1lObTMg1mw0tymj2W3ISvTeW4Bm8epUhjpjEuZfn OUjxDvBs55NbHGDUAozwYo/tYg4HxpDFAoyUc3lND0w1I0t4mB5H9Er8A7c2Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=upVKnb6gMWen9kZ91nAj8Apn9tFBjLSyLMFlz7vvrHU=; b=SFoY2qg/6WecZ3kdfzG9SWn/lsMGNzQIMo6oVswEh3lN4+pkb0AuiOR8jXO03d7LYMhvnR QP/vIGyQgsFxyeou3kLxQw0CLOJ1RmwuM94hzAuWkqS1OJznRekPHwmSZm9Swayds0gDkz VaZ6X+671RqBGf4l9GQLeZSxaG+8tOWrBiL/gffVZAtWk30zbTu6gonSlKD62BrSp3fB3a V5+ShsUk8xtX5PGkluDtWgew66OJUAWJ71NpQg43+CNUjBl5v2I7p1lwsOFEIb0Hw5kmj8 eNQNLfumY2M03/JVvPahwtM/D12MXH9UuSEgbfnd/LPkYWjVTTmHmazQPDYOKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxR91ncSzXPp for ; Tue, 17 Feb 2026 23:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b52c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:57:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 05f0dcd80d6a - stable/15 - tests: Simplify libarchive tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 05f0dcd80d6a5203c061825ba8435a4732754930 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:57:57 +0000 Message-Id: <69950085.3b52c.1ec45335@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=05f0dcd80d6a5203c061825ba8435a4732754930 commit 05f0dcd80d6a5203c061825ba8435a4732754930 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-06 13:48:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:11:48 +0000 tests: Simplify libarchive tests The ATF tests work by first running the test program with an invalid flag, which causes it to print an error message, a summary of options, and a list of available test cases. Switch to the new -l option which simply prints the list, and simplify the awk script used to parse the output. No functional change. MFC after: 1 week (cherry picked from commit 394201ce5b4e2f84f1e39a7ce8bdc3f5a5ef8390) --- lib/libarchive/tests/functional_test.sh | 2 +- usr.bin/bsdcat/tests/functional_test.sh | 2 +- usr.bin/cpio/tests/functional_test.sh | 2 +- usr.bin/tar/tests/functional_test.sh | 4 ++-- usr.bin/unzip/tests/functional_test.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh index 191eae65f4dc..db3845b5e6f7 100755 --- a/lib/libarchive/tests/functional_test.sh +++ b/lib/libarchive/tests/functional_test.sh @@ -40,7 +40,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/bsdcat/tests/functional_test.sh b/usr.bin/bsdcat/tests/functional_test.sh index efed232374e2..27bf51298bb8 100755 --- a/usr.bin/bsdcat/tests/functional_test.sh +++ b/usr.bin/bsdcat/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/cpio/tests/functional_test.sh b/usr.bin/cpio/tests/functional_test.sh index a915cc91faea..6bc58e5236ae 100755 --- a/usr.bin/cpio/tests/functional_test.sh +++ b/usr.bin/cpio/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/tar/tests/functional_test.sh b/usr.bin/tar/tests/functional_test.sh index 39a73abd0a79..11f3cb6dd122 100755 --- a/usr.bin/tar/tests/functional_test.sh +++ b/usr.bin/tar/tests/functional_test.sh @@ -25,9 +25,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -export BSDTAR=$(which tar) SRCDIR=$(atf_get_srcdir) TESTER="${SRCDIR}/bsdtar_test" +export BSDTAR=$(which tar) check() { @@ -41,7 +41,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/unzip/tests/functional_test.sh b/usr.bin/unzip/tests/functional_test.sh index e668453d8882..c6b25cfc2e7e 100755 --- a/usr.bin/unzip/tests/functional_test.sh +++ b/usr.bin/unzip/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" From nobody Tue Feb 17 23:57: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 4fFxRB4Vjtz6SK4T for ; Tue, 17 Feb 2026 23:57: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 4fFxRB38J1z4QM5 for ; Tue, 17 Feb 2026 23:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rh3cXeL3bCEyp1zuPsB/cn9a0GGib7NXuRvgzMXaaCk=; b=lK40gvJ3ePm8d9bhwuvWtupZtFUxNJHRW2Vh3j7GSITbTiph9FPErmXBED1YbAlZrM6BoY Ppq6Il6BdzqgSvEviJQ4JE7y0urxFbBawTNXUZZEXVOQdclpVsW3zWKrHt9Rr1aKWqwI0X fjGGPy1Yj8EcMKu12zQnlYeacIn82hPPFbygrDVzdJve0I6p2cXwDkR3xGojD0xNQeiwZ7 pR/0KzsRftLswaiOD3SexAB3uXuHKOxMATw4SQnt9wn494TKdNlyOYgL/jR6vMl0733LR8 ou+WRN+SmSWoRrpoyikFsuMlhMvGOGBLjn0FIzgWeD7dO2jugdB/T+X5qq3gSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771372678; a=rsa-sha256; cv=none; b=G4/zRtL68TQjv+1qedDRUHgW5ojA0DXNI157E01dzqqrREXjumhvHSGM5gOY5pN4CPZBvL X7N4kWObywlEnU5RtMJMUrsHCMrcipqp0BvE6Xs/uGMUrpI/88Q9rVxzTEbxVvfKxrEfxI NGZtLwlWV4iJ7V3ixf0HIxPGZ6cqFHC3XpAyEbM5DztnLbx28icxbu+c2v0U/XhJRI+MjJ Ofa4uV7KOG0gSJLUKI4YBYLd5NAHoKPDAVQRqmtL5lnxSYoEQGE6KBovb0+pXCA8eoUvP0 pJjf11GjzlzNbnAE10UCyGCv1Xe36cH0l4w18HuzTlVumZ/pG5I9L8W+etW/Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rh3cXeL3bCEyp1zuPsB/cn9a0GGib7NXuRvgzMXaaCk=; b=bqhETLzmJoXOpvMQ05tS/Uoe2/e3+QgZxdV0ngZuWZFPqWoXRbor1T5McyNn5zCL0HeQ0e 6el1rKzGPMc2A0pQsF9bDb9OlHnMo9UY8vY6rLkllkS+p9E2uwiubUXSHpdw2sv0NzkQmx Ht7CPuErhTBuyJrkEIo7//6DE016dHZVZdkFyAnDsy0349VK8VJSqvIaGJSfNk04Q1kN5B sjOqjTZhugwkhxhH3oxY8qTcfaWC2Yh2BXWMEUd72wLE3DgEFQxbCBsZT7FOwHtB9hvZYp Lg6RkfgEL0/onsiIX+Ao4VlC9qylh6uwlKo9XLlLfhNcm546Jp5L8OWyY0EHtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxRB2jzqzXh2 for ; Tue, 17 Feb 2026 23:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c27d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:57:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c8d2ac71e8cf - stable/15 - ngctl: Modernize code somewhat List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: c8d2ac71e8cf2bc6a5ac8fdf212178a165e1a564 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:57:58 +0000 Message-Id: <69950086.3c27d.3e9482c8@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d2ac71e8cf2bc6a5ac8fdf212178a165e1a564 commit c8d2ac71e8cf2bc6a5ac8fdf212178a165e1a564 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:11:48 +0000 ngctl: Modernize code somewhat * Replace fgets(3) with getline(3) * Replace select(2) with poll(2) * Avoid needlessly copying text around * Correct use of getopt(3) * Pick some style and whitespace nits MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55257 (cherry picked from commit 3cbdcabf714d5187e22d8ff1cbfbc261dc8622eb) --- usr.sbin/ngctl/config.c | 9 +- usr.sbin/ngctl/connect.c | 6 +- usr.sbin/ngctl/debug.c | 6 +- usr.sbin/ngctl/dot.c | 7 +- usr.sbin/ngctl/list.c | 14 ++- usr.sbin/ngctl/main.c | 243 ++++++++++++++++++++++------------------------ usr.sbin/ngctl/mkpeer.c | 6 +- usr.sbin/ngctl/msg.c | 39 +++----- usr.sbin/ngctl/name.c | 6 +- usr.sbin/ngctl/rmhook.c | 6 +- usr.sbin/ngctl/show.c | 9 +- usr.sbin/ngctl/shutdown.c | 7 +- usr.sbin/ngctl/status.c | 10 +- usr.sbin/ngctl/types.c | 6 +- usr.sbin/ngctl/write.c | 10 +- 15 files changed, 168 insertions(+), 216 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 261bc950f570..25cd841494d1 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -3,7 +3,7 @@ * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -14,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -94,8 +94,8 @@ ConfigCmd(int ac, char **av) return (CMDRTN_ERROR); } } else { - if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 - || (resp->header.flags & NGF_RESP) == 0) + if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 || + (resp->header.flags & NGF_RESP) == 0) nostat = 1; } @@ -106,4 +106,3 @@ ConfigCmd(int ac, char **av) printf("Config for \"%s\":\n%s\n", path, status); return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c index 7f538e0a442d..c3e7d0b5a1b4 100644 --- a/usr.sbin/ngctl/connect.c +++ b/usr.sbin/ngctl/connect.c @@ -1,10 +1,9 @@ - /* * connect.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -85,4 +84,3 @@ ConnectCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c index bbc329acdcd2..1f64dfd466e9 100644 --- a/usr.sbin/ngctl/debug.c +++ b/usr.sbin/ngctl/debug.c @@ -1,10 +1,9 @@ - /* * debug.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -79,4 +78,3 @@ DebugCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/dot.c b/usr.sbin/ngctl/dot.c index 95132a5d0785..9893dc27f845 100644 --- a/usr.sbin/ngctl/dot.c +++ b/usr.sbin/ngctl/dot.c @@ -1,4 +1,3 @@ - /* * dot.c * @@ -6,7 +5,7 @@ * Copyright (c) 2004 Brian Fundakowski Feldman * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -17,7 +16,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -71,13 +70,13 @@ DotCmd(int ac, char **av) u_int i; /* Get options */ + optreset = 1; optind = 1; while ((ch = getopt(ac, av, "c")) != -1) { switch (ch) { case 'c': compact = 1; break; - case '?': default: return (CMDRTN_USAGE); break; diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c index d13de1c4c57f..77fc7a4bbcf5 100644 --- a/usr.sbin/ngctl/list.c +++ b/usr.sbin/ngctl/list.c @@ -1,10 +1,9 @@ - /* * list.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -70,6 +69,7 @@ ListCmd(int ac, char **av) int ch, rtn = CMDRTN_OK; /* Get options */ + optreset = 1; optind = 1; while ((ch = getopt(ac, av, "ln")) != -1) { switch (ch) { @@ -79,7 +79,6 @@ ListCmd(int ac, char **av) case 'n': named_only = 1; break; - case '?': default: return (CMDRTN_USAGE); break; @@ -114,11 +113,11 @@ ListCmd(int ac, char **av) ninfo = nlist->nodeinfo; if (list_hooks) { char path[NG_PATHSIZ]; - char *argv[2] = { "show", path }; + char *argv[] = { "show", path, NULL }; while (nlist->numnames > 0) { - snprintf(path, sizeof(path), - "[%lx]:", (u_long)ninfo->id); + snprintf(path, sizeof(path), "[%lx]:", + (unsigned long)ninfo->id); if ((rtn = (*show_cmd.func)(2, argv)) != CMDRTN_OK) break; ninfo++; @@ -143,4 +142,3 @@ ListCmd(int ac, char **av) free(resp); return (rtn); } - diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index b86f1ca27e71..b58de1e042b3 100644 --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -1,10 +1,9 @@ - /* * main.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -39,12 +38,12 @@ #include #include -#include #include #include #include #include +#include #include #include #include @@ -71,7 +70,8 @@ /* Internal functions */ static int ReadFile(FILE *fp); -static void ReadSockets(fd_set *); +static void ReadCtrlSocket(void); +static void ReadDataSocket(void); static int DoParseCommand(const char *line); static int DoCommand(int ac, char **av); static int DoInteractive(void); @@ -146,6 +146,7 @@ main(int ac, char *av[]) FILE *fp = NULL; #ifdef JAIL const char *jail_name = NULL; + int jid; #endif int ch, rtn = 0; @@ -174,7 +175,6 @@ main(int ac, char *av[]) case 'n': snprintf(name, sizeof(name), "%s", optarg); break; - case '?': default: Usage((char *)NULL); break; @@ -185,8 +185,6 @@ main(int ac, char *av[]) #ifdef JAIL if (jail_name != NULL) { - int jid; - if (jail_name[0] == '\0') Usage("invalid jail name"); @@ -239,18 +237,25 @@ main(int ac, char *av[]) static int ReadFile(FILE *fp) { - char line[LINE_MAX]; - int num, rtn; - - for (num = 1; fgets(line, sizeof(line), fp) != NULL; num++) { + char *line = NULL; + ssize_t len; + size_t sz = 0; + unsigned int lineno = 0; + int rtn = CMDRTN_OK; + + while ((len = getline(&line, &sz, fp)) > 0) { + lineno++; if (*line == '#') continue; - if ((rtn = DoParseCommand(line)) != 0) { - warnx("line %d: error in file", num); - return (rtn); + if ((rtn = DoParseCommand(line)) != CMDRTN_OK) { + warnx("line %d: error in file", lineno); + break; } } - return (CMDRTN_OK); + if (len < 0) + rtn = CMDRTN_ERROR; + free(line); + return (rtn); } #ifdef EDITLINE @@ -258,7 +263,6 @@ ReadFile(FILE *fp) static void Unblock(int signal __unused) { - unblock = 1; } @@ -269,8 +273,11 @@ Unblock(int signal __unused) static void * Monitor(void *v __unused) { + struct pollfd pfds[2] = { + { .fd = csock, .events = POLLIN }, + { .fd = dsock, .events = POLLIN }, + }; struct sigaction act; - const int maxfd = MAX(csock, dsock) + 1; act.sa_handler = Unblock; sigemptyset(&act.sa_mask); @@ -279,22 +286,19 @@ Monitor(void *v __unused) pthread_mutex_lock(&mutex); for (;;) { - fd_set rfds; - - /* See if any data or control messages are arriving. */ - FD_ZERO(&rfds); - FD_SET(csock, &rfds); - FD_SET(dsock, &rfds); unblock = 0; - if (select(maxfd, &rfds, NULL, NULL, NULL) <= 0) { + if (poll(pfds, 2, INFTIM) <= 0) { if (errno == EINTR) { if (unblock == 1) pthread_cond_wait(&cond, &mutex); continue; } - err(EX_OSERR, "select"); + err(EX_OSERR, "poll"); } - ReadSockets(&rfds); + if (pfds[0].revents != 0) + ReadCtrlSocket(); + if (pfds[1].revents != 0) + ReadDataSocket(); } return (NULL); @@ -303,7 +307,6 @@ Monitor(void *v __unused) static char * Prompt(EditLine *el __unused) { - return (PROMPT); } @@ -376,49 +379,48 @@ DoInteractive(void) static int DoInteractive(void) { - const int maxfd = MAX(csock, dsock) + 1; + struct pollfd pfds[3] = { + { .fd = csock, .events = POLLIN }, + { .fd = dsock, .events = POLLIN }, + { .fd = STDIN_FILENO, .events = POLLIN }, + }; + char *line = NULL; + ssize_t len; + size_t sz = 0; (*help_cmd.func)(0, NULL); - while (1) { - struct timeval tv; - fd_set rfds; - + for (;;) { /* See if any data or control messages are arriving */ - FD_ZERO(&rfds); - FD_SET(csock, &rfds); - FD_SET(dsock, &rfds); - memset(&tv, 0, sizeof(tv)); - if (select(maxfd, &rfds, NULL, NULL, &tv) <= 0) { - + if (poll(pfds, 2, 0) <= 0) { /* Issue prompt and wait for anything to happen */ printf("%s", PROMPT); fflush(stdout); - FD_ZERO(&rfds); - FD_SET(0, &rfds); - FD_SET(csock, &rfds); - FD_SET(dsock, &rfds); - if (select(maxfd, &rfds, NULL, NULL, NULL) < 0) - err(EX_OSERR, "select"); - - /* If not user input, print a newline first */ - if (!FD_ISSET(0, &rfds)) - printf("\n"); + if (poll(pfds, 3, INFTIM) < 0 && errno != EINTR) + err(EX_OSERR, "poll"); + } else { + pfds[2].revents = 0; } - ReadSockets(&rfds); + /* If not user input, print a newline first */ + if (pfds[2].revents == 0) + printf("\n"); + + if (pfds[0].revents != 0) + ReadCtrlSocket(); + if (pfds[1].revents != 0) + ReadDataSocket(); /* Get any user input */ - if (FD_ISSET(0, &rfds)) { - char buf[LINE_MAX]; - - if (fgets(buf, sizeof(buf), stdin) == NULL) { + if (pfds[2].revents != 0) { + if ((len = getline(&line, &sz, stdin)) <= 0) { printf("\n"); break; } - if (DoParseCommand(buf) == CMDRTN_QUIT) + if (DoParseCommand(line) == CMDRTN_QUIT) break; } } + free(line); return (CMDRTN_QUIT); } #endif /* !EDITLINE */ @@ -427,29 +429,28 @@ DoInteractive(void) * Read and process data on netgraph control and data sockets. */ static void -ReadSockets(fd_set *rfds) +ReadCtrlSocket(void) { - /* Display any incoming control message. */ - if (FD_ISSET(csock, rfds)) - MsgRead(); - - /* Display any incoming data packet. */ - if (FD_ISSET(dsock, rfds)) { - char hook[NG_HOOKSIZ]; - u_char *buf; - int rl; - - /* Read packet from socket. */ - if ((rl = NgAllocRecvData(dsock, &buf, hook)) < 0) - err(EX_OSERR, "reading hook \"%s\"", hook); - if (rl == 0) - errx(EX_OSERR, "EOF from hook \"%s\"?", hook); - - /* Write packet to stdout. */ - printf("Rec'd data packet on hook \"%s\":\n", hook); - DumpAscii(buf, rl); - free(buf); - } + MsgRead(); +} + +static void +ReadDataSocket(void) +{ + char hook[NG_HOOKSIZ]; + u_char *buf; + int rl; + + /* Read packet from socket. */ + if ((rl = NgAllocRecvData(dsock, &buf, hook)) < 0) + err(EX_OSERR, "reading hook \"%s\"", hook); + if (rl == 0) + errx(EX_OSERR, "EOF from hook \"%s\"?", hook); + + /* Write packet to stdout. */ + printf("Rec'd data packet on hook \"%s\":\n", hook); + DumpAscii(buf, rl); + free(buf); } /* @@ -561,6 +562,8 @@ ReadCmd(int ac, char **av) /* Process it */ rtn = ReadFile(fp); + if (ferror(fp)) + warn("%s", av[1]); fclose(fp); return (rtn); } @@ -572,7 +575,9 @@ static int HelpCmd(int ac, char **av) { const struct ngcmd *cmd; - int k; + const char *s; + const int maxcol = 63; + int a, k, len; switch (ac) { case 0: @@ -580,13 +585,11 @@ HelpCmd(int ac, char **av) /* Show all commands */ printf("Available commands:\n"); for (k = 0; cmds[k] != NULL; k++) { - char *s, buf[100]; - cmd = cmds[k]; - snprintf(buf, sizeof(buf), "%s", cmd->cmd); - for (s = buf; *s != '\0' && !isspace(*s); s++); - *s = '\0'; - printf(" %-10s %s\n", buf, cmd->desc); + for (s = cmd->cmd; *s != '\0' && !isspace(*s); s++) + /* nothing */; + printf(" %.*s%*s %s\n", (int)(s - cmd->cmd), cmd->cmd, + (int)(10 - (s - cmd->cmd)), "", cmd->desc); } return (CMDRTN_OK); default: @@ -594,40 +597,29 @@ HelpCmd(int ac, char **av) if ((cmd = FindCommand(av[1])) != NULL) { printf("usage: %s\n", cmd->cmd); if (cmd->aliases[0] != NULL) { - int a = 0; - printf("Aliases: "); - while (1) { - printf("%s", cmd->aliases[a++]); - if (a == MAX_CMD_ALIAS - || cmd->aliases[a] == NULL) { - printf("\n"); - break; - } - printf(", "); + for (a = 0; a < MAX_CMD_ALIAS && + cmd->aliases[a] != NULL; a++) { + if (a > 0) + printf(", "); + printf("%s", cmd->aliases[a]); } + printf("\n"); } printf("Summary: %s\n", cmd->desc); - if (cmd->help != NULL) { - const char *s; - char buf[65]; - int tot, len, done; - - printf("Description:\n"); - for (s = cmd->help; *s != '\0'; s += len) { - while (isspace(*s)) - s++; - tot = snprintf(buf, - sizeof(buf), "%s", s); - len = strlen(buf); - done = len == tot; - if (!done) { - while (len > 0 - && !isspace(buf[len-1])) - buf[--len] = '\0'; - } - printf(" %s\n", buf); - } + if (cmd->help == NULL) + break; + printf("Description:\n"); + for (s = cmd->help; *s != '\0'; s += len) { + while (isspace(*s)) + s++; + /* advance to the column limit */ + for (len = 0; s[len] && len < maxcol; len++) + /* nothing */; + /* back up to previous interword space */ + while (len > 0 && s[len] && !isblank(s[len])) + len--; + printf(" %.*s\n", len, s); } } } @@ -649,34 +641,27 @@ QuitCmd(int ac __unused, char **av __unused) void DumpAscii(const u_char *buf, int len) { - char ch, sbuf[100]; int k, count; for (count = 0; count < len; count += DUMP_BYTES_PER_LINE) { - snprintf(sbuf, sizeof(sbuf), "%04x: ", count); + printf("%04x: ", count); for (k = 0; k < DUMP_BYTES_PER_LINE; k++) { if (count + k < len) { - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), - "%02x ", buf[count + k]); + printf("%02x ", buf[count + k]); } else { - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), " "); + printf(" "); } } - snprintf(sbuf + strlen(sbuf), sizeof(sbuf) - strlen(sbuf), " "); + printf(" "); for (k = 0; k < DUMP_BYTES_PER_LINE; k++) { if (count + k < len) { - ch = isprint(buf[count + k]) ? - buf[count + k] : '.'; - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), "%c", ch); + printf("%c", isprint(buf[count + k]) ? + buf[count + k] : '.'); } else { - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), " "); + printf(" "); } } - printf("%s\n", sbuf); + printf("\n"); } } diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c index b16260a7cce1..5884c898a165 100644 --- a/usr.sbin/ngctl/mkpeer.c +++ b/usr.sbin/ngctl/mkpeer.c @@ -1,10 +1,9 @@ - /* * mkpeer.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -85,4 +84,3 @@ MkPeerCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c index 2cc733408380..3be10293e82b 100644 --- a/usr.sbin/ngctl/msg.c +++ b/usr.sbin/ngctl/msg.c @@ -1,10 +1,9 @@ - /* * msg.c * * Copyright (c) 1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -37,9 +36,9 @@ * $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $ */ -#include #include #include +#include #include #include #include @@ -64,6 +63,9 @@ const struct ngcmd msg_cmd = { static int MsgCmd(int ac, char **av) { + struct pollfd pfds[1] = { + { .fd = csock, .events = POLLIN }, + }; char *buf; char *path, *cmdstr; int i, len; @@ -95,22 +97,14 @@ MsgCmd(int ac, char **av) free(buf); /* See if a synchronous reply awaits */ - { - struct timeval tv; - fd_set rfds; - - FD_ZERO(&rfds); - FD_SET(csock, &rfds); - memset(&tv, 0, sizeof(tv)); - switch (select(csock + 1, &rfds, NULL, NULL, &tv)) { - case -1: - err(EX_OSERR, "select"); - case 0: - break; - default: - MsgRead(); - break; - } + switch (poll(pfds, 1, 0)) { + case -1: + err(EX_OSERR, "poll"); + case 0: + break; + default: + MsgRead(); + break; } /* Done */ @@ -135,8 +129,8 @@ MsgRead(void) /* Ask originating node to convert message to ASCII */ if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_BINARY2ASCII, m, sizeof(*m) + m->header.arglen) < 0 - || NgAllocRecvMsg(csock, &m2, NULL) < 0) { + NGM_BINARY2ASCII, m, sizeof(*m) + m->header.arglen) < 0 || + NgAllocRecvMsg(csock, &m2, NULL) < 0) { printf("Rec'd %s %d from \"%s\":\n", (m->header.flags & NGF_RESP) != 0 ? "response" : "command", m->header.cmd, path); @@ -160,4 +154,3 @@ MsgRead(void) printf("No arguments\n"); free(m2); } - diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c index 79ddcad2f0c7..56c2040c3961 100644 --- a/usr.sbin/ngctl/name.c +++ b/usr.sbin/ngctl/name.c @@ -1,10 +1,9 @@ - /* * name.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -76,4 +75,3 @@ NameCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c index 5591d39cb078..d8fbbec18579 100644 --- a/usr.sbin/ngctl/rmhook.c +++ b/usr.sbin/ngctl/rmhook.c @@ -1,10 +1,9 @@ - /* * rmhook.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -81,4 +80,3 @@ RmHookCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c index 35d1aa2e5192..3536a5c39ae4 100644 --- a/usr.sbin/ngctl/show.c +++ b/usr.sbin/ngctl/show.c @@ -1,10 +1,9 @@ - /* * show.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -67,13 +66,13 @@ ShowCmd(int ac, char **av) int ch, no_hooks = 0; /* Get options */ + optreset = 1; optind = 1; while ((ch = getopt(ac, av, "n")) != -1) { switch (ch) { case 'n': no_hooks = 1; break; - case '?': default: return (CMDRTN_USAGE); break; @@ -133,5 +132,3 @@ ShowCmd(int ac, char **av) free(resp); return (CMDRTN_OK); } - - diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c index fd38b9dc152b..9e221d1b0ba5 100644 --- a/usr.sbin/ngctl/shutdown.c +++ b/usr.sbin/ngctl/shutdown.c @@ -1,10 +1,9 @@ - /* * shutdown.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -73,5 +72,3 @@ ShutdownCmd(int ac, char **av) } return (CMDRTN_OK); } - - diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c index 10007255d551..3af258f00a7d 100644 --- a/usr.sbin/ngctl/status.c +++ b/usr.sbin/ngctl/status.c @@ -1,10 +1,9 @@ - /* * status.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -84,8 +83,8 @@ StatusCmd(int ac, char **av) return (CMDRTN_ERROR); } } else { - if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 - || (resp->header.flags & NGF_RESP) == 0) + if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 || + (resp->header.flags & NGF_RESP) == 0) nostat = 1; } @@ -96,4 +95,3 @@ StatusCmd(int ac, char **av) printf("Status for \"%s\":\n%s\n", path, status); return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c index 555960a59c02..dbbb8c60c84d 100644 --- a/usr.sbin/ngctl/types.c +++ b/usr.sbin/ngctl/types.c @@ -1,10 +1,9 @@ - *** 64 LINES SKIPPED *** From nobody Tue Feb 17 23:57: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 4fFxRC6rqBz6SJrS for ; Tue, 17 Feb 2026 23:57: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 4fFxRC3mh8z4QJd for ; Tue, 17 Feb 2026 23:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CX9rvOaGnZytfwETcSK2k0FIiqlJhZcQLvakQ9G+6Do=; b=kngKTrkyxOLepVPmWLTXHfIARLpt6tXfLOBSCTnPznvuekFWshp1zzyeAvFVhftfOObT6j QafjWAD8CLeTkx06mdbJRue9oKiECXJwsgnxJwrDhZoqJmC+04e1LbJjRO0xcL1NgY1v84 rhlVAGkeyFcxTmOX7LVdbN4yUDtFWLyq/oHG4x5kYr6p+M88MO2Fg6OEPk5imiVi4X1IwC LT4QVw9SbxOKEImByUOaUOHmh+HUeZ0cSnb3EE2OCwi4cHLpC8zbkMKsRQ5d9PbDhPqQKT UA/+nkkNCl8+pR2wYx9zvz6C71rctM63vu+VCM+8cggjQyXBZw1Y+Nd95TKWDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771372679; a=rsa-sha256; cv=none; b=nIufvRIqkHPHbDHhFz0YKwytMRcwRxsKdlsiE1bfdDhks15Cl4oKpS3iPkbcS/4UOFCTpm NiCFU9S39vTZgsDkf6I5kBofbiQqhzNjxxWTORLGGcE2n7m0XQdPwXAp2qlLFMEIfYKYLH AR6tiMnz9WCYa1OZrlyZtDZTL/nNiWayEqAO/JBglqg2Ol1YMtPqOB7vqkIpARY7kXwuOI 5ZTx8yMU5vjhB0B+W+KRx+ySEnF3Qgxfp1hRNmPilnbvR217YjatL9wIcJY+4YkCyiEXN2 98SZoXqvVUOAlpz7m4TGQHS0k4oAPDb1rPjrthc6alb3ZIKHKS3KyrFwXW4SMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CX9rvOaGnZytfwETcSK2k0FIiqlJhZcQLvakQ9G+6Do=; b=uZT+eNjf4iNSrC0AmtWXrglWPLwmArfNNcdEsgEJFD6y/HmygOiNUlile3cN28fN59B9uX aWB18w6055zgVZFH2uYonS9u0H9wkMY7JqcLqLe6bpBHOAlVr3LSXxoEDyeyVwXKvvNGxB Imk2oRz96LHk7/vjcydlFXDPGTm+A63+IhJ60iz1edEwLfWeuy9WnelHLJZAPeTO5kEtds J+dlkVlxMJ3EqnR7+2zaRfkKASur2sX1TPe2mgH/kqL0eacC6n8XsJLxVFkWZmtZXchMAi PZVuVtjg9EZcPHz1XI0zUXHhBonkjXfq38ac6Go67rUt5W91U3+wVaRnvBRdwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxRC3L8FzXdL for ; Tue, 17 Feb 2026 23:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3baa0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:57: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: 221c09cab60a - stable/15 - ngctl: Check hook name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 221c09cab60a8257b41be9067f1712d77ba828d8 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:57:59 +0000 Message-Id: <69950087.3baa0.55b65aed@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=221c09cab60a8257b41be9067f1712d77ba828d8 commit 221c09cab60a8257b41be9067f1712d77ba828d8 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:11:48 +0000 ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 (cherry picked from commit 585190dff436eeea3be97300e36c82559028d3dd) --- usr.sbin/ngctl/write.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c index 98bf213a2dad..b86533eca49c 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -34,10 +34,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -62,6 +64,7 @@ WriteCmd(int ac, char **av) struct sockaddr_ng *sag = (struct sockaddr_ng *)sagbuf; u_char buf[BUF_SIZE]; const char *hook; + size_t hooklen; FILE *fp; u_int len; int byte; @@ -71,6 +74,14 @@ WriteCmd(int ac, char **av) if (ac < 3) return (CMDRTN_USAGE); hook = av[1]; + _Static_assert(sizeof(sagbuf) >= + offsetof(struct sockaddr_ng, sg_data) + NG_HOOKSIZ, + "sagbuf is too small for NG_HOOKSIZ"); + hooklen = strlcpy(sag->sg_data, hook, NG_HOOKSIZ); + if (hooklen >= NG_HOOKSIZ) { + warnx("hook name \"%s\" too long", hook); + return (CMDRTN_ERROR); + } /* Get data */ if (strcmp(av[2], "-f") == 0) { @@ -103,11 +114,10 @@ WriteCmd(int ac, char **av) } /* Send data */ - sag->sg_len = 3 + strlen(hook); + sag->sg_len = 3 + hooklen; sag->sg_family = AF_NETGRAPH; - strlcpy(sag->sg_data, hook, sizeof(sagbuf) - 2); - if (sendto(dsock, buf, len, - 0, (struct sockaddr *)sag, sag->sg_len) == -1) { + if (sendto(dsock, buf, len, 0, (struct sockaddr *)sag, + sag->sg_len) < 0) { warn("writing to hook \"%s\"", hook); return (CMDRTN_ERROR); } From nobody Tue Feb 17 23:58: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 4fFxRF2YYbz6SK6v for ; Tue, 17 Feb 2026 23:58: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 4fFxRF0Gsqz4Q15 for ; Tue, 17 Feb 2026 23:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTE4Yowto/YXMREu0eqiWiBYT9zI6ymIN2hQo2USuvw=; b=DZXsLZYn/zKhflO4aOmPACvJGahvOX5kp9ZwolQRVj9sZEWW/jRfFuKqzXz89vf5ouZ/68 Oc8hUbGRQXIxvhnxz+lOO5W+adLvPIHfD7FqDi2mtMa/imDCByFTN949E5/Vt6sXUBxxKL jWN9VP/PejTkn9su6pnLAgkFZT+u+iUXxMVsjkl3qI+u2r9HvhDSY74xqeeJQCL+UpFPxQ 1RL5rY/e+xk6k+E0ZoQqRV4o03icfq2LrHjb28ziba5mXs9+eUkSlyEjsye7J7b7uaxm/5 hUrLORN2eZmrEgIzxWGVcQzTMqwHaTKr+1wPwwESTsmEdppIsk7K2bn8g+gkhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771372681; a=rsa-sha256; cv=none; b=Jw4Lz7VBHBEeY/jSLl8WlK6NMAi+FNr9gzwOhuMOreaS49Z/k1UdRDFIUD6i1I2DsVQyPE kWjhGX8UhC17FVarROBaRPbGWCN2FR/kgCe1nFtTMpmPdqftDA8R8FUnYqgAltX4FSaLM3 M6WaQQjjpdyfmYSipedtEn6mTE2T1RI1Idz10xvOcTgbyo0akwoqf6mxk0iuavSXoO1Gfr vGF13kINqK42ijepHafiViN8RAddk1HRS4IQ42mSRJZ7dPUDvNUJGuwsuo5E1nGgzxQf5R Vq0pzBLvdyUUZm98eugjHrObrh0DuTcU+OY/cgQU4a94GHXI62apiInTmlTu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTE4Yowto/YXMREu0eqiWiBYT9zI6ymIN2hQo2USuvw=; b=JVN7F0D0+zqBDtXEjitFgiIFUUWDxqrFfLLZmuAqF0WkFpnzDtTDRwd0nP1gM/RpEuiWCA qrJ8FxSFAdlu8Rwh0F+6FjGeL5M3jVFqtM3TXXOK/OJ8ibiQZQT6Yla4K+nZh1RVAga0od U7WsKBKImD+oGlimHsce0OW8NPAZDT1kRp3AfxXLo8euVl8R+spdfAtxbsS1gj8Uc57cAe 3UrkdR+a4fASnn0ZuiXp3B+4hASQ5XgEoXRRiCYP9SEuBYAbg7rRQMzmQysmAX3rZqrCqn 3GR8ZFbPf1M0xaQlpJ3vY27kwlEwwsnAB5VctOdr2C8/D7S7O7m1LuBhBfp3bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxRD3lq4zXW0 for ; Tue, 17 Feb 2026 23:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bda8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:58:00 +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: 669347f67a07 - stable/15 - ngctl: Fix buffer overflow in config 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 669347f67a07db17a8b1a748cbc05e859d8095cd Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:58:00 +0000 Message-Id: <69950088.3bda8.34db282f@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=669347f67a07db17a8b1a748cbc05e859d8095cd commit 669347f67a07db17a8b1a748cbc05e859d8095cd Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:11:48 +0000 ngctl: Fix buffer overflow in config command Keep track of our buffer length when assembling the argument list. PR: 293075 MFC after: 1 week Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D55259 (cherry picked from commit 59906a163e474c8d00bdebe226c4d47332b91bad) --- usr.sbin/ngctl/config.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 25cd841494d1..0c9096738efa 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -62,7 +62,7 @@ ConfigCmd(int ac, char **av) struct ng_mesg *const resp = (struct ng_mesg *) sbuf; char *const status = (char *) resp->data; char *path; - char buf[NG_TEXTRESPONSE]; + char buf[NG_TEXTRESPONSE], *pos, *end; int nostat = 0, i; /* Get arguments */ @@ -70,20 +70,26 @@ ConfigCmd(int ac, char **av) return (CMDRTN_USAGE); path = av[1]; - *buf = '\0'; + pos = buf; + end = buf + sizeof(buf); for (i = 2; i < ac; i++) { - if (i != 2) - strcat(buf, " "); - strcat(buf, av[i]); + if (i > 2) { + if (pos == end) + return (CMDRTN_USAGE); + *pos++ = ' '; + } + if ((pos += strlcpy(pos, av[i], end - pos)) >= end) + return (CMDRTN_USAGE); } - + *pos = '\0'; + /* Get node config summary */ if (*buf != '\0') i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, buf, strlen(buf) + 1); + NGM_TEXT_CONFIG, buf, pos - buf + 1); else i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, NULL, 0); + NGM_TEXT_CONFIG, NULL, 0); if (i < 0) { switch (errno) { case EINVAL: From nobody Wed Feb 18 00:08: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 4fFxgv6V7Wz6SKlf for ; Wed, 18 Feb 2026 00:08: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 4fFxgv4JrQz3D1w for ; Wed, 18 Feb 2026 00:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDIvu5RLhR+kqHS9hYSWbzviubhYp2/0ezdNv8GTloo=; b=LkFc3w7DvdPcHskFdfaq4R+IUZaguzufFe6B+bCUaKlZZf6ZsU/6GCEOmvFXJ7xWsNVQsd DddYCpSIyOdztyMoVJqBKgHeZnBrABfKLN0/WkVLko4rWceciw2XpYRUL3OVHT3IXwgOzo +RuzlZY2PFodOCvLjZwhEampKGLapnwK0SxoNnYK7RSKAtuLgghMa1q2gnBZi2NpCBeGzp GM0wSM7fUeziMNFZp9n++LymV04T3zuLpcUksikjud0ZtTGWaVsn4IG4+mZczmTX2zTHfB pIdOD2AZEzTxKa34SkxzaukK0tsJd2/gZmmkNSoawQuBEn+7xSwS4qBhxKwf6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771373339; a=rsa-sha256; cv=none; b=Q4ZCr0ar6bGyx+gh2aYBeVO2xIX50BP5mhhFPR4tPmedjilqlNnyCneIdhsaJgiWXF9P86 7xVN3sq+pdEjvXiWB6VNMZGGBOkoOhBvAhqQnRcYm9xSQ6WK6oZ0epL1uh8v/SgxRmXcOE L8OMvKJWxdhoqiqG0TFR4GlnVFvzX7b2pa1U48Mb3HtYQd5695A9leXrQjCrCo1svjCloh 71Wjl8Tf2U3a3AWhGlQmXxml5q0EvG4vfUmpo5LpULbOEbePLzP+wvHUota+jiNFpVruEd S2cquwXVjU4Bq4lZuItdvrwv53QVoBBm/M6mSdKO9WTy6zQ+y8ME3UKF1vuO2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDIvu5RLhR+kqHS9hYSWbzviubhYp2/0ezdNv8GTloo=; b=N3R4nesmXCAnGMAzjFo81KUjAKLPOqI5r7ZHgFYARii0luTb2vQ2H98/7sqXGuwzhKSDpv b5LyjhjOO8fo+sFjVN9VcPxzIEQpql46FyiQWZEx05A6mHFJCZOj3m8f/BCGCX8QqZfcT1 SPDxfZW0iAovnYfd4sNVaCB6MutzcE7rOpBJT4Q1vY9172Cd5vnNhQgElSVDPz0cPN8FHF ZMW4ohmQoGPy/OKLsqXi/dEtH+DEWZAX/ml2SsDwRvhQOYO2GnC6I7ffvGG8EV/eMUSX30 PacpPRw1NnKGCr8kqsBJR9uB0mQ7u123df+QaPJfO99VCmRH5ao7vAakLCmCWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxgv2W9HzYMY for ; Wed, 18 Feb 2026 00:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:08: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: 71c0f48ab19f - stable/14 - ngctl: Check hook name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 71c0f48ab19fbac3d93e29d8964db2f215ddf722 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:08:59 +0000 Message-Id: <6995031b.3c4a4.69963026@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=71c0f48ab19fbac3d93e29d8964db2f215ddf722 commit 71c0f48ab19fbac3d93e29d8964db2f215ddf722 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:12:02 +0000 ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 (cherry picked from commit 585190dff436eeea3be97300e36c82559028d3dd) --- usr.sbin/ngctl/write.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c index 1e86963fb39c..7ee8dcfaa241 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -35,10 +35,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -63,6 +65,7 @@ WriteCmd(int ac, char **av) struct sockaddr_ng *sag = (struct sockaddr_ng *)sagbuf; u_char buf[BUF_SIZE]; const char *hook; + size_t hooklen; FILE *fp; u_int len; int byte; @@ -72,6 +75,14 @@ WriteCmd(int ac, char **av) if (ac < 3) return (CMDRTN_USAGE); hook = av[1]; + _Static_assert(sizeof(sagbuf) >= + offsetof(struct sockaddr_ng, sg_data) + NG_HOOKSIZ, + "sagbuf is too small for NG_HOOKSIZ"); + hooklen = strlcpy(sag->sg_data, hook, NG_HOOKSIZ); + if (hooklen >= NG_HOOKSIZ) { + warnx("hook name \"%s\" too long", hook); + return (CMDRTN_ERROR); + } /* Get data */ if (strcmp(av[2], "-f") == 0) { @@ -104,11 +115,10 @@ WriteCmd(int ac, char **av) } /* Send data */ - sag->sg_len = 3 + strlen(hook); + sag->sg_len = 3 + hooklen; sag->sg_family = AF_NETGRAPH; - strlcpy(sag->sg_data, hook, sizeof(sagbuf) - 2); - if (sendto(dsock, buf, len, - 0, (struct sockaddr *)sag, sag->sg_len) == -1) { + if (sendto(dsock, buf, len, 0, (struct sockaddr *)sag, + sag->sg_len) < 0) { warn("writing to hook \"%s\"", hook); return (CMDRTN_ERROR); } From nobody Wed Feb 18 00:09: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 4fFxgx0CYmz6SKjK for ; Wed, 18 Feb 2026 00:09: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 4fFxgw3RwCz3D1x for ; Wed, 18 Feb 2026 00:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hVcA9u/Ql6E8k1tYoLmLocDXMaPlgLGyC3dIHl3jip8=; b=sRly78WTTqSUceg0Fe9PZwfTW1fa5HfZ0u0BABeNjBDMn7ROv99VjKOOI7iJm1uC8Mi0aT Xcisj9RqWZTDmsPiUu+V0LcgYvu26Kwt4MeTPfSMsDMobBOJOyO/VEjH8vg08Wq+nZo5EA CR9WJBg+zbLKSrtseGmJjMLNprXyxERTRSmXYdPzNCr3dOIBB665UUlQFwRjjv2qKzQW/O 8RqRP+qYMUbgcbZUZuH6e/lehR/Pvl1yMCT9dfG3t3fCJ+9WPsnA9B1KVrBINnQP+RaiHL 68/vXbAW5JZ+KU1bXNXIiM4RLnVSs9bMJ9V1dY9U9mWh3lFhu+QJHWmUYTvfrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771373340; a=rsa-sha256; cv=none; b=wm30JXNn68KxD8GLv3dIhcpNwCuwxUrKpFatsDxz6AfDC2KllHvVI+9o6EDD6BxIHyyjIu hYYWYf18Lio/K7TnW5gAVRnmesAMwVO7Rgwh/LMmfiRY8+E5vxvDd3nVky6qrTPh1RmnpF NDFqCYAzss7cBJJOZwSmD6JYBrQI7/uYoYX838CEqQthIVo/dWYsWZyBPvRaJSmTryOdEl 86BXIeMtpL9z2trp+NRe9SigFTuvgC+0s9QoJZN9JFQURlezl7L04MmYz7RKJxqe5VIfZ3 +yZ9vhFVj/d+Mll4eDW48mDl/Clp0Cg0pmi0au89fI4fMz6RV07PHn0bzp1q2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hVcA9u/Ql6E8k1tYoLmLocDXMaPlgLGyC3dIHl3jip8=; b=WgC+1zns9F9RxFFcgwO+1Kdk7GxTr1e93DTEh+5N1xyqOMkmEeL9arTNux7hqkJCnvVS2r yZ34EuP1y5SQr5Vm9yvlx9DixNQU4WE2f0NvvkV8wBXDBvAc54EUA39PpbGSirs3Q0x1vf W/vq9rGTmTeBRfi1+BdVabKzyAHQ4kmkAGMFoJvk0c3aqxdVYf/vANR//3P02f4P/cuPGn bz50yN8SqkVbo/nD4MxhNhsuXoeNAPTLN0j3gvXhHzaZ9ylL/Z4WWt3iiiYE8Bqz0Edxrm vO8P87i5EA53M++J9uxOs+WcUh2O57nf5r1YawKcuNMBi9rvA4IiBxaWK8v9aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxgw33jbzYND for ; Wed, 18 Feb 2026 00:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c820 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:09:00 +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: e5bf728058da - stable/14 - ngctl: Fix buffer overflow in config 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e5bf728058da2b9cdc056e49bd82b57310588b3e Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:09:00 +0000 Message-Id: <6995031c.3c820.325e0566@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e5bf728058da2b9cdc056e49bd82b57310588b3e commit e5bf728058da2b9cdc056e49bd82b57310588b3e Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:12:02 +0000 ngctl: Fix buffer overflow in config command Keep track of our buffer length when assembling the argument list. PR: 293075 MFC after: 1 week Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D55259 (cherry picked from commit 59906a163e474c8d00bdebe226c4d47332b91bad) --- usr.sbin/ngctl/config.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 261bc950f570..611975ef5b10 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -62,7 +62,7 @@ ConfigCmd(int ac, char **av) struct ng_mesg *const resp = (struct ng_mesg *) sbuf; char *const status = (char *) resp->data; char *path; - char buf[NG_TEXTRESPONSE]; + char buf[NG_TEXTRESPONSE], *pos, *end; int nostat = 0, i; /* Get arguments */ @@ -70,20 +70,26 @@ ConfigCmd(int ac, char **av) return (CMDRTN_USAGE); path = av[1]; - *buf = '\0'; + pos = buf; + end = buf + sizeof(buf); for (i = 2; i < ac; i++) { - if (i != 2) - strcat(buf, " "); - strcat(buf, av[i]); + if (i > 2) { + if (pos == end) + return (CMDRTN_USAGE); + *pos++ = ' '; + } + if ((pos += strlcpy(pos, av[i], end - pos)) >= end) + return (CMDRTN_USAGE); } - + *pos = '\0'; + /* Get node config summary */ if (*buf != '\0') i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, buf, strlen(buf) + 1); + NGM_TEXT_CONFIG, buf, pos - buf + 1); else i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, NULL, 0); + NGM_TEXT_CONFIG, NULL, 0); if (i < 0) { switch (errno) { case EINVAL: From nobody Wed Feb 18 00:15: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 4fFxq64CvBz6SL2q for ; Wed, 18 Feb 2026 00:15: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 4fFxq618SFz3FNC for ; Wed, 18 Feb 2026 00:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOZ5dg44nUdhATWxcwtiyOZJUc7wkQ9en2YpDTnRmbU=; b=L+4vwVwjjuPRrEkk61ZWWWY5DJR7KI+Ht4nVGB5rorbgMAr1maot+ArJpLzHPt74m38Y5r iNf1oujxIlK5pP1qxt73vhD0zQtGWg+9IbP+szOta5Bs3mwFf4kTJ+QFfTB6wOnT5YiQlZ x09elZ8C0mXTCBCPcT+UZ1RYx5/SOoEMMA0oR+odwMHM9ARRh/UEpV6ymmBatCPPHpGs08 UYNmOZx/I8PufvvfB4F9rx/JYbY/JsmvhrPggIPImNhQlv307YopDcLrzlbvRYsEEvqnft V7Tb3DIcBIO0ESgrMjE7TZLS7n8l4ZNBa1YzMbTql3od0MdCJCcTX//2za4IWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771373714; a=rsa-sha256; cv=none; b=Ve6CGsVGw0H763d10l2L8iSkcPSAgB1JlBSkGAH0PMcDeH4KpdBvz9pDOTop1Pjl/mYvNL hZveyNAHR0Ub1WkxPxfxXKVbiAjjsUC/pQHj2xaZsO0TFka3cwLIteun+0GUgT1aYlHRXD zsw3fQrhRg7RR7TOWzv5XTolaNMJnfQcaMX6YK+VzJBbXHV8GmpwKEij1GOy4/jddbBcnU qBZSc6E4/73/OWQwj2ojdCxLmxzsjG3xfbHDEEeAxSZQaW56rQn8YSlc5rsUri3fJfxFWm PRNhhb/LdGD0E0yK4oH3tv2TvWnK2tq3XG48f+okKdu2Ax0ZFMYUHUyfarkiog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOZ5dg44nUdhATWxcwtiyOZJUc7wkQ9en2YpDTnRmbU=; b=hGUxnUz1C/OvjLz6qCEjqJivqszonjQy8cDavtNbHpOEwyuwFOJZatV53I5bHAOvaQGCBQ ESO/zHvFKTyvSSKEKE9vm09AmgXBYgCfRdfFiLj66PvwEzqzqovPdaF8vIZIITbUevrDpU ckM/5Q1zkojgsG2p3KXU4gSK26UEq+2yvcxcFZNeRzVMTgmhxCUB70a9S0K0OU8K4uERDv zt/O+5WudC1+2iNNltj+KpfZiSnTEq7xbf46fDAWvDeGdkOIBX0wjqxX8s7s1jpaGGyNjo UE0D3iVpqDUG8rmgZt05yM2iMToxofjTn4potIorUNSp2hZxluDQLCF3vhnG3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxq60lnWzXjf for ; Wed, 18 Feb 2026 00:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:15:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: cff16d69d751 - stable/13 - ngctl: Check hook name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cff16d69d75151e280a83695f52db608bab51a49 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:15:14 +0000 Message-Id: <69950492.3d5d4.43402850@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cff16d69d75151e280a83695f52db608bab51a49 commit cff16d69d75151e280a83695f52db608bab51a49 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:12:13 +0000 ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 (cherry picked from commit 585190dff436eeea3be97300e36c82559028d3dd) --- usr.sbin/ngctl/write.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c index 1e86963fb39c..7ee8dcfaa241 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -35,10 +35,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -63,6 +65,7 @@ WriteCmd(int ac, char **av) struct sockaddr_ng *sag = (struct sockaddr_ng *)sagbuf; u_char buf[BUF_SIZE]; const char *hook; + size_t hooklen; FILE *fp; u_int len; int byte; @@ -72,6 +75,14 @@ WriteCmd(int ac, char **av) if (ac < 3) return (CMDRTN_USAGE); hook = av[1]; + _Static_assert(sizeof(sagbuf) >= + offsetof(struct sockaddr_ng, sg_data) + NG_HOOKSIZ, + "sagbuf is too small for NG_HOOKSIZ"); + hooklen = strlcpy(sag->sg_data, hook, NG_HOOKSIZ); + if (hooklen >= NG_HOOKSIZ) { + warnx("hook name \"%s\" too long", hook); + return (CMDRTN_ERROR); + } /* Get data */ if (strcmp(av[2], "-f") == 0) { @@ -104,11 +115,10 @@ WriteCmd(int ac, char **av) } /* Send data */ - sag->sg_len = 3 + strlen(hook); + sag->sg_len = 3 + hooklen; sag->sg_family = AF_NETGRAPH; - strlcpy(sag->sg_data, hook, sizeof(sagbuf) - 2); - if (sendto(dsock, buf, len, - 0, (struct sockaddr *)sag, sag->sg_len) == -1) { + if (sendto(dsock, buf, len, 0, (struct sockaddr *)sag, + sag->sg_len) < 0) { warn("writing to hook \"%s\"", hook); return (CMDRTN_ERROR); } From nobody Wed Feb 18 00:15: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 4fFxq74ylHz6SLDn for ; Wed, 18 Feb 2026 00:15: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 4fFxq726y4z3FTJ for ; Wed, 18 Feb 2026 00:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nI64rqiT3LfnTVhLHlkFTfXnchaII4woPeVdwQB99ko=; b=BxI6vm2QaMZQHlMgGc/tdazP3I8fbx9VBXAQYmKXlYUzb7nEkCAJ7sKcoSwP5rkjurIgs4 SMVHpEqybVqG4x9Jvo9Z704ajs/ZBONqTdZJWhkoM3UqNTL1/Sv9uGIf7vRmpUk7If5tMb REzhbVwJjUJBO1fZ7TQa7m0JVd5Ca1lc5kJvVnOKk3CuHpvMElc08ddhknaXmaEf3hK6Pr VtpLNDUqheriE0RF/rKTH68If/PYErGCCZIrDhH/rxQCcE6+U8wRfnpUO2cXbOWpp7wC/2 uDBiLUY5cF+kuHL2fAeladjZ2Uub/62M9a1wfVTeSIdsxF45oR+DlYeyvv0jKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771373715; a=rsa-sha256; cv=none; b=cv8csqxLgxjTyBFt5Pj/2j0a7OIt2dPvkBBEtIq9OaH9O4pvaedX43/EjtaMh5Av/+wbcK aTr5eExc/fBaOIE1lr4DA8Ue3Zu2KQ2uxY1+aUi/uf3IEl9xC22220VLWww8VRv17OZHNn X6H4jFcLK0+gSdg2EnJTGl5Z3PRXr9Skd3qgTHvsiHYKGGclVk9+l3/bNyv+q/HKko0X6/ OMbWt/Tb8nwX73xL8EyEYSSfWrB5yaJrpt6s41fxSshZD2XB7n3YBUVAlmT9tAr88UgLHJ Q1MJvdORZCoeeHLdrIiiSWIonewpQqQfNYWzmP53xVOST+RqzCk9eqG2KxhHiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nI64rqiT3LfnTVhLHlkFTfXnchaII4woPeVdwQB99ko=; b=RrZiZIYMZFAHnpQ4AKghKFmNj1HwqlZpAZ00BMWdr+E5F5UlvMYw/EG+qvnALZ/7uZEB42 q4T81re3NPzFU6K+Emg1z8BPkJ9sntSBqR230tYb2rZmIiOGEiBJKwSpFCqH0tvlB+3FZF MaP1KovC/n7ZAkU1BIG+Hf+rs6PP6zCG+x0H51cYvFkQghAPS2N3RGiX2VbnVdSs/DsNnX AbCJbW5apfqNY96k8bqZ4U4ShcgrxRzOeAb+NpucYIwJxFvdLfg6sveSw/L5hjXR3CNgLY bQBkGyEm+3s4y8VKJgyYcqkVeRl1bAcmaluGDW1Wx32wpmYUm6Ntuy5A+P/3zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxq71fBjzYrd for ; Wed, 18 Feb 2026 00:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dfc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:15:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2b11bbd790ac - stable/13 - ngctl: Fix buffer overflow in config 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b11bbd790aca47bfd994863b03af7c7b4523e15 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:15:15 +0000 Message-Id: <69950493.3dfc2.6fbdc410@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2b11bbd790aca47bfd994863b03af7c7b4523e15 commit 2b11bbd790aca47bfd994863b03af7c7b4523e15 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:12:13 +0000 ngctl: Fix buffer overflow in config command Keep track of our buffer length when assembling the argument list. PR: 293075 MFC after: 1 week Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D55259 (cherry picked from commit 59906a163e474c8d00bdebe226c4d47332b91bad) --- usr.sbin/ngctl/config.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 261bc950f570..611975ef5b10 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -62,7 +62,7 @@ ConfigCmd(int ac, char **av) struct ng_mesg *const resp = (struct ng_mesg *) sbuf; char *const status = (char *) resp->data; char *path; - char buf[NG_TEXTRESPONSE]; + char buf[NG_TEXTRESPONSE], *pos, *end; int nostat = 0, i; /* Get arguments */ @@ -70,20 +70,26 @@ ConfigCmd(int ac, char **av) return (CMDRTN_USAGE); path = av[1]; - *buf = '\0'; + pos = buf; + end = buf + sizeof(buf); for (i = 2; i < ac; i++) { - if (i != 2) - strcat(buf, " "); - strcat(buf, av[i]); + if (i > 2) { + if (pos == end) + return (CMDRTN_USAGE); + *pos++ = ' '; + } + if ((pos += strlcpy(pos, av[i], end - pos)) >= end) + return (CMDRTN_USAGE); } - + *pos = '\0'; + /* Get node config summary */ if (*buf != '\0') i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, buf, strlen(buf) + 1); + NGM_TEXT_CONFIG, buf, pos - buf + 1); else i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, NULL, 0); + NGM_TEXT_CONFIG, NULL, 0); if (i < 0) { switch (errno) { case EINVAL: From nobody Wed Feb 18 00:25: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 4fFy3N5jxmz6SM5s for ; Wed, 18 Feb 2026 00:25: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 4fFy3N4tcGz3GZF for ; Wed, 18 Feb 2026 00:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCzFe0uKo1q3Fuu0GOa/nbZEb5W8QRLU0rAV88FIDl0=; b=feFWiZgmZ6M7ObtaJ8mhr4yLPo3HZP+UnRoF9+8pT88yxGjcnXJM1SMNC+bC9Q8JIU0nR9 3udlsSF3XlqawIT/TX15xgSS9jzIXOC/8+kPcMdXmC6LY3wQPjgDWGCUi7mW/X8bpTg6SF lkYmiRJNsyG33crAg+rdgseql+tBF78u98/DW6v3ETMfdxXsRn+IaPQ2wtWS1fL9wBpI3b EYWHOoc1fIC7i4AOtl92BhOlEAN24uwrVu31f1PzHeWAWRi8n6w5PT0a1VfIBFHOC2kA1X RAK8mHmDVHL/TrDAVaBIacsKxw1zGTXISjO8gocDMYdRhCK2rvV2Hj11bf1KTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374352; a=rsa-sha256; cv=none; b=BXDSVXZAXU+VI96Jc5j7QpaiJpEM41UDvr/9eUEEPljIWhIcTWbsaVhreDbFulomuwm8xq K144v3RlZSIXBWPja4H294rbAiMy+zFGafKjrbH5slrE+zkZqrRBa3ydGKsZovYNghqVhE NEoQLtTC2JFZCFy3YdQxKDLPVRaRtnM/k5clal9Os3nHzHg36G6p9XBCtiPQ/IOh5YRlnJ ArE7Gj+4cpUBSh05GJrYi9H8BBmmef/YZabSH0/RkWo0Kos3bYpvETPojfGJxVUsthdCMp RzhgsY3izLzhJqYfPTni6Y5GVOKqUhDUCbV33Tg+qco/JJbY+KrXc8rmabD/Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCzFe0uKo1q3Fuu0GOa/nbZEb5W8QRLU0rAV88FIDl0=; b=Xd/eylN8PNxSevpXaUEKiNxnmI/4Iv3Ug4+xySjHZ8iA5XmvbIh+XvMf7fH8hwMmDBS9Jz jrrXBIcmO99pVybV3bKEY18vKKGqZ51YJkK5N1FABpPVrgGmQ/ad4/a5EFhInrG4aoH9Wl UcWNMx/5+sugMuU4iAnWxam+YsMoga1jnFhTWUVyjN6w7bJVgEz0g1HS3vv/VqUKF5JnVa uGihDlM6287ZCxduggB43eGVR7vFc6PoljPXJmAPPNRBsDH8aknxhTOfWJO6vC08uArjwz BZ2BYnU9MABC/aivRkJ92US2oRP3kF44Q0nPeH/5Z4QzNmHB22y5eQBEsvYeTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3N4Hd3zY64 for ; Wed, 18 Feb 2026 00:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dfeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:25:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 6458b1a2fde1 - stable/15 - nvme: Use __diagused instead of __unused List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 6458b1a2fde14c6f58377d58231ccd490359a232 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:25:52 +0000 Message-Id: <69950710.3dfeb.51e99133@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6458b1a2fde14c6f58377d58231ccd490359a232 commit 6458b1a2fde14c6f58377d58231ccd490359a232 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 16:09:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:15:34 +0000 nvme: Use __diagused instead of __unused Reviewed by: imp Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. (cherry picked from commit 1c09ae2be059da0b945a2543ac7dd0bd5198d0e3) --- sys/dev/nvme/nvme_qpair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 4f2c44da3b4f..f7dc231d74df 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1209,7 +1209,7 @@ nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req) static void nvme_qpair_enable(struct nvme_qpair *qpair) { - bool is_admin __unused = qpair == &qpair->ctrlr->adminq; + bool is_admin __diagused = qpair == &qpair->ctrlr->adminq; if (mtx_initialized(&qpair->recovery)) mtx_assert(&qpair->recovery, MA_OWNED); From nobody Wed Feb 18 00:25: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 4fFy3P704lz6SM5v for ; Wed, 18 Feb 2026 00:25: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 4fFy3P5mZdz3GGv for ; Wed, 18 Feb 2026 00:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxIXw500i+fuZjYbmk/NcQIHROfQN4uu8PloojIMR5g=; b=JqzvGereCSystQqeXTUtStEPnUND9k/kVbjjpXPR4wFa53h5oB+t/FFoXuxmgYOi1oQpoq PQ/UQWkuHKzc3KictIFo0OmSWppCTC37E/j5L+0LBSLk4wbg0AC5Zf5DKzM+EhdaEs0oOW DiSr3rLRzclwPgtNTRbmlhgjb2X/ptlSyzlc67hfEn7hOkShSz6y5OPdYJ8zv2tPqUhTYC slsPKALWD+4ATxBOPklDrCmhyqkR5D2FpESOOT3y2oI7dEHNwQGb/Dhu1FFbf+E4ehgUi7 FaS5ED3yTp7k8VK22VxQgIDqvwboRSFnxasCdyE9OvwJMvSWx+oQYyS7fYTbTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374353; a=rsa-sha256; cv=none; b=hplRKONL3EEIvm923nrigAtnfVyzgQIiC1fTE6pHQj1HzJAo47WTYFo5D2yiIwjz8A8lGN ucz9Ns7gkeoPjV+Xc5WeK/NNJT/0v7vV11IZH9w21qsxYgKAxx5tJP/H92788ZS3o6L1xb bGIWTEaGYgWjXiYmCckE/V/UGzYoPBdXkdWQE9vOX89Y3iA6CtR463tf/RMf7EYA1odXLO IGB3GQVo+m91mnYG3VMcYToV3HAyb6LnUX8gPjyO1mI6HC3Vgql66iRm5eXyB+/sHGU2Se WXNRiuv7JvJ4fW+IFtNIH++qGL3/9krAFkPA4FfZ76C06MP7S0jYsNnmiIFsOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxIXw500i+fuZjYbmk/NcQIHROfQN4uu8PloojIMR5g=; b=HHTj9uQf9jHC+vI5DTRMzOHBD8iCCUxNWGZ3/jOYQ4exZUpwjHxKiYBJwVBrAVrgAuB+MI SiT0Txay0bySQo3QwhlGRqQOsx2mtY2Oa5I+oBTfuWnlmpWYD3VP3cUkJSGvLNe7OgM3pA jNMRXr1cpSr7NpNPn571w87PQKI99ez3HC30j2ZlQQRNRfXjke5P3uY+BXsGZ5n2IiltzP P3ZdILZ0NtyGqPxdsbLzVcqscYbiCryE8oKJPzsz39sKyvTKsefyyOx5mLP9X0ICvQM2nJ 2PMqSJTi8FQeXvaFOWdFqX5URO8M8ngX70s7LxNVZf122izNv6/apJCn+BiJ/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 4fFy3P56DSzYsD for ; Wed, 18 Feb 2026 00:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e48f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:25:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3562c80f4144 - stable/15 - nvme: Use size_t for payload 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3562c80f41446550829728edf7b6ee695563dc66 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:25:53 +0000 Message-Id: <69950711.3e48f.6dc4b6a5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3562c80f41446550829728edf7b6ee695563dc66 commit 3562c80f41446550829728edf7b6ee695563dc66 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 18:37:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:15:34 +0000 nvme: Use size_t for payload size Using uint32_t here can cause spurious compiler warnings. I assume it was done to constrain the range; use a KASSERT instead. Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55279 (cherry picked from commit be7e4dc878eab090cd411c9ef28880e4f62116f5) --- sys/dev/nvme/nvme_private.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index dd45e1acd0aa..8b5737dfb72b 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -504,11 +504,13 @@ _nvme_allocate_request(const int how, nvme_cb_fn_t cb_fn, void *cb_arg) } static __inline struct nvme_request * -nvme_allocate_request_vaddr(void *payload, uint32_t payload_size, +nvme_allocate_request_vaddr(void *payload, size_t payload_size, const int how, nvme_cb_fn_t cb_fn, void *cb_arg) { struct nvme_request *req; + KASSERT(payload_size <= UINT32_MAX, + ("payload size %zu exceeds maximum", payload_size)); req = _nvme_allocate_request(how, cb_fn, cb_arg); if (req != NULL) { req->payload = memdesc_vaddr(payload, payload_size); From nobody Wed Feb 18 00:25:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3R266tz6SM5y for ; Wed, 18 Feb 2026 00:25: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 4fFy3Q6Qcdz3GH8 for ; Wed, 18 Feb 2026 00:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOZtgoQHpCd/X7UJbfmtse9M28RFZl6hI9U6M/HY2Dg=; b=iex60Y3+95/H6eYoy7dnE39ul70N/UX66DvBZr/gBjoQiBJHM6i8Adr3Svpi9mrNITNAEh 9ki7n4BuNzKj9/JP8V347wlRZ6DD0MYtvCqBT8QG7oLj8yqgAhey0NHNgUmB4wBhRp2iTq f4Vl67AKDHheDcXZTo+IxJqrr00jKrT0qaJvXCC2kiqyP0vhW6CIPz473vGAhgkz/vQyvm rgSsCylfPixuHG7nT5mlG/PrWlgWUrnMoinJVJgnLtYMg+t2w/RwoCxqjcLgf7Vx+IL+NH M1P03f3k6v1HeYXEhFtDKcMLqVVr4qCqDdNilLI3behdqcutsv+Ip0kPt1ROUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374354; a=rsa-sha256; cv=none; b=ZH6G4JELB/bIYuh9Bg7P70o+5mdgDZ9K2PFbvDyI9GQuzw5TO6/Nvt5jxLVu5vWJGjf8N/ weYBSxgDDMAKgu3ozH5pXTxjbPlNExTyeKWHU42+PmvQxPW8NXbjbpo3G8hw8BstO8taBA yqCkGAXFnxgR837syEOmfLy/p/EQCuv+50H/1gDiRWTAHMZXM9lWE4NPdFoI/DYEx9Ov65 ydvXTY2bveKKgDQ6o0bOWv/kcDtEiEMT/G+TJAOznpgXb/XynHp7fbRYk+7GM/QD+W93AQ VsNb4jUWWssYo7Um0oPBkiJCKJi8y26wEpvTihGjDqHJjdarMlbNvVK9zELJxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOZtgoQHpCd/X7UJbfmtse9M28RFZl6hI9U6M/HY2Dg=; b=bmSFyjPgbLcVKqurm8hqu7/ms7HjPJZ1rU+zxmMmM6OrEY2EZ4wsECXnJZ/ltg7RbRutJo i6Yd093uFQZ0M4Tq0NzeRUthgy6UVozmjq2xLB2s3ZE59iTx1vuBiqS4r29ZFdwqPu5K4o lT7R/3qlmQjY74zHyJNGPPIdIYDOD3OGZH1vfOU2Da/xtPE9DXmaztjqM/Rz8y7j3Vnxxp CT32QFUDEtbE/8PeIkKa8BzBDj3vzuvUgrPf+bKgqBfj8GoxVinewuTeQpVZw83gEhVWmi Rkvebl+b24nYBhGznjnQMsaDGHn8rFi7htXVDSi+/YW7djEd2xkG5GV/lCPDLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3Q5z0FzY67 for ; Wed, 18 Feb 2026 00:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d743 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:25:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 23a8479c702b - stable/15 - diff: Tweak range of -C and -U arguments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 23a8479c702b17d930718c2cdeb75ba8e44cd4c5 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:25:54 +0000 Message-Id: <69950712.3d743.6a754d52@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=23a8479c702b17d930718c2cdeb75ba8e44cd4c5 commit 23a8479c702b17d930718c2cdeb75ba8e44cd4c5 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:15:34 +0000 diff: Tweak range of -C and -U arguments POSIX uses the terms “positive decimal integer” for -C and “non-negative decimal integer” for -U, which translates into lower bounds of 1 for -C and 0 for -U. POSIX does not specify a minimum upper bound for either mode, but as of 5fc739eb5949 both our backends support context sizes up to and including INT_MAX, so use that. Having had the opportunity to consult the Unix System Test Suite, the diff test cases found therein happen to precisely match these bounds. While here, switch to using strtonum() to parse numerical arguments, and try to be more consistent in how we report usage errors. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55261 (cherry picked from commit 790f1d1cc5fa892ba59fd7f239b22064c8ab14c7) --- usr.bin/diff/diff.c | 44 +++++++++++++++++------------ usr.bin/diff/tests/diff_test.sh | 62 +++++++++++++++++++++++++---------------- 2 files changed, 64 insertions(+), 42 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 9bf3f2ad79eb..b5fa12268bac 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -137,10 +137,9 @@ static bool do_color(void); int main(int argc, char **argv) { - const char *errstr = NULL; - char *ep, **oargv; - long l; - int ch, dflags, lastch, gotstdin, prevoptind, newarg; + const char *errstr; + char **oargv; + int ch, dflags, lastch, gotstdin, prevoptind, newarg; oargv = argv; gotstdin = 0; @@ -177,7 +176,7 @@ main(int argc, char **argv) } if (diff_algorithm == D_DIFFNONE) { - printf("unknown algorithm: %s\n", optarg); + warnx("unknown algorithm: %s", optarg); usage(); } break; @@ -194,10 +193,13 @@ main(int argc, char **argv) cflag = true; diff_format = D_CONTEXT; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 1, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'd': @@ -294,10 +296,13 @@ main(int argc, char **argv) conflicting_format(); diff_format = D_UNIFIED; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 0, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'w': @@ -305,8 +310,8 @@ main(int argc, char **argv) break; case 'W': width = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) { - warnx("Invalid argument for width"); + if (errstr != NULL) { + warnx("width is %s: %s", errstr, optarg); usage(); } break; @@ -346,8 +351,8 @@ main(int argc, char **argv) break; case OPT_TSIZE: tabsize = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) { - warnx("Invalid argument for tabsize"); + if (errstr != NULL) { + warnx("tabsize is %s: %s", errstr, optarg); usage(); } break; @@ -364,9 +369,12 @@ main(int argc, char **argv) colorflag = COLORFLAG_ALWAYS; else if (strncmp(optarg, "never", 5) == 0) colorflag = COLORFLAG_NEVER; - else - errx(2, "unsupported --color value '%s' (must be always, auto, or never)", - optarg); + else { + warnx("unsupported --color value " + "(must be always, auto, or never): " + "%s", optarg); + usage(); + } break; case OPT_NO_DEREFERENCE: noderef = true; diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 0d3acf50edf9..3afd12355a80 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -24,8 +24,8 @@ atf_test_case functionname atf_test_case noderef atf_test_case ignorecase atf_test_case dirloop -atf_test_case bigc -atf_test_case bigu +atf_test_case crange +atf_test_case urange atf_test_case prleak atf_test_case same @@ -389,34 +389,48 @@ dirloop_body() atf_check diff -r a b } -bigc_head() +crange_head() { - atf_set "descr" "Context diff with very large context" + atf_set "descr" "Context diff context length range" } -bigc_body() +crange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'--- 1,3 ---' \ - diff -C$(((1<<31)-2)) a b - atf_check -s exit:1 -o match:'--- 1,3 ---' \ - diff -Astone -C$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -C-1 a b + atf_check -s exit:2 -e match:'too small' \ + diff -C0 a b + atf_check -s exit:1 -o match:'--- 2,4 ---' \ + diff -C1 a b + atf_check -s exit:1 -o match:'--- 2,4 ---' \ + diff -Astone -C1 a b + atf_check -s exit:2 -e match:'too large' \ + diff -C$((1<<31)) a b + atf_check -s exit:1 -o match:'--- 1,5 ---' \ + diff -C$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'--- 1,5 ---' \ + diff -Astone -C$(((1<<31)-1)) a b } -bigu_head() +urange_head() { - atf_set "descr" "Unified diff with very large context" + atf_set "descr" "Unified diff context length range" } -bigu_body() +urange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ - diff -U$(((1<<31)-2)) a b - atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ - diff -Astone -U$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -U-1 a b + atf_check -s exit:1 -o match:'^@@ -3 \+3 @@$' \ + diff -U0 a b + atf_check -s exit:2 -e match:'too large' \ + diff -U$((1<<31)) a b + atf_check -s exit:1 -o match:'^@@ -1,5 \+1,5 @@$' \ + diff -U$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'^@@ -1,5 \+1,5 @@$' \ + diff -Astone -U$(((1<<31)-1)) a b } prleak_head() @@ -485,8 +499,8 @@ atf_init_test_cases() atf_add_test_case noderef atf_add_test_case ignorecase atf_add_test_case dirloop - atf_add_test_case bigc - atf_add_test_case bigu + atf_add_test_case crange + atf_add_test_case urange atf_add_test_case prleak atf_add_test_case same } From nobody Wed Feb 18 00:25: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 4fFy3S21mmz6SM7w for ; Wed, 18 Feb 2026 00:25: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 4fFy3R6yPjz3GX7 for ; Wed, 18 Feb 2026 00:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5pWvu3x9Dtb1BCSoN9sBeaHozF3uXWWe0IberNDDT6c=; b=Jt5fPLV3ogP/i5Z1F/6uVQ6y1xiM7X5pRq8lkId5XW2b0Dw2xvkeKwjjoUy5f6Tf14LnnQ FjejRBrEFHA6repblUvEZtXLIEm1V5I81rclor1giyIcnl004Nn1/LjMTXbAAtk+/gaq+7 NBwk6JqdeIGl3jAzrqS2JI9aBE+mOP8NplHU89bF3oAnZ+3KFLQM3S65NU3jFpdMVN4nXJ Mb/64ZcpASR8UH2MAwry/KfDW5o4LbUhkk/22jbTxMFJ+M4VBay4oh/reOlzILBLsUVILT KG1NEReur/FoE4G9OO2es+rsrMzDXoGYhaudv34JcpovSao5XGTVyx0mLj4+2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374356; a=rsa-sha256; cv=none; b=hwpdss4k9noXPVJJmLvHR1RDbr9+n0Fgrm59zLJzFbfnur+AjpdaF+A5NAmJwHZa2YQVaV yHYoqBxIqCpdr6/AOfTnHNvpwICpoBu8AAkcIMnii/t7gNYXjV1dQd9u6HxNERid+A0ygf LLGDWXNr3eD5wrACG/LvQF8PmcVrzyVbiqmRZQPoq/OSl3CL3R9OuyS2IcJs1T2P96q6HF rkGryemdYvZND87k3RdgCNl6q4ustGdOYMVrSXREKWR/saAcpRoj09c0dr/7rsyJydAEl2 SsQLHyCYc/+Dv0QMsiixiiVlRx5VRI9Xx2lLADoH6Z4MoBackX47bTfHxq+j4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5pWvu3x9Dtb1BCSoN9sBeaHozF3uXWWe0IberNDDT6c=; b=iE8P0OUVVgauhHW9aBvxIPxZHvi4WbUOSwl3QEzqqDK/0W8Qbz8sfddmtto7JcigAsptGa gAaxHpb8qijDyzCbG3gygJYjqAtgin8rT/elJ2R5yoGcD8ilww3yylZNiFZiHzhIOTMRV+ C49KXlScAAN1BXkKTiWf9hj6okjgqqgNrIAinxxTWf0XRE78vEoGzeh09//ep4s5fj+2Dc I6GO97fRAmQKnasMzZ0oP3utHvvtLA9H1aRB/Ms9O1MrPs7JgYZWaeq7hx4LWtslfnT0Bz jV9h5AlImm+YDKb2Z5Qc6dW4XYbAF/aDEAglxuCHSe/STxag3YpwJ+90hFN2Hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3R6LDFzYsF for ; Wed, 18 Feb 2026 00:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d747 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:25:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 608d3c746d1b - stable/15 - diff: Tweak recursion tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 608d3c746d1baf9f96b1655564582c7742465b16 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:25:55 +0000 Message-Id: <69950713.3d747.503a6b21@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=608d3c746d1baf9f96b1655564582c7742465b16 commit 608d3c746d1baf9f96b1655564582c7742465b16 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:15:34 +0000 diff: Tweak recursion tests The -r flag is not required to compare two directories; it is only required to compare them recursively, i.e. descend into their common subdirectories. Adjust tests that use -r needlessly, and adjust the dirloop test to verify that these two cases remain distinct. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55262 (cherry picked from commit b2532432971fbd9339a9a49eca1b532978bb6d48) --- usr.bin/diff/tests/diff_test.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 3afd12355a80..872103b24cef 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -1,4 +1,3 @@ - atf_test_case simple atf_test_case unified atf_test_case header @@ -191,19 +190,19 @@ brief_format_body() atf_check \ -s exit:1 \ -o inline:"Files A/test-file and B/test-file differ\n" \ - diff -rq A B + diff -q A B atf_check diff -rq A C atf_check \ -s exit:1 \ -o inline:"Only in D: another-test-file\n" \ - diff -rq A D + diff -q A D atf_check \ -s exit:1 \ -o inline:"Files A/another-test-file and D/another-test-file differ\n" \ - diff -Nrq A D + diff -Nq A D } Bflag_body() @@ -225,9 +224,9 @@ Nflag_body() { atf_check -x 'printf "foo" > A' - atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE - atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A - atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 } tabsize_body() @@ -339,23 +338,23 @@ noderef_body() atf_check ln -s $(pwd)/test-file B/test-file - atf_check -o empty -s exit:0 diff -r A B + atf_check -o empty -s exit:0 diff A B atf_check -o inline:"File A/test-file is a file while file B/test-file is a symbolic link\n" \ - -s exit:1 diff -r --no-dereference A B + -s exit:1 diff --no-dereference A B # both test files are now the same symbolic link atf_check rm A/test-file atf_check ln -s $(pwd)/test-file A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o empty -s exit:0 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o empty -s exit:0 diff --no-dereference A B # make test files different symbolic links, but same contents atf_check unlink A/test-file atf_check ln -s $(pwd)/test-file2 A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff --no-dereference A B } ignorecase_body() @@ -366,7 +365,7 @@ ignorecase_body() atf_check -x "echo hello > A/foo" atf_check -x "echo hello > B/FOO" - atf_check -o empty -s exit:0 diff -u -r --ignore-file-name-case A B + atf_check -o empty -s exit:0 diff -u --ignore-file-name-case A B } dirloop_head() @@ -378,6 +377,9 @@ dirloop_body() atf_check mkdir -p a/foo/bar atf_check ln -s .. a/foo/bar/up atf_check cp -a a b + atf_check \ + -o inline:"Common subdirectories: a/foo and b/foo\n" \ + diff a b atf_check \ -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \ From nobody Wed Feb 18 00:25:57 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3T36cXz6SM7x for ; Wed, 18 Feb 2026 00:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFy3T0kQqz3GlR for ; Wed, 18 Feb 2026 00:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HybnOtY7SFl6iWJbWzd8CcrhodVYAPOGJ+JbwtLX/NE=; b=jtByWlGq9EWHn9Ma/Li6cUk1ZkAhCToZypEcVnxVDN14sJoyuqgFG0tEpqeS8fLA1jFaw/ H4VPj/OYEaAKiTP4WK+BpdoKy/wcQfq7DaegZBV9kz/KiGrDZzHnm6g4M9bshv/pDmRW4L HmemJ29E1cH/QqR8u3leRfx4PFQpR4ypClHr9EmocbFM5BFR0tC85BNMHCinUOmiEA4yuS Eogc4s6G1bu/CIwDt8F/2zU0mM3+zFW4PIpk6jiJKfdJqrd/L633XF9glWUNPZV+n+Bt03 tbRVGw65EJomVw/xhq6PZw+kqiDHB10xYnIpQ9Q3EmuEUCSaJoM8HbCIbBq2Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374357; a=rsa-sha256; cv=none; b=ZedwxolUYGYq4tQq/AOtjXFsWYzqtFEaFwiengKkyIJxlIS1GUUF6j+29DTw1kmAuCbRpF bPyiy2r+W/3rvsxo73YcAR5ILqSEuNJ2Cw3JICp9ixrnkHC9aWCnbaAObw6X/VPbPp9Vbg WJJ5LeIMBMcgEgR34AzgQucVK+hkK+zTOJNyZc2aGRDOH40NvhC5VDgr5Z2iOq3Sd5bolT 1yhDSCZ3w6bN2fvF0GKB3TZyXph44T8Jgxd5p9CEfqeNz0KS3aYMbT4+9Qp4HMBzrsIKGd 9+mVK3CxyfBvvHD0dA2jxftRO7oPHg46OrYoJnDCsGNehmQCnOrTKIx623/1EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HybnOtY7SFl6iWJbWzd8CcrhodVYAPOGJ+JbwtLX/NE=; b=V7wM3NDpHp1HtPRU2l4OON5pZlU0c1P8ZqZLiUuUMjimNP/FsCwukRszVgPpUKJF+vtSw/ BcUgV9nNgIeIosiJNPIkdONhc9gwb39bu46XaZwnlNbRtI1ULcwf5R1sB+h2QGw9Q/3ZHZ uFHVsQNSUWCz8Ltrjf0zaGD4uSQM+cM6/7vMU7AT7IpWHSGFZquhiD8nUbbeQrxWT5BReR iCWF5HUKMh7eZMXW4jjkaVq9QCf0r5BbevvqbtuhaCC1iBCbeVOtLXflcdXcUHO6wnpBiF vFPuWVzrHibHlASkrlQcPzGYCYL9izEEwMj+LHiL1fwJnoss2OnclHBSzvunxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3T04MvzYjx for ; Wed, 18 Feb 2026 00:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e392 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:25:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3bfe51c7252a - stable/15 - timeout: Clean up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3bfe51c7252ac3e61ab00208e63c0baad8d7229e Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:25:57 +0000 Message-Id: <69950715.3e392.6f36294f@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3bfe51c7252ac3e61ab00208e63c0baad8d7229e commit 3bfe51c7252ac3e61ab00208e63c0baad8d7229e Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:15:34 +0000 timeout: Clean up * Annotate logv() and fix format string bug. * Don't reinvent str2sig(3). * Reorganize kill_self() so we unblock signals as late as possible, and use raise(2) instead of kill(2). * Explicitly close unused pipe descriptors. * Use correct type to collect result of read(2) and write(2). * Compare return values to 0, not -1. * Sort local variables according to style(9). * Reduce unnecessary nesting. * Reindent. * Fix typo in manual page. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55277 (cherry picked from commit 08208cd694815cc855835960f55231342eb35934) --- bin/timeout/timeout.1 | 2 +- bin/timeout/timeout.c | 156 +++++++++++++++++++++++--------------------------- 2 files changed, 73 insertions(+), 85 deletions(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 6486ccf99a36..0a9754a2cc4e 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -188,7 +188,7 @@ will terminate itself with the same signal if the is terminated by a signal. .Pp If an error occurred, the following exit values are returned: -.Bl -tag -offset indent with indent -compact +.Bl -tag -offset indent -width indent -compact .It 125 An error other than the two described below occurred. For example, an invalid duration or signal was specified. diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 58a5797f3eaf..5f045653f35b 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include #include #include +#include #include #include #include @@ -60,14 +60,14 @@ static void __dead2 usage(void) { fprintf(stderr, - "Usage: %s [-f | --foreground] [-k time | --kill-after time]" - " [-p | --preserve-status] [-s signal | --signal signal] " - " [-v | --verbose] [arg ...]\n", - getprogname()); + "Usage: %s [-f | --foreground] [-k time | --kill-after time]" + " [-p | --preserve-status] [-s signal | --signal signal] " + " [-v | --verbose] [arg ...]\n", + getprogname()); exit(EXIT_FAILURE); } -static void +static void __printflike(1, 2) logv(const char *fmt, ...) { va_list ap; @@ -118,26 +118,6 @@ parse_duration(const char *duration) return (ret); } -static int -parse_signal(const char *str) -{ - int sig, i; - const char *errstr; - - sig = strtonum(str, 1, sys_nsig - 1, &errstr); - if (errstr == NULL) - return (sig); - - if (strncasecmp(str, "SIG", 3) == 0) - str += 3; - for (i = 1; i < sys_nsig; i++) { - if (strcasecmp(str, sys_signame[i]) == 0) - return (i); - } - - errx(EXIT_INVALID, "invalid signal"); -} - static void sig_handler(int signo) { @@ -188,28 +168,22 @@ static void send_sig(pid_t pid, int signo, bool foreground) { struct procctl_reaper_kill rk; - int error; logv("sending signal %s(%d) to command '%s'", - sys_signame[signo], signo, command); + sys_signame[signo], signo, command); if (foreground) { - if (kill(pid, signo) == -1) { - if (errno != ESRCH) - warn("kill(%d, %s)", (int)pid, - sys_signame[signo]); - } + if (kill(pid, signo) < 0 && errno != ESRCH) + warn("kill(%d, %s)", (int)pid, sys_signame[signo]); } else { memset(&rk, 0, sizeof(rk)); rk.rk_sig = signo; - error = procctl(P_PID, getpid(), PROC_REAP_KILL, &rk); - if (error == 0 || (error == -1 && errno == ESRCH)) - ; - else if (error == -1) { + if (procctl(P_PID, getpid(), PROC_REAP_KILL, &rk) < 0 && + errno != ESRCH) { warn("procctl(PROC_REAP_KILL)"); - if (rk.rk_fpid > 0) - warnx( - "failed to signal some processes: first pid=%d", - (int)rk.rk_fpid); + if (rk.rk_fpid > 0) { + warnx("failed to signal some processes:" + " first pid=%d", (int)rk.rk_fpid); + } } logv("signaled %u processes", rk.rk_killed); } @@ -222,7 +196,7 @@ send_sig(pid_t pid, int signo, bool foreground) */ if (signo != SIGKILL && signo != SIGSTOP && signo != SIGCONT) { logv("sending signal %s(%d) to command '%s'", - sys_signame[SIGCONT], SIGCONT, command); + sys_signame[SIGCONT], SIGCONT, command); if (foreground) { kill(pid, SIGCONT); } else { @@ -245,7 +219,7 @@ set_interval(double iv) tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL); } - if (setitimer(ITIMER_REAL, &tim, NULL) == -1) + if (setitimer(ITIMER_REAL, &tim, NULL) < 0) err(EXIT_FAILURE, "setitimer()"); } @@ -261,20 +235,20 @@ kill_self(int signo) sigset_t mask; struct rlimit rl; + logv("killing self with signal %s(%d)", sys_signame[signo], signo); + + /* Disable core generation. */ + memset(&rl, 0, sizeof(rl)); + setrlimit(RLIMIT_CORE, &rl); + /* Reset the signal disposition and make sure it's unblocked. */ signal(signo, SIG_DFL); sigfillset(&mask); sigdelset(&mask, signo); sigprocmask(SIG_SETMASK, &mask, NULL); - /* Disable core generation. */ - memset(&rl, 0, sizeof(rl)); - setrlimit(RLIMIT_CORE, &rl); - - logv("killing self with signal %s(%d)", sys_signame[signo], signo); - kill(getpid(), signo); - err(128 + signo, "signal %s(%d) failed to kill self", - sys_signame[signo], signo); + raise(signo); + err(128 + signo, "raise(%d)", signo); } static void @@ -285,7 +259,7 @@ log_termination(const char *name, const siginfo_t *si) } else if (si->si_code == CLD_DUMPED || si->si_code == CLD_KILLED) { logv("%s: pid=%d, sig=%d", name, si->si_pid, si->si_status); } else { - logv("%s: pid=%d, reason=%d, status=%d", si->si_pid, + logv("%s: pid=%d, reason=%d, status=%d", name, si->si_pid, si->si_code, si->si_status); } } @@ -293,22 +267,23 @@ log_termination(const char *name, const siginfo_t *si) int main(int argc, char **argv) { + struct procctl_reaper_status info; + siginfo_t si, child_si; + struct sigaction sa; + sigset_t zeromask, allmask, oldmask; + double first_kill; + double second_kill = 0; + ssize_t error; + pid_t pid; + int pp[2]; int ch, sig; int pstat = 0; - pid_t pid; - int pp[2], error; char c; - double first_kill; - double second_kill = 0; bool foreground = false; bool preserve = false; bool timedout = false; bool do_second_kill = false; bool child_done = false; - sigset_t zeromask, allmask, oldmask; - struct sigaction sa; - struct procctl_reaper_status info; - siginfo_t si, child_si; const char optstr[] = "+fhk:ps:v"; const struct option longopts[] = { @@ -334,7 +309,8 @@ main(int argc, char **argv) preserve = true; break; case 's': - killsig = parse_signal(optarg); + if (str2sig(optarg, &killsig) != 0) + errx(EXIT_INVALID, "invalid signal"); break; case 'v': verbose = true; @@ -358,22 +334,22 @@ main(int argc, char **argv) if (!foreground) { /* Acquire a reaper */ - if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) == -1) + if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) < 0) err(EXIT_FAILURE, "procctl(PROC_REAP_ACQUIRE)"); } /* Block all signals to avoid racing against the child. */ sigfillset(&allmask); - if (sigprocmask(SIG_BLOCK, &allmask, &oldmask) == -1) + if (sigprocmask(SIG_BLOCK, &allmask, &oldmask) < 0) err(EXIT_FAILURE, "sigprocmask()"); - if (pipe2(pp, O_CLOEXEC) == -1) + if (pipe2(pp, O_CLOEXEC) < 0) err(EXIT_FAILURE, "pipe2"); pid = fork(); - if (pid == -1) { + if (pid < 0) err(EXIT_FAILURE, "fork()"); - } else if (pid == 0) { + if (pid == 0) { /* * child process * @@ -382,11 +358,12 @@ main(int argc, char **argv) * inherited, except for the signal to be sent upon timeout. */ signal(killsig, SIG_DFL); - if (sigprocmask(SIG_SETMASK, &oldmask, NULL) == -1) + if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0) err(EXIT_FAILURE, "sigprocmask(oldmask)"); + (void)close(pp[1]); error = read(pp[0], &c, 1); - if (error == -1) + if (error < 0) err(EXIT_FAILURE, "read from control pipe"); if (error == 0) errx(EXIT_FAILURE, "eof from control pipe"); @@ -396,6 +373,7 @@ main(int argc, char **argv) } /* parent continues here */ + (void)close(pp[0]); /* Catch all signals in order to propagate them. */ memset(&sa, 0, sizeof(sa)); @@ -403,25 +381,36 @@ main(int argc, char **argv) sa.sa_handler = sig_handler; sa.sa_flags = SA_RESTART; for (sig = 1; sig < sys_nsig; sig++) { - if (sig == SIGKILL || sig == SIGSTOP || sig == SIGCONT || - sig == SIGTTIN || sig == SIGTTOU) - continue; - if (sigaction(sig, &sa, NULL) == -1) - err(EXIT_FAILURE, "sigaction(%d)", sig); + switch (sig) { + case SIGTTIN: + case SIGTTOU: + /* Don't stop if background child needs TTY */ + if (signal(sig, SIG_IGN) == SIG_ERR) + err(EXIT_FAILURE, "signal(%d)", sig); + break; + case SIGKILL: + case SIGSTOP: + case SIGCONT: + /* These can't be caught or ignored */ + break; + default: + if (sigaction(sig, &sa, NULL) < 0) + err(EXIT_FAILURE, "sigaction(%d)", sig); + } } - /* Don't stop if background child needs TTY */ - signal(SIGTTIN, SIG_IGN); - signal(SIGTTOU, SIG_IGN); - + /* Start the timer */ set_interval(first_kill); + + /* Let the child know we're ready */ error = write(pp[1], "a", 1); - if (error == -1) + if (error < 0) err(EXIT_FAILURE, "write to control pipe"); if (error == 0) errx(EXIT_FAILURE, "short write to control pipe"); - sigemptyset(&zeromask); + (void)close(pp[1]); + sigemptyset(&zeromask); for (;;) { sigsuspend(&zeromask); @@ -430,9 +419,8 @@ main(int argc, char **argv) for (;;) { memset(&si, 0, sizeof(si)); - error = waitid(P_ALL, -1, &si, WEXITED | - WNOHANG); - if (error == -1) { + if (waitid(P_ALL, -1, &si, + WEXITED | WNOHANG) < 0) { if (errno != EINTR) break; } else if (si.si_pid == pid) { @@ -456,7 +444,7 @@ main(int argc, char **argv) break; } else { procctl(P_PID, getpid(), - PROC_REAP_STATUS, &info); + PROC_REAP_STATUS, &info); if (info.rs_children == 0) break; } @@ -471,7 +459,7 @@ main(int argc, char **argv) sig = sig_term; sig_term = 0; logv("received terminating signal %s(%d)", - sys_signame[sig], sig); + sys_signame[sig], sig); } send_sig(pid, sig, foreground); From nobody Wed Feb 18 00:25: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 4fFy3W2VS4z6SLm0 for ; Wed, 18 Feb 2026 00:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFy3V732hz3Gjn for ; Wed, 18 Feb 2026 00:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QkIT2tLYHJ0MV4/fA1JOJ6zPD+kUOCRc9PFp1a4nmZ8=; b=MJk6Gm90xBPJz2qogj7+hP/HdqAiPuWJsWCBHhb44TZE7M70HtHikqKigdc2hryRDldak3 d14bwRX/+L5gF8AGbxdRyzf9yOCSM+cXUeYE1O7Xf0sBIqSnLRmcZzH0AwaPanLsYcwI95 YBI3lrN5iBwSxcZSyrPzLh36KQ0ngvssJUCHq4mFC1jBY8o6aEHiQtQVuVmNiJTnmIoGP5 E3VgKMXwLSQ38BnYtAkEdohsm6AyeCym+Z2tXBCFvBf8yztZGeCp0RmnykjeP/eHyVMwBh GTcJDtE7iWziKk7yvRCTytA18Yr9mnKymzj5OenwvS4OnCi9vToMz6Ih6l2Imw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374359; a=rsa-sha256; cv=none; b=Rjj9A4QOI/NAdhF7LXOIHNWjMDBGk06MAhpPt4CoC9FKtqGDGFUAJbTWRBvkBECfff+5LO n74YsBVY/H7UR/FOlOs4MnuSYg+jiD+h3jfPIkIn2BjuS/k0FlSl9Twhe8kUvLBfWsO5uK y01hLjFXuT2NMN7RDoxlw7VE2QJuiTudhPNKraT2AdFzRkSRYnZoE82HWgBF33WIKunGYa Sis6aKhlRQ6mkcMylxiP87ve1b5bZQ4YG8CT4b687MVsJ7fOj9LDRlU9JM8eqSgAQaaow9 XdJ5r/UkwUDPi/p0A8kWXuJAqFc5SINFWw4WWrWoJD2vzx+xkQ/BPlG/S8ES1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QkIT2tLYHJ0MV4/fA1JOJ6zPD+kUOCRc9PFp1a4nmZ8=; b=PYt+gH/yVKJ7mMf5wv8dILHgpx6mA5X+7w0aMyqNB+3D+xTi2vf4BcbiIHtueOXN6mB02h zpdFOp569f2DQXrqvCYyQpBKg6arDZamTID9PZV/tRg7iF9m1wPQnzf0mnqjo4rptGFSVp IhmzD3Yjac3FeLCHjS8fXuQ8gqW/KSFbA/wCxN+Jn33gUawtyfN2pg5zJAt/gjbaW6+h2S dev7BLMNhVkvu/crQ4LFmsZuT6dSR7Ref6Yty+HceBsjT65WxZmbi4U2tC4jjEOWI60xcq yu/FYOkeolxE12FJedbkl/F4U/o4smd5ZYNq27jokmrj6zwVrwoewQocMQ/NzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3V6bvPzYqq for ; Wed, 18 Feb 2026 00:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d2c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:25:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ce4f512dc004 - stable/14 - diff: Tweak range of -C and -U arguments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: ce4f512dc004bae5b4b9ec22b449c785e1bf5297 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:25:58 +0000 Message-Id: <69950716.3d2c8.624e90e@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4f512dc004bae5b4b9ec22b449c785e1bf5297 commit ce4f512dc004bae5b4b9ec22b449c785e1bf5297 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:18:37 +0000 diff: Tweak range of -C and -U arguments POSIX uses the terms “positive decimal integer” for -C and “non-negative decimal integer” for -U, which translates into lower bounds of 1 for -C and 0 for -U. POSIX does not specify a minimum upper bound for either mode, but as of 5fc739eb5949 both our backends support context sizes up to and including INT_MAX, so use that. Having had the opportunity to consult the Unix System Test Suite, the diff test cases found therein happen to precisely match these bounds. While here, switch to using strtonum() to parse numerical arguments, and try to be more consistent in how we report usage errors. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55261 (cherry picked from commit 790f1d1cc5fa892ba59fd7f239b22064c8ab14c7) --- usr.bin/diff/diff.c | 46 ++++++++++++++++++++++-------------- usr.bin/diff/tests/diff_test.sh | 52 +++++++++++++++++++++++++---------------- 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index ba88964ca131..53b62766ba3e 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -126,10 +126,9 @@ static bool do_color(void); int main(int argc, char **argv) { - const char *errstr = NULL; - char *ep, **oargv; - long l; - int ch, dflags, lastch, gotstdin, prevoptind, newarg; + const char *errstr; + char **oargv; + int ch, dflags, lastch, gotstdin, prevoptind, newarg; oargv = argv; gotstdin = 0; @@ -166,10 +165,13 @@ main(int argc, char **argv) cflag = true; diff_format = D_CONTEXT; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 1, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'd': @@ -265,10 +267,13 @@ main(int argc, char **argv) conflicting_format(); diff_format = D_UNIFIED; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 0, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'w': @@ -276,8 +281,10 @@ main(int argc, char **argv) break; case 'W': width = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) - errx(1, "width is %s: %s", errstr, optarg); + if (errstr != NULL) { + warnx("width is %s: %s", errstr, optarg); + usage(); + } break; case 'X': read_excludes_file(optarg); @@ -315,8 +322,10 @@ main(int argc, char **argv) break; case OPT_TSIZE: tabsize = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) - errx(1, "tabsize is %s: %s", errstr, optarg); + if (errstr != NULL) { + warnx("tabsize is %s: %s", errstr, optarg); + usage(); + } break; case OPT_STRIPCR: dflags |= D_STRIPCR; @@ -331,9 +340,12 @@ main(int argc, char **argv) colorflag = COLORFLAG_ALWAYS; else if (strncmp(optarg, "never", 5) == 0) colorflag = COLORFLAG_NEVER; - else - errx(2, "unsupported --color value '%s' (must be always, auto, or never)", - optarg); + else { + warnx("unsupported --color value " + "(must be always, auto, or never): " + "%s", optarg); + usage(); + } break; case OPT_NO_DEREFERENCE: noderef = true; diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 61fa618b8d2c..07e019aafc4e 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -24,8 +24,8 @@ atf_test_case functionname atf_test_case noderef atf_test_case ignorecase atf_test_case dirloop -atf_test_case bigc -atf_test_case bigu +atf_test_case crange +atf_test_case urange atf_test_case prleak atf_test_case same @@ -385,30 +385,42 @@ dirloop_body() atf_check diff -r a b } -bigc_head() +crange_head() { - atf_set "descr" "Context diff with very large context" + atf_set "descr" "Context diff context length range" } -bigc_body() +crange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'--- 1,3 ---' \ - diff -C$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -C-1 a b + atf_check -s exit:2 -e match:'too small' \ + diff -C0 a b + atf_check -s exit:1 -o match:'--- 2,4 ---' \ + diff -C1 a b + atf_check -s exit:2 -e match:'too large' \ + diff -C$((1<<31)) a b + atf_check -s exit:1 -o match:'--- 1,5 ---' \ + diff -C$(((1<<31)-1)) a b } -bigu_head() +urange_head() { - atf_set "descr" "Unified diff with very large context" + atf_set "descr" "Unified diff context length range" } -bigu_body() +urange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ - diff -U$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -U-1 a b + atf_check -s exit:1 -o match:'^@@ -3 \+3 @@$' \ + diff -U0 a b + atf_check -s exit:2 -e match:'too large' \ + diff -U$((1<<31)) a b + atf_check -s exit:1 -o match:'^@@ -1,5 \+1,5 @@$' \ + diff -U$(((1<<31)-1)) a b } prleak_head() @@ -476,8 +488,8 @@ atf_init_test_cases() atf_add_test_case noderef atf_add_test_case ignorecase atf_add_test_case dirloop - atf_add_test_case bigc - atf_add_test_case bigu + atf_add_test_case crange + atf_add_test_case urange atf_add_test_case prleak atf_add_test_case same } From nobody Wed Feb 18 00:26: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 4fFy3X52Vjz6SMBn for ; Wed, 18 Feb 2026 00:26: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 4fFy3X0wH4z3GgT for ; Wed, 18 Feb 2026 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wv3H3roe+a5fegESU19lm1vsp9j8ULCze2mDn6tF3uo=; b=AzpdGcfGqSZWYGu43mpCMlNxEkR4tQGO2PHxHyV+Dd2lm6Y26SRTSPdLjIjmKSpUA89OYR vNWsmBVDP+bhfrp5tl4L3OgbgAhQRU6iSjB7Ssh0NuoT/rAF7zT89GdfZoN0tkEq53Wld5 NfHtQVJkJURMZ5MkALbQwDV16J5QwTMD8RM0WfuVBen9cdJdjDdu5dHYqjOCOTlFa4n7xP pYL2VnBRBbv5e84KkJ00+ewE2G+SgXmhw3J4KfX59oUMIBC3SoM+Izz4bSDtDhRWoxvmCX 5I8FetRs3uoix1cCjz69WT1ddW0HVxlYXee3zrWWNPP+EIU64jIbcSPJtfDiwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374360; a=rsa-sha256; cv=none; b=r4u38i4aTSYHYfXrXpqrDtJYStA3nZkWnEIgdvdmZaaczVuStc/as6WhwcSH/rCpq/6T+d kPr8j6TkAZiR5KdGfDHkZvmtTU2eY3hDdzYJyVMdk4qFAwToU/bhZQiFaZriKt7Zxwb0Xy dmdNyhQM8hIpA75QGj0XRnh96cM4aOCJvjKgQVLlSXaLcn9aTOjTZEwEpDVhkRiDAX5ACu ekOp4uKcwZ+uHeXQjavqbZsglu1fZxwVy+8iT2IUlsuKYNtE4NKoR290inELQ2ovIKO5/O RK7rKqxtU7zl0nkKgUQ2jEdqGsqmKWt8vD1JBi1mnXwKZ1zkTxLdyvKLaBQ9Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wv3H3roe+a5fegESU19lm1vsp9j8ULCze2mDn6tF3uo=; b=fS3pb7bUBgx1OaGsPrdqR2hnmwYWHIuqTeR4doXTuwvRC2gAp7nP/T6/ooji4TxNzTfP45 yhr1le8U+P2iC2vZune0bxnPPRV3aolEStn0nR/bioS5h2LcPdLrtWEHzmWNv8gjAmkWTT 0XgPtPJncdN9DnW0LoAi3mhWFQPA5iRWsO7nWX5q2QYYYYI5CwTn8IrE4Oj3b5Aq6+Ztfa Ny+7Qa1MS4o6bDDp3RKq/wc85JmfNLavHCEkhbcdofOOOzGxVzoIKCweVTgz7khvcLqGBK 8yd8PhHR/YmNXIADDLMPBPz+pSP7EaYmIbM8go8RQDvCHZZDc1r0tPNyKfd3rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3X0JQszYwD for ; Wed, 18 Feb 2026 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:26:00 +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: f10da155fafa - stable/14 - diff: Tweak recursion tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: f10da155fafad0fc450f974e3ae1421d7f78f123 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:26:00 +0000 Message-Id: <69950718.3e0a1.2136dc13@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f10da155fafad0fc450f974e3ae1421d7f78f123 commit f10da155fafad0fc450f974e3ae1421d7f78f123 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:18:38 +0000 diff: Tweak recursion tests The -r flag is not required to compare two directories; it is only required to compare them recursively, i.e. descend into their common subdirectories. Adjust tests that use -r needlessly, and adjust the dirloop test to verify that these two cases remain distinct. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55262 (cherry picked from commit b2532432971fbd9339a9a49eca1b532978bb6d48) --- usr.bin/diff/tests/diff_test.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 07e019aafc4e..19e9bfb25728 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -1,4 +1,3 @@ - atf_test_case simple atf_test_case unified atf_test_case header @@ -191,19 +190,19 @@ brief_format_body() atf_check \ -s exit:1 \ -o inline:"Files A/test-file and B/test-file differ\n" \ - diff -rq A B + diff -q A B atf_check diff -rq A C atf_check \ -s exit:1 \ -o inline:"Only in D: another-test-file\n" \ - diff -rq A D + diff -q A D atf_check \ -s exit:1 \ -o inline:"Files A/another-test-file and D/another-test-file differ\n" \ - diff -Nrq A D + diff -Nq A D } Bflag_body() @@ -225,9 +224,9 @@ Nflag_body() { atf_check -x 'printf "foo" > A' - atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE - atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A - atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 } tabsize_body() @@ -335,23 +334,23 @@ noderef_body() atf_check ln -s $(pwd)/test-file B/test-file - atf_check -o empty -s exit:0 diff -r A B + atf_check -o empty -s exit:0 diff A B atf_check -o inline:"File A/test-file is a file while file B/test-file is a symbolic link\n" \ - -s exit:1 diff -r --no-dereference A B + -s exit:1 diff --no-dereference A B # both test files are now the same symbolic link atf_check rm A/test-file atf_check ln -s $(pwd)/test-file A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o empty -s exit:0 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o empty -s exit:0 diff --no-dereference A B # make test files different symbolic links, but same contents atf_check unlink A/test-file atf_check ln -s $(pwd)/test-file2 A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff --no-dereference A B } ignorecase_body() @@ -362,7 +361,7 @@ ignorecase_body() atf_check -x "echo hello > A/foo" atf_check -x "echo hello > B/FOO" - atf_check -o empty -s exit:0 diff -u -r --ignore-file-name-case A B + atf_check -o empty -s exit:0 diff -u --ignore-file-name-case A B } dirloop_head() @@ -374,6 +373,9 @@ dirloop_body() atf_check mkdir -p a/foo/bar atf_check ln -s .. a/foo/bar/up atf_check cp -a a b + atf_check \ + -o inline:"Common subdirectories: a/foo and b/foo\n" \ + diff a b atf_check \ -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \ From nobody Wed Feb 18 00:26: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 4fFy3b0Hvwz6SLm8 for ; Wed, 18 Feb 2026 00:26: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 4fFy3Z3v11z3Gpb for ; Wed, 18 Feb 2026 00:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQ8C2z1DuEPcRTGSXGYQ5yeIARYylD7gtH8Gice7Igk=; b=jac8e8OilGsAXjwZd18+PriepusXpisZFbdrqPl8th034uNPW8Tbg6pQgmdWGZUBg0f09d iLXRf4ijK7D8ZpsLiEC823UGESIm4XJqADwSIJ4Q8CJBblWbOAtdia4Pn8A6BDq5eI+eWS PO1QjSFU21eJqh9VsDlPVGww+Oxxm2F5ZBXS+cHvGxKTetON36iuX9cmtyNdN1oLP+4fD7 XSPtp/d5sFLv8UMqE9X024Ybh0+4Cnd+ijX/ihaMaINF+OzwXUBdd3wBAqOWtQgG2uSw1D ztxbAXttCHCIcbKCoIo8xPjgvtKaf1R/2liHtLhvLE6a2kbhq8/4hKzPvGHquw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374362; a=rsa-sha256; cv=none; b=IYEGTZRQpoGv2E/yjitE3/ijQ46x7ZQodG9XjBau5cHf1bAxrUV5j36WMfv6AsLM8kfIKu /dLhvKyhvBuvhRkcArTgi78exe3MOJi06YiNFo/h7Dha65Q1Yigt4FAkjlSiAOG1Us4Oln 1LmbEsuo04rzJT2m/atYU6m7txhaNvUB9Gs4oZfJPSXhe5gUme2SqJZ0SK1ybuTlbuQOeZ bgstMBo6c43cEpK/OhyE8bD0wjkYtGOI8awV+y0nXKxh5z2vtbdEO2xGpTkJ6/afXaGOhA qmXZuP26V/TfmonFgWM4L3zwvtoCHrI+bMxsQrX2bnpGLhadItdX+F2bFZXMrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQ8C2z1DuEPcRTGSXGYQ5yeIARYylD7gtH8Gice7Igk=; b=NgzX3az1N/vycyzKgjgUokF/XGCxVNZE37Nzetm6qwJJe5qkcv9nHv3Nve8RkknqrJjWEk 1fL7pLwjrvPOGgl3CMdrARbEZFi3A6ZT+l/RTiB8AbOincHU2/SX6LLFOl0cMC1kOIU/wA UyaTlGy5YPrWDuKnyZyZY8XQJ0NA1RNPdfP9AZzcGzwObWPKzZvrjjHkLRCvF+azFTbDV6 h+uu7Q6rABk1W9+hsnin7G0HROsy51OndXUOZT9K02EiMgS716v1FgeIPtohJ1hdNZv46q UD6xubD2Sf9+7jeRJAnXmJPqYK4maU8hoQYQJp2qPGBT7Y3/McMJAu80UUJk5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3Z3PXczYk0 for ; Wed, 18 Feb 2026 00:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e316 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:26:02 +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: c6038436360e - stable/13 - diff: Tweak range of -C and -U arguments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: c6038436360ebf6344e6f65d40e1d38611d1d603 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:26:02 +0000 Message-Id: <6995071a.3e316.71e15360@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c6038436360ebf6344e6f65d40e1d38611d1d603 commit c6038436360ebf6344e6f65d40e1d38611d1d603 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:20:36 +0000 diff: Tweak range of -C and -U arguments POSIX uses the terms “positive decimal integer” for -C and “non-negative decimal integer” for -U, which translates into lower bounds of 1 for -C and 0 for -U. POSIX does not specify a minimum upper bound for either mode, but as of 5fc739eb5949 both our backends support context sizes up to and including INT_MAX, so use that. Having had the opportunity to consult the Unix System Test Suite, the diff test cases found therein happen to precisely match these bounds. While here, switch to using strtonum() to parse numerical arguments, and try to be more consistent in how we report usage errors. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55261 (cherry picked from commit 790f1d1cc5fa892ba59fd7f239b22064c8ab14c7) --- usr.bin/diff/diff.c | 33 +++++++++++++++----------- usr.bin/diff/tests/diff_test.sh | 52 +++++++++++++++++++++++++---------------- 2 files changed, 51 insertions(+), 34 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 71f0ac94c7ab..b9a9b13c5d4d 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -108,10 +108,9 @@ void set_argstr(char **, char **); int main(int argc, char **argv) { - const char *errstr = NULL; - char *ep, **oargv; - long l; - int ch, dflags, lastch, gotstdin, prevoptind, newarg; + const char *errstr; + char **oargv; + int ch, dflags, lastch, gotstdin, prevoptind, newarg; oargv = argv; gotstdin = 0; @@ -148,10 +147,13 @@ main(int argc, char **argv) cflag = 1; diff_format = D_CONTEXT; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 1, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'd': @@ -239,10 +241,13 @@ main(int argc, char **argv) conflicting_format(); diff_format = D_UNIFIED; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 0, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'w': @@ -251,8 +256,8 @@ main(int argc, char **argv) case 'W': Wflag = 1; width = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) { - warnx("Invalid argument for width"); + if (errstr != NULL) { + warnx("width is %s: %s", errstr, optarg); usage(); } break; @@ -288,8 +293,8 @@ main(int argc, char **argv) break; case OPT_TSIZE: tabsize = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) { - warnx("Invalid argument for tabsize"); + if (errstr != NULL) { + warnx("tabsize is %s: %s", errstr, optarg); usage(); } break; diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index df98540083f9..9914cdcf84c7 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -20,8 +20,8 @@ atf_test_case report_identical atf_test_case non_regular_file atf_test_case binary atf_test_case dirloop -atf_test_case bigc -atf_test_case bigu +atf_test_case crange +atf_test_case urange atf_test_case prleak atf_test_case same @@ -309,30 +309,42 @@ dirloop_body() atf_check diff -r a b } -bigc_head() +crange_head() { - atf_set "descr" "Context diff with very large context" + atf_set "descr" "Context diff context length range" } -bigc_body() +crange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'--- 1,3 ---' \ - diff -C$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -C-1 a b + atf_check -s exit:2 -e match:'too small' \ + diff -C0 a b + atf_check -s exit:1 -o match:'--- 2,4 ---' \ + diff -C1 a b + atf_check -s exit:2 -e match:'too large' \ + diff -C$((1<<31)) a b + atf_check -s exit:1 -o match:'--- 1,5 ---' \ + diff -C$(((1<<31)-1)) a b } -bigu_head() +urange_head() { - atf_set "descr" "Unified diff with very large context" + atf_set "descr" "Unified diff context length range" } -bigu_body() +urange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ - diff -U$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -U-1 a b + atf_check -s exit:1 -o match:'^@@ -3 \+3 @@$' \ + diff -U0 a b + atf_check -s exit:2 -e match:'too large' \ + diff -U$((1<<31)) a b + atf_check -s exit:1 -o match:'^@@ -1,5 \+1,5 @@$' \ + diff -U$(((1<<31)-1)) a b } prleak_head() @@ -396,8 +408,8 @@ atf_init_test_cases() atf_add_test_case non_regular_file atf_add_test_case binary atf_add_test_case dirloop - atf_add_test_case bigc - atf_add_test_case bigu + atf_add_test_case crange + atf_add_test_case urange atf_add_test_case prleak atf_add_test_case same } From nobody Wed Feb 18 00:26: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 4fFy3b6JJFz6SMBs for ; Wed, 18 Feb 2026 00:26: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 4fFy3b4ryrz3Gx2 for ; Wed, 18 Feb 2026 00:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1kiV/KmBeSkHUgxKkZTGH/HzLWBnUwowNrAXXmhIkM=; b=K3CGNVS3YJh9JgmfvUf5xTEAtHuJp7FD5GcBScrilaphrNu+OjRgGc/vFw3Mrg+kvOls/W s24W+fESlUJXcMdSIx1hOL+gUXUnLMaYbYdjyP2dQow1r6Prmy6M+g1DDGw7YvVOO4j1qS NBlY06uyo8VxnBAQNfPFhuXNikuK1otG/AytcPwLfQ/vG5k87348s3W9J8OgOEWlltPz2b RmHDDDVdoj63kBIOICqHrc6nnogL6PoqJbRjoQ4B5AMeagwsaOmbYXPvgjckJuRxsyr5DF LiI+zmGZtnllTI779zZI1mhqHtlrtcpX/rpoPiGUbi7evF5yQQKMFWeEL3q81A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374363; a=rsa-sha256; cv=none; b=BOh8v5cMjsIooDQ4fXQA2Bad49kegjDo184mSYcrRjpibbklMrhmMhNL0rBIy4pkahuask SYXRzqGBLc5U9NBGw+OeObN1f8ArE5KHrTno2pRTo2i7m7Zd9mEJRq2VYGWNDIhTa5GHJf otM2d2JhqJMXnLDGLvoio5VucEuj7FppX0jmYjNyq4u8KAmJC3IRlqTA5VCeX5zZPRZXzZ tzpyxbljIKJF5RQHqBUFxYWyQQEqxpOUZmyqXUPkRMtv1OaIosswGV/8DFY1aunMF0zoZH jLDSKyBvccPnxZ+3hD2DaEqiDvCXEUMZFhkcqHCmYTBUCVOWJ8D8AlHfLuy5cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1kiV/KmBeSkHUgxKkZTGH/HzLWBnUwowNrAXXmhIkM=; b=mP1n8mbx7gP+tY6tXQnp4XIKmfNmaZqFk65VXOyGlnHxomYx/mLwYU2yFCaUCIaoDVm94A 14xKOh5S9Vo8oPijrOx4NiwQsl/rMXc4QYJICuQT9IBVpRhX8TNWPBhUixnRd+3CnK2xgf T5t4OvMlPabgXUkiMdW7F5qIJPky/5SDYj1zFr/lZIORxlWinXK/l1Qbc2cfVoOjOrmrvi zhK2IdwzKNkNctQaTM0w7sWUKQdHzdc709PZq88y+0LCC/UOzG/laZxPB1jT5CYbJog90s 9GS5gOdLNURDvW5+/WTocS/h5yhpdzaw9BM8yJf2HpBgPV4NzrOksNaVArDuLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3b4G0nzYqr for ; Wed, 18 Feb 2026 00:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d2cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:26:03 +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: b9a6888b37cc - stable/13 - diff: Tweak recursion tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: b9a6888b37cce03a5a04f376a1d782498f4352af Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:26:03 +0000 Message-Id: <6995071b.3d2cc.2845ec8c@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9a6888b37cce03a5a04f376a1d782498f4352af commit b9a6888b37cce03a5a04f376a1d782498f4352af Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:21:16 +0000 diff: Tweak recursion tests The -r flag is not required to compare two directories; it is only required to compare them recursively, i.e. descend into their common subdirectories. Adjust tests that use -r needlessly, and adjust the dirloop test to verify that these two cases remain distinct. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55262 (cherry picked from commit b2532432971fbd9339a9a49eca1b532978bb6d48) --- usr.bin/diff/tests/diff_test.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 9914cdcf84c7..0fcd5b02c29c 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -1,4 +1,3 @@ - atf_test_case simple atf_test_case unified atf_test_case header @@ -170,19 +169,19 @@ brief_format_body() atf_check \ -s exit:1 \ -o inline:"Files A/test-file and B/test-file differ\n" \ - diff -rq A B + diff -q A B atf_check diff -rq A C atf_check \ -s exit:1 \ -o inline:"Only in D: another-test-file\n" \ - diff -rq A D + diff -q A D atf_check \ -s exit:1 \ -o inline:"Files A/another-test-file and D/another-test-file differ\n" \ - diff -Nrq A D + diff -Nq A D } Bflag_body() @@ -204,9 +203,9 @@ Nflag_body() { atf_check -x 'printf "foo" > A' - atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE - atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A - atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 } tabsize_body() @@ -298,6 +297,9 @@ dirloop_body() atf_check mkdir -p a/foo/bar atf_check ln -s .. a/foo/bar/up atf_check cp -a a b + atf_check \ + -o inline:"Common subdirectories: a/foo and b/foo\n" \ + diff a b atf_check \ -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \ From nobody Wed Feb 18 01:53: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 4fFzzz0HMHz6SSxJ for ; Wed, 18 Feb 2026 01:53: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 4fFzzy5P52z3QgL for ; Wed, 18 Feb 2026 01:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379582; 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=H7EkTQGOUTVu2z15ZfdN06xWhGRl3Eff8kEL6GBzQ8A=; b=RxN1fEkZAAcFO+7WZqYD3RVvXssAuhaYmD61mA/LIfYYTbOh1Lv4voodnFyYcGnulHyAed A/4M1+vMESKHDTLTOP88She8P0+DlOjPo5CasY25Xpw0XFizIvNtGPtUr7uBIdRX61nG6+ 9FWUS6TesLdXTVrGJiOG/0uxqxoZbi3tFGXFiiKGkd6Ww5ycmbrI+w89mZVE2/VkOdgEx5 doztXxDqG7ncdz99yoyileXFHxGWKXidFWLzVgGDmzM2tbo2vOfBiZ1hdbIJ+wi3iIzyZH igUbpNBklFmnAlxNwBwr9/1QvhG8pAisMWfjsthGGhBY677Dny+5SrjOQxtltw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379582; a=rsa-sha256; cv=none; b=El0IIoecOV1ss5wdiaOehrZ3mzzzCErRMZAnNHcJaIvT4PJM1/YxD699p5hTZabAk9klYP +m2MJTS4RSGd0dvAjKkTBXd43VYIAUXBKCkUzHS0IOgxgaTa9k2y4kGVnud6R69S8OCfJJ FB2mwBEoS9gex4HRbyTFHTclHqxTUH1TmB6oGAPKjsuRVURtiaZNQi/Cw3DtcS5vzSEXPx RY7iQrUSZHmS0NxC4CLf/CmbMmwtvgprSTaz38ueCBzn+XjwAoXhE7PAAPixZ8HEAaRyup mwryJIF2tpyf5IY17pxyfH+Dop6ru+EXgHiZX0wHTOnLJMn1FW17whbzYuYiag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379582; 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=H7EkTQGOUTVu2z15ZfdN06xWhGRl3Eff8kEL6GBzQ8A=; b=oIFwKSzh7fyvLgvEIPtk8PjeL81NQA2uCSmNCHc8sT4Wl2/V7k9BxXlU/FTQC/45geQc/q EBnBWRJ4/Wq95WP2T2itEDf0p2T3R+QkHBEW/JW4rEBCNNau2/0CQ62E9T17goyJg0c2SG X0X8bU+wfFGIYdbnnCGqN1Q9wxnO92iKprYrBIEZ5pbmdVsJCkl1bRi1UjVulbsguDKkhs fxYq6mq2caZ09OntPXFVYpJ6PIX0xeDlY6TleNQUka/ls49tBv5Duk8nKMxIX8nBC9L7fa x99XhBCMCXx376Js9Jne8pGM8hT1CMZbmdegKq37/Ylq93zcJplyM1jP1O6veg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFzzy4sDXzc7m for ; Wed, 18 Feb 2026 01:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 472c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 37fa2e769581 - releng/14.4 - filt_timerexpire_l(): re-insert restarted timer into head instead of tail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 37fa2e7695818d4da269a24e2de1a653828947dd Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:02 +0000 Message-Id: <69951b7e.472c8.74152afc@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=37fa2e7695818d4da269a24e2de1a653828947dd commit 37fa2e7695818d4da269a24e2de1a653828947dd Author: Konstantin Belousov AuthorDate: 2026-02-12 20:24:13 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:47:15 +0000 filt_timerexpire_l(): re-insert restarted timer into head instead of tail PR: 293141 (cherry picked from commit 75a30ea09f4e75480743fae5c2369d50a6d8526c) (cherry picked from commit 119af90d483aee79bf549b3d63e1093bb59e1092) --- sys/kern/kern_event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 835a22c81528..869c4cf24ddb 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -769,8 +769,13 @@ filt_timerexpire_l(struct knote *kn, bool proc_locked) PROC_LOCK(p); if (P_SHOULDSTOP(p) || P_KILLED(p)) { if ((kc->flags & KQ_TIMER_CB_ENQUEUED) == 0) { + /* + * Insert into head so that + * kqtimer_proc_continue() does not + * iterate into us again. + */ kc->flags |= KQ_TIMER_CB_ENQUEUED; - TAILQ_INSERT_TAIL(&p->p_kqtim_stop, kc, link); + TAILQ_INSERT_HEAD(&p->p_kqtim_stop, kc, link); } if (!proc_locked) PROC_UNLOCK(p); From nobody Wed Feb 18 01:53: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 4fG0001plVz6SSld for ; Wed, 18 Feb 2026 01:53: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 4fFzzz5b44z3QgN for ; Wed, 18 Feb 2026 01:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379583; 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=26lm+5maV6eLbmyvOy6J7t1/QwxKq4vxEIb3/TLElY4=; b=Wp+TIhc7gZW011iQ8uBzfU7o742aHvcAjP0N1dyJkurizQFIEXsYWFF7A9N3Fl3u6dzxLK HRG0w3+Rk4DBgwsgJ69UOWBRjBN+8kbbtUkKWU/KLftO0l8JUN9jlCHOpzJITty9aHHNec wYhHcVIafyGGJz6zAvAh09oKlnicAe4oP/HlmAmu8vIGYDo01q5eGZ7HzwTiGYnSEtoDnP Yht1u7t4U0Y6h22yZszmJ6DJhzZyDf9Ptw1HKZQUKGfo0sAsiH/Q9VgqbzTmKubtw52w3U W7NhPchPRdBBF276jJIRft3If3QnoHw9ihyiiXWThJ1bsWhOfGFGQfWYFiDB5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379583; a=rsa-sha256; cv=none; b=d7x2BGv8m+4MfbOqE9HBTDN87G/Z363zFF951tGIg5SwPXEnNbjNd9z8xFzDcSouqBb7q9 p8NheK74xdQhz6ufKr8rgpYB9snl6Kx135HsukTlh92v8MYWLLNh2/DovG5fNNN93Do93V IB3Ci7ajkOKBR1SqgYEIg/57aLWSeWWagxWbwiij3Te0LsqnmMq9iqb0oSQdcFH/kUzVRm ztVjKyOwXJ7ai9RTNgfViOXDq5PrWWCAEMBGGAXxrE/PZBEHIekgONuZT/jdlnVHjHR//M HCDK147HN7cFb1rIEG7yrEPaWw5P3/OULA/WwzFmgEuAbDvTFFCj7d0SSnL07A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379583; 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=26lm+5maV6eLbmyvOy6J7t1/QwxKq4vxEIb3/TLElY4=; b=XCA+gc7nyihxWosqdUEtWwnBXLvq4vGmqaBw/O7vpHjIwumP0p4XVoC+zu7HUloGo8lkxB 4JlYDtEBBjyxb/Wkiw5/mqdT7Oy+lF2/+nJgZn5lVA5lLZhiB8/DouP9mbP3bnYYb1n93H trbDj6tBJxXDNcMt6+flb30zUc2dAAcxI9xe9kodIs10JTnesEYwCvSWjm2S5/uFV5CJ0z jKyQmgF60KRDi+ezEz92bgjBIz+GJoevMNv523SWJgOKeEQPW9flks4ExjxGZmvlCt++wo 2xACAzdmSxgcljy1izTMxMLjEitju8NRWoCACffFn/jgfR6Q9p+rBOsEvYmztw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFzzz57lfzbx6 for ; Wed, 18 Feb 2026 01:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4664f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 39dd0d8a0d69 - releng/14.4 - kqtimer_proc_continue(): correct calculation of 'now' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 39dd0d8a0d6929aa62191b616614135474e382d6 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:03 +0000 Message-Id: <69951b7f.4664f.3c59a8ea@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=39dd0d8a0d6929aa62191b616614135474e382d6 commit 39dd0d8a0d6929aa62191b616614135474e382d6 Author: Konstantin Belousov AuthorDate: 2026-02-13 15:32:40 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:47:15 +0000 kqtimer_proc_continue(): correct calculation of 'now' PR: 293141 (cherry picked from commit e7f86f8b1383d278fff1d973230972325072ead6) (cherry picked from commit cf941029dd0291c8b685aa3f6d7872371e6136b9) --- sys/kern/kern_event.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 869c4cf24ddb..920256f8c1bd 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -710,14 +710,11 @@ void kqtimer_proc_continue(struct proc *p) { struct kq_timer_cb_data *kc, *kc1; - struct bintime bt; sbintime_t now; PROC_LOCK_ASSERT(p, MA_OWNED); - getboottimebin(&bt); - now = bttosbt(bt); - + now = sbinuptime(); TAILQ_FOREACH_SAFE(kc, &p->p_kqtim_stop, link, kc1) { TAILQ_REMOVE(&p->p_kqtim_stop, kc, link); kc->flags &= ~KQ_TIMER_CB_ENQUEUED; From nobody Wed Feb 18 01:53: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 4fG0011Bj1z6SSfr for ; Wed, 18 Feb 2026 01:53: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 4fG0006sljz3Qcm for ; Wed, 18 Feb 2026 01:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379585; 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=5CKebPqMaIWXlfYdoN+r120DYmBZTL4LGH/UXQFg6u8=; b=f8BRuSEDetjiOZjk7byb8ksymOMLGYbXg/jC67qfBft9FnxVQgOdxU8Bl3ciAXfBSMD55N RKx0g2TXaq1yENFGkDghE7pSc/andX0aPZ1e+7HguLVmb+qO/9tnzkRYvUiEqk/9sNRoLg SlNtogG+QNlmzvZV3EcuHrzuaAue6Zur85sUTkUo0YTRv21vDJO6tTF4Oky+vf6TzgQ2+8 ZNRXJ/NLp74jO76q3+1hKnSYJfY3pim5nQGXmgolX5RF1Umn+aYJCd9I7FGX3Rbkd957Zj r+h0pHsFDgwvKvKFt2Fsrn6B76a6e8ctw4e8K8f4quV03tTUAGodlUqn9+awUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379585; a=rsa-sha256; cv=none; b=Sj+Ar5KZovR3AUnsvAsrn/z8rX3GmITqxBb5BAfWq++U79NbFJ7g16ExZSvZw/wuVkw50a E2vmLLgeFOStF0vxUVFAQCQZ1YGg7vF3tjfLfzqA+aHAGLXnI/ZlxlsFvU+/lW3QVqOzfu sowHDitfq8dHNKnli81QcEjRNihyqWa8l7B5tKZBilcldkTzJo/PpT5hDAvHJ0uLGURNTf ddfHw8yIxrTeFIhD/fWb7fGtDaHM/bTmjl9GIhaGEZO/Sr/c9P5PPLQ8zuQU61uswcn1wp GmcpX6zep9Gs+407HnZQkIEVYxKQH6hh0C2o1a/eaXJaDdu3RDhghLDIuWGdLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379585; 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=5CKebPqMaIWXlfYdoN+r120DYmBZTL4LGH/UXQFg6u8=; b=Q+ckZx85SVWsHd5/gc35KU9Rya2IbxqUuUxhmr/2Ywwy1KJoyezR/CmaMNngIsfP+n0Cj+ 5v3VaK2jyTkx3TDzkDHckBNoCrLQ9uYjyOpvJk+TrCFXmVcUoQFzlyFuolrWwVMCotpwZb Tf727OK2s045bz00V/RipEZ9u31p9KDulmakQ5WqwuylRSlV8uiSNuLUfp9eiqL7vnaKiL 1H88BGCAzA3Q66sPMz5JQFkOPwBbb6gZkRev52mc2aC7fZ092G12Q6xRB1Md8uuneOlmU0 tGVl+MpjOUJFqoR6Sdx/bP0iQ2BP9bo0XRNtcdNkgzfjsRlh2ziwMyCx/OFjKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG0006HryzcTK for ; Wed, 18 Feb 2026 01:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47603 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 0235e9e56947 - releng/14.4 - unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 0235e9e56947c5419e2bef7562c2b7221b82c90f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:04 +0000 Message-Id: <69951b80.47603.c893970@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0235e9e56947c5419e2bef7562c2b7221b82c90f commit 0235e9e56947c5419e2bef7562c2b7221b82c90f Author: Konstantin Belousov AuthorDate: 2026-02-02 22:38:32 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:47:16 +0000 unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace (cherry picked from commit cd8d44173adc375b59a24b1363476c086a7c86b4) (cherry picked from commit a893e8463ab2741204debd17901539708ec3a970) --- sys/kern/vfs_mount.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 85d14a943d01..5ca7c43269ce 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1733,6 +1733,8 @@ kern_unmount(struct thread *td, const char *path, int flags) int error; AUDIT_ARG_VALUE(flags); + if ((flags & (MNT_DEFERRED | MNT_RECURSE)) != 0) + return (EINVAL); if (jailed(td->td_ucred) || usermount == 0) { error = priv_check(td, PRIV_VFS_UNMOUNT); if (error) From nobody Wed Feb 18 01:53: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 4fG0022DpQz6SScS for ; Wed, 18 Feb 2026 01:53: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 4fG0020CWpz3QjZ for ; Wed, 18 Feb 2026 01:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379586; 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=khFT8tEzaVIqKBtKNloLGz3izJaf9HraB56YIrFntps=; b=ELRU1fNoCM8yKa5E++r7wHM3IwjJnEYo7w5FoB4IsM27mNJBHwvlLCgS5WsfaxQ8bYZkVe POXuw7uP0fI4sj5cXYzzyXAZDJ8Vk6k0wrqROnakZiKTBlFh/+obELaY1r29Agex3BUUpO HnN3dm05lbuiQi3LLSBtDjGAOzRcTPbxqoYOmn9wpZeU7jQkO9QTNtnDHaAnGowqK7qJup o1Zm//PkMid55UgqFP9WmJ4exyLKEqa7Cm0bZRmUHN1k2Rd3u1/7JQALZGgHj2v4B7Oqp4 OCQJxpYGm5KJ3DfDoTeDSNqImjAf/tM5MT8nOazZdFvS828oKnEwNsbAD7+HSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379586; a=rsa-sha256; cv=none; b=UoiulDlTuvE/rwy3eAJyje3pjJm8d6zWheSgNrAvJFxbtFVmel45++uAWp3FSi7J0f/cJB xwU0cnxMLOQ9d3FPcgjokFM+gBY0wR9m4ljit2lo6EsYovMBHdLqgrQ+hG/aTUv+EI8orb +stp0uMOnVfG7tbK2gIZIT+CeFb3nZG+ljVlIs92yCJ0bpNRaBFjXZ9TyCDhkxPZDuk1C9 mOzYc3H92hGntx1FntVSOWvTnvxTQMjpogofuFeWWrjn5iA6Srr1SyX82JyayoELKK2uTq ERQsQB9JVUvn9jtNruKBQsXaFP2RcuCYArcgIwNbFKqNuZzem02np87GeUmrdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379586; 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=khFT8tEzaVIqKBtKNloLGz3izJaf9HraB56YIrFntps=; b=IOCbUDylZsX8ur17ZTO7hrk+bBIhup7NxU4+Wn9mRyZ52k8/sRtioLumcfhZhbyck3L26a V1KHhkpSD8M+dBrugydcUDrSNrJy/XjQ0YOCWchujtrfs2nHJRaImqitHx7sUGsKuES+Fm Mmi6NV7HNH7xRXBKpb/BqQ3DVhenhlC1CQaq9LOafIup0FQ8FibLYo4ov2jVJJHPnCOJTW hB+o1IDMQVFWO2dWo61zWehCdmHPh9mQ16Hu5/zHUy5FF2ILznK0/UUbHRoIcgkxKN1DER g/3gIykbMhiYqSWorhKNA7eqTVUwzDrFC3YUFjWdlyRlJBBN2QujaZCxhVVwug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG0016q6RzcKG for ; Wed, 18 Feb 2026 01:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4565c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 71ed9ae5e6ed - releng/14.4 - kern/vfs_unmount.c: promote flags to uint64_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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 71ed9ae5e6ed72f172ae640382cb76c2e0f5d847 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:05 +0000 Message-Id: <69951b81.4565c.1a485c6d@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=71ed9ae5e6ed72f172ae640382cb76c2e0f5d847 commit 71ed9ae5e6ed72f172ae640382cb76c2e0f5d847 Author: Konstantin Belousov AuthorDate: 2026-02-09 03:11:15 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:47:16 +0000 kern/vfs_unmount.c: promote flags to uint64_t (cherry picked from commit 8066b8923ebfd438dc8cb840d2f57066f4daa45d) (cherry picked from commit 00095a089604aba93ef265fb0a52e170bcb77da7) --- sys/compat/linux/linux_file.c | 2 +- sys/kern/vfs_mount.c | 4 ++-- sys/sys/syscallsubr.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 1341df8bc7fc..4861dafe27b3 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1169,7 +1169,7 @@ linux_oldumount(struct thread *td, struct linux_oldumount_args *args) int linux_umount(struct thread *td, struct linux_umount_args *args) { - int flags; + uint64_t flags; flags = 0; if ((args->flags & LINUX_MNT_FORCE) != 0) { diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 5ca7c43269ce..b380a7fdaf6b 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1720,11 +1720,11 @@ int sys_unmount(struct thread *td, struct unmount_args *uap) { - return (kern_unmount(td, uap->path, uap->flags)); + return (kern_unmount(td, uap->path, (unsigned)uap->flags)); } int -kern_unmount(struct thread *td, const char *path, int flags) +kern_unmount(struct thread *td, const char *path, uint64_t flags) { struct nameidata nd; struct mount *mp; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8fafb8ace311..ab56b22978c2 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -390,7 +390,7 @@ int kern_wait6(struct thread *td, enum idtype idtype, id_t id, int *status, int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); -int kern_unmount(struct thread *td, const char *path, int flags); +int kern_unmount(struct thread *td, const char *path, uint64_t flags); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */ From nobody Wed Feb 18 01:53:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fG0036KkXz6SSlh for ; Wed, 18 Feb 2026 01:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG0031Xgdz3QmP for ; Wed, 18 Feb 2026 01:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379587; 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=ChxpwPYWreHrJ9QNn8iLXw6Y174q0ViCiW2BDLcIjKk=; b=TL4kiUR/ggnzp7u7WlNStqEEoaxedH7nTvI/kecNfFn0n/eDLqtbtxw4beg6PxUch5HGO/ cgBQOHSwNXKyq5k1WO3jWjv8tVVP79X+bvosiz9uE7iXM3yL43Zc0iD47CpTKm7h9qCqH5 Qyr7AUwPT5gdCmk+/+ZeECQA2mwZLGkkVPjge+P1jP3ateT5m5xTCi3uG93K3yPu3/lGAu aaVcNG8kXbR4MDf0PBz6YK0MDWH6/98scHPjwZo+Erdc/+9Ra637yzLvVeF9EPgCPHb/rh 9l41KeDjtDUoIIz21Aom2S97SJVjkbVQ+35zn2icaFxxx94RwzwHQipAuS+hrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379587; a=rsa-sha256; cv=none; b=AXgqtv8JoWie35YLUfNyw7iM0nhMWWCgRuhCa7qAD4wwPPXwpYhmbAo++D3LH7hXVbDkoM tZzy5wZOpjhdVuiwz1EY84h+uPYhp4vl5DwT1YNc0v3+QP5WAdejOVFACOB8pXH7q0gBFS 6QTRbMZe1RRysPYFs7+9LtarelUfaVO4snjZAgHIWaV8MeY3dqnHnVwaNHBI3U96gcMJoc rjVl7nDmSEyNvH42Wxa+fZc8QgkgTR/25k1MFh5J0O/k5oupplRMsrfHYGucjCJ2YmfiK1 tU7XxVZhEbA1c74v6/MHAhLY/ieaTnSt+aD6iNaWwbM4g89h48pDGB5AGk7GUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379587; 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=ChxpwPYWreHrJ9QNn8iLXw6Y174q0ViCiW2BDLcIjKk=; b=sKnwYPEN0PBLJelnTTlxjqIgcIrbVHVxQATzKUeeXnoVQOYPPXitbOG2EmYVey7aWKeUXY D6zoreTeUnw0EQCxBPA08mFQPLEjB0Oj75eHvkd+uiPAI/j24MH5buL7dcCuhib2wJUkX3 fjkQDytmIXHFPzo2cxVb9zj3XRVv7Hfz9Thdu/fWn/JdJLnsyjIrx/q95e8uSP3ZqLFp6J 9W9sxj3TQb/4/OfWDTAIVNUPMC3eO+UtwCz6XAR0QghFHihJgYpH5zGRRNbmYgG9LBPMbS GZWvL9ImYFsf8nxrCDFcsw1z56tXcrRYjZoUQ3PbLVaPhrZ8g0M9kO3+tKy2dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG0030VKYzcKH for ; Wed, 18 Feb 2026 01:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 457ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 6316ab68d331 - releng/14.4 - ngctl: Check hook name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 6316ab68d331098749ad1eac63a183a4c9ccda3c Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:07 +0000 Message-Id: <69951b83.457ff.8656ec9@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6316ab68d331098749ad1eac63a183a4c9ccda3c commit 6316ab68d331098749ad1eac63a183a4c9ccda3c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:48:33 +0000 ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 (cherry picked from commit 585190dff436eeea3be97300e36c82559028d3dd) (cherry picked from commit 71c0f48ab19fbac3d93e29d8964db2f215ddf722) --- usr.sbin/ngctl/write.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c index 1e86963fb39c..7ee8dcfaa241 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -35,10 +35,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -63,6 +65,7 @@ WriteCmd(int ac, char **av) struct sockaddr_ng *sag = (struct sockaddr_ng *)sagbuf; u_char buf[BUF_SIZE]; const char *hook; + size_t hooklen; FILE *fp; u_int len; int byte; @@ -72,6 +75,14 @@ WriteCmd(int ac, char **av) if (ac < 3) return (CMDRTN_USAGE); hook = av[1]; + _Static_assert(sizeof(sagbuf) >= + offsetof(struct sockaddr_ng, sg_data) + NG_HOOKSIZ, + "sagbuf is too small for NG_HOOKSIZ"); + hooklen = strlcpy(sag->sg_data, hook, NG_HOOKSIZ); + if (hooklen >= NG_HOOKSIZ) { + warnx("hook name \"%s\" too long", hook); + return (CMDRTN_ERROR); + } /* Get data */ if (strcmp(av[2], "-f") == 0) { @@ -104,11 +115,10 @@ WriteCmd(int ac, char **av) } /* Send data */ - sag->sg_len = 3 + strlen(hook); + sag->sg_len = 3 + hooklen; sag->sg_family = AF_NETGRAPH; - strlcpy(sag->sg_data, hook, sizeof(sagbuf) - 2); - if (sendto(dsock, buf, len, - 0, (struct sockaddr *)sag, sag->sg_len) == -1) { + if (sendto(dsock, buf, len, 0, (struct sockaddr *)sag, + sag->sg_len) < 0) { warn("writing to hook \"%s\"", hook); return (CMDRTN_ERROR); } From nobody Wed Feb 18 01:53:08 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fG0044MzVz6SSlk for ; Wed, 18 Feb 2026 01:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG0041wzMz3Qcy for ; Wed, 18 Feb 2026 01:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379588; 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=bAQsCEUzHQraWeEGid0cEwwX3ZnHIz7biSt6jhitvTE=; b=o+dgDuz3bMtPpwVKidPmf7xad1D2H5LOElDI+q00dxZAW1CXSaHQRf3IoBIbnpJ4LhUJtb 7qm37AJ/CWC6bfwSYfcms3z6+fdzj1feJbNCAuRqFS+2duweJ7eUnbUc3Ju+QC7eDoB8WR seAY0Wp+KQ7QY17ZxGE1lfdze5i3nF+qwu9nET06PDzLQuEOJR4mK6m6E5snPGQfWeen+X c4voKHl1aTTJQCA3t7FvMUQKw3YpV4ZayLMp/VptirWx4+g2ay+BV2hA8qOqyIwU+/QKsE sQVdLJMlh1rWoIDzRq7xxdcSnBbt3eUp7VbomCbjGsmZuwJZoAZbaZJ+I7illw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379588; a=rsa-sha256; cv=none; b=JcZ6VSYbMFqdSmdB3naDaXMDpHjBgXPy/DDBKikgs8l+rfzXBDixZdCc80ANOmfcEDlMCK OTutsjWXFPPHKn6QqRMvTmD6htt1zWH7wdVX2xHte53DGTeHKoLpjFi/ykwFsduje7+Siz +9vyn5/QicDI+Ak9CVP96PZ2lf4Ld/UdqbvDmjjQ1cnXGOBvvMocbD/dToBlFno4ewQ5vv AR2dVmv1UXDOWZjV4mBjPBNYikfO5hwkwP8Ph4feRI/N5Y+Ck9UwEtgQHUo5le5YovCPKe OxebnL4NUVuozIN9pEvKGQJtXCb6OorjaWqmagfKbphe8coqrzE+ec6pXmFx2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379588; 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=bAQsCEUzHQraWeEGid0cEwwX3ZnHIz7biSt6jhitvTE=; b=H7xTbwd+/srsyxFnkm0vUronhN42hnk5UwjvQ6O2CL5UZzSs88iNaDqMBrxrMmM/bZ2RAu YFAnuhGhbeWWVrUW6mFsQ98Z6kHM45LFviKKV8ItZp9VtuthkiSNsxMjPBla2sC93wJvbA ds+6G0RR/z44hMXFzKrxW8sN3NNnec6v2lr3QNORsoy7MSguw5aswJgzcbjkJY0FXP292m gT0nDQlZs38J/i3G3o9TVKa6J5jM2WdgUvlyZmbcgaYNGgR5jVbTliix2s2/H/LWdO9kzz 0giGquarOxu+/N1AhcNNwYB7TNjDyFzxXR8i38zjLMV/Qj12EY6nIB6sl97dhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG0040vbFzcKJ for ; Wed, 18 Feb 2026 01:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44fc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: f16fc39527ee - releng/14.4 - ngctl: Fix buffer overflow in config 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: f16fc39527ee758aca81085c11e2b677895ee4e5 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:08 +0000 Message-Id: <69951b84.44fc7.3477c742@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f16fc39527ee758aca81085c11e2b677895ee4e5 commit f16fc39527ee758aca81085c11e2b677895ee4e5 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:50 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:48:33 +0000 ngctl: Fix buffer overflow in config command Keep track of our buffer length when assembling the argument list. PR: 293075 MFC after: 1 week Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D55259 (cherry picked from commit 59906a163e474c8d00bdebe226c4d47332b91bad) (cherry picked from commit e5bf728058da2b9cdc056e49bd82b57310588b3e) --- usr.sbin/ngctl/config.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 261bc950f570..611975ef5b10 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -62,7 +62,7 @@ ConfigCmd(int ac, char **av) struct ng_mesg *const resp = (struct ng_mesg *) sbuf; char *const status = (char *) resp->data; char *path; - char buf[NG_TEXTRESPONSE]; + char buf[NG_TEXTRESPONSE], *pos, *end; int nostat = 0, i; /* Get arguments */ @@ -70,20 +70,26 @@ ConfigCmd(int ac, char **av) return (CMDRTN_USAGE); path = av[1]; - *buf = '\0'; + pos = buf; + end = buf + sizeof(buf); for (i = 2; i < ac; i++) { - if (i != 2) - strcat(buf, " "); - strcat(buf, av[i]); + if (i > 2) { + if (pos == end) + return (CMDRTN_USAGE); + *pos++ = ' '; + } + if ((pos += strlcpy(pos, av[i], end - pos)) >= end) + return (CMDRTN_USAGE); } - + *pos = '\0'; + /* Get node config summary */ if (*buf != '\0') i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, buf, strlen(buf) + 1); + NGM_TEXT_CONFIG, buf, pos - buf + 1); else i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, NULL, 0); + NGM_TEXT_CONFIG, NULL, 0); if (i < 0) { switch (errno) { case EINVAL: From nobody Wed Feb 18 08:04: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 4fG8Dg6RVcz6QTwP for ; Wed, 18 Feb 2026 08:04: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 4fG8Dg3n2Nz45V4 for ; Wed, 18 Feb 2026 08:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IT0wn0mwvt3xaqC/Hs0IvxZYub2feOXCg7s8xjSkyo=; b=ai2KzBuW7VhJGdnvP+HzY2fxvLc4lx0qiXmnCDl1VFiKfJQGKRMRDlSYwi30sBPzHCKDJl jgW3qaByvx5U7H/VIZXcv1vshKa5uf+E4AteegC9pwbt0gUDVs3HrCJifFLUnmnbaG4drw 8fjYvDju1JWLJZ938OA1gFIKTnVYmkMv2ni/exa5+kPPjCFEJ5N2ia6qqiRKnwz7zFUIJl 4exjUcm5F4A4DJL9L2es/4vc37DSR2E8nDsDB77+C2uVjBTYDSYT02+xFpmI7ANgMIar12 6tXJqxeRv2LdMPX0A580IwhgHCmnDRAvegY1mJhgFEppDg10NLY2Q5T+XSwGkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771401875; a=rsa-sha256; cv=none; b=MVCOXhXa3hWQ3Jo6WHb7giglSFdMuhFujYNBBLUNV2I7lVLjBDkqE/C6IfLzzaQHa5PEB+ jP9kB0tKFbj777NkiNpqllkFLjQ0Yi6cOhpEH4ipKNBnp0u7PzNlOWW69PJpTQfi4IKlqR h096XDsT6idpOfBF+y7CNUU+SKpWKqos2uzdCUR+zXNWP3uSV0RoejSF5prM7MaxZVfw46 lqK8cNyN6/kHPjOunIhV3PBTTSPq2iWAvoJWXt1hUSm+OPSyMZCywhG4RqL0/fyhmd9Q5c BW+CUheJXRuxTCCwBzAIfx0hd6bgmLt/o//FHFLx278hWWTxWE0F6tyl/3enmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IT0wn0mwvt3xaqC/Hs0IvxZYub2feOXCg7s8xjSkyo=; b=iZ2PcZOPV8GEHK5hP3tmqnj/mdQ4Fhf7eQi37qsgBo6vWZldtbjOPsxvM6xc9nrSM8u6mM 6tknvLzAKuih4mr5RM4V+31TaiFukZ9QkFr051X0MzNsAo9lF/wN1Bx9C5D7GwRn1taG80 anE8Vec422TLVLjmmZ3aakRv/kXlhWjnDu4yWgQq421mjg8PXd9kKKbkCBr7m2/UdUPSXZ PZNZJCU5XHPjcb8AcCQaj19OLVrVf8AO0bFfsYIvihORyimyLaaxrSZMXVU9KQKlzkwCnm B+T53bRhxQ8qC2tZYiJeZ82hj2IOftRiwiqEvXkxfEKJFtlC6CMg74zurU3ShQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG8Dg3MSxznNY for ; Wed, 18 Feb 2026 08:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45fdc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 08:04:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 48aeff4df8e7 - stable/15 - open.2: grammar improvements List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 48aeff4df8e74eb7cc8f75f64be79cc0e7bdcacd Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 08:04:35 +0000 Message-Id: <69957293.45fdc.6965c870@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=48aeff4df8e74eb7cc8f75f64be79cc0e7bdcacd commit 48aeff4df8e74eb7cc8f75f64be79cc0e7bdcacd Author: Konstantin Belousov AuthorDate: 2026-02-16 15:34:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-18 08:00:50 +0000 open.2: grammar improvements (cherry picked from commit f1f142c01db43c7dc8d0d172fc1726da2ee01972) --- lib/libsys/open.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index b4463180e4bc..4527100252eb 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -81,9 +81,9 @@ and relative .Fa path , when .Fa fd -references directory and without the +references a directory, and the .Va O_EMPTY_PATH -flag, +flag is not specified, the file to be opened is determined relative to the directory associated with the file descriptor .Fa fd From nobody Wed Feb 18 08:04: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 4fG8Dd6xvJz6QTSN for ; Wed, 18 Feb 2026 08:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG8Dd3nnfz45S5 for ; Wed, 18 Feb 2026 08:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ONlSF8WffXAf21qme+p3Jn/gD17nw6bLJR+NV7pPuE=; b=PfhPArOOCFFhj8xMjYm8raD1nhSsdFYb+EfyE91wL5lkD7JO4fng4MrO1t5vM447bc2uSS Wo0Y5gwC4zlBE8BqYHA92GuiaMWOsoYYRKuZxhKAIAkW1OOyJs9193cggOCJ/ULaDXgkwE whu2vggW4EyGbaHvT6EcPHXW6RiDeIIleolyFh43iwYoc5xHsrmXmB1wsl2dALQM3B2rJF eQDreYtWcV02dw3Ntp9Mz2upOtOZl/ykghQ1E002eEZCPiU2KFLb+cTIpuSEJ7PpkWhWkM D0TlmOG4zik/J3SDIa3KOBQSuqNGJTFBqVrayDoZ27aqg0/IkefuYJcr/yTYbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771401873; a=rsa-sha256; cv=none; b=mMQYWj8PgSrE74AOBznxYRlooFONsEzeSLVNtFnPsdq4bslRrk+ZrVjdrWKFEb8lrwCtwH +Cb97MDyuY563Zyzssac2vlGSDkv6w37DzYlv6e7Tt+9RUHMs3FLACYFXbSED4WbIGYFIj HKVQ5O6fekBzpPp0NLcFYIzRdWmV/XqK999jb0ckn1vsqflSneRUUvrcrqT4h4ubKmC5yZ dtSK+FsD6Dckqv0sBpUmgdcIzDobRfBwebLutqE/nm8urncJBf6xLVNzIzl6+DL3U+2Bi9 ubaWLQWqchTqssPGoEFXR4h66Jk9VO8BIeOd55OZuYMw0oUcKRRlyUHCtCrNEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ONlSF8WffXAf21qme+p3Jn/gD17nw6bLJR+NV7pPuE=; b=Y9R/uvRYP8ZXReM6iN2LiGTucgDVIKRihLV/Zq0P6LgfbJpw7PUBYkCiPA+5nvK3ReHxg3 BN9J3Jflh2aEnV10/lQoCxTwPHsrxv7ek09Rryp/Maa07liM+9Eo3XPPWF3qW5r1M/vh3Y QJSUY185gMWNbMvFkYMSkM/WO+gmt+eB/U9Lmp5QuhfQuvfOEELbPDOnZY5loreBnoeDD8 Y1xMAj4Er4rFa4uhV4uXwPNDRbe4qRxfoTqo4kw4heHlLO3J3OLPNiLsXzMgVZqE9stS/C eP+Gvj1kyWOw8QAUsJcY4wzxXcTCwjxW4/yiBIfQa4C82ABi52yMP/ZhCXOqfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG8Dd2qH0znTn for ; Wed, 18 Feb 2026 08:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d50 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 08:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 532c8d3f90b9 - stable/15 - amd64: add LASS 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 532c8d3f90b95fb13b320cdfdc89e3d7d08875db Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 08:04:33 +0000 Message-Id: <69957291.44d50.7ebebeca@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=532c8d3f90b95fb13b320cdfdc89e3d7d08875db commit 532c8d3f90b95fb13b320cdfdc89e3d7d08875db Author: Konstantin Belousov AuthorDate: 2024-10-24 02:12:25 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-18 08:00:04 +0000 amd64: add LASS support (cherry picked from commit 89589b6d3fbac43eb7c6b3cdbdd6f077888b2142) --- sys/amd64/amd64/efirt_machdep.c | 4 ++++ sys/amd64/amd64/initcpu.c | 13 +++++++++++++ sys/amd64/amd64/machdep.c | 1 + sys/amd64/amd64/pmap.c | 9 +++++++++ sys/amd64/include/md_var.h | 1 + 5 files changed, 28 insertions(+) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index fe5d60c978dd..203b2b264587 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -348,6 +348,8 @@ efi_arch_enter(void) */ if (!pmap_pcid_enabled) invltlb(); + if (lass_enabled) + load_cr4(rcr4() & ~CR4_LASS); return (0); } @@ -357,6 +359,8 @@ efi_arch_leave(void) pmap_t curpmap; uint64_t cr3; + if (lass_enabled) + load_cr4(rcr4() | CR4_LASS); curpmap = &curproc->p_vmspace->vm_pmap; cr3 = curpmap->pm_cr3; if (pmap_pcid_enabled) { diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 7f317674907e..4c57c27596ad 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -290,6 +290,19 @@ initializecpu(void) if (cpu_stdext_feature2 & CPUID_STDEXT2_PKU) cr4 |= CR4_PKE; + /* + * Any CPU having Linear Address Space Separation (LASS) + * should have SMAP, but check it to be sure. Otherwise + * userspace accesses from kernel cannot work. + */ + if (IS_BSP() && (cpu_stdext_feature4 & CPUID_STDEXT4_LASS) != 0 && + (cpu_stdext_feature & CPUID_STDEXT_SMAP) != 0) { + lass_enabled = 1; + TUNABLE_INT_FETCH("hw.lass", &lass_enabled); + } + if (lass_enabled) + cr4 |= CR4_LASS; + /* * If SMEP is present, we only need to flush RSB (by default) * on context switches, to prevent cross-process ret2spec diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e56de986ccba..20d221279bd3 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -204,6 +204,7 @@ int cold = 1; long Maxmem = 0; long realmem = 0; int late_console = 1; +int lass_enabled = 0; struct kva_md_info kmi; diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 243a6625bece..8695dd61316e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1737,6 +1737,7 @@ pmap_bootstrap_la57(vm_paddr_t *firstaddr) { void (*la57_tramp)(uint64_t pml5); pml5_entry_t *pt; + uint64_t cr4; if ((cpu_stdext_feature2 & CPUID_STDEXT2_LA57) == 0) return; @@ -1757,8 +1758,16 @@ pmap_bootstrap_la57(vm_paddr_t *firstaddr) KERNSTART + amd64_loadaddr()); printf("Calling la57 trampoline at %p, KPML5phys %#lx ...", la57_tramp, KPML5phys); + if (lass_enabled) { + cr4 = rcr4(); + load_cr4(cr4 & ~CR4_LASS); + } la57_tramp(KPML5phys); printf(" alive in la57 mode\n"); + if (lass_enabled) { + cr4 = rcr4(); + load_cr4(cr4 | CR4_LASS); + } } static void diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 19eab48168f7..7bb8ace27061 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -45,6 +45,7 @@ extern int hw_ibrs_disable; extern int hw_ssb_disable; extern int nmi_flush_l1d_sw; extern int syscall_ret_l1d_flush_mode; +extern int lass_enabled; extern vm_paddr_t intel_graphics_stolen_base; extern vm_paddr_t intel_graphics_stolen_size; From nobody Wed Feb 18 08:04: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 4fG8Df5KDjz6QTp4 for ; Wed, 18 Feb 2026 08:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG8Df3HqXz45X9 for ; Wed, 18 Feb 2026 08:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKyDSUL1amNwxlBr23pQPkafbtd3ICwJA927eXJeYCw=; b=kOFSA7CHqV2coHZ4Z9dc4dCNl2bI18Ww9lam0Q65n9YmJMCaxi8N3ACI1h/tmmTG+TPzrc GOIUKhV05W39jbC1BSHp3XIYnvhHYg3fZR++v7DbR8YwRcPC9ii98DJnI/olvAe3xerMFx /h8Am3RTo/SWkicM+DGUAc/+yu0Xq0yq79ri0ivvSDNjqyxReD+6jO/BxukubMR4e7g78v WD+xXz1b2Et0VpEHuU2i1WwRch/aE0AFtSrzcSs3dPhEqXrgtZGAI4wX+ibdpQ3kr4uoCr 7jyJYbKPb8UwQd/lRFIHLOUkBkSoIx7VlDuUvJAlipM2G0mV5F87fQvNLKQTVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771401874; a=rsa-sha256; cv=none; b=bAEA1Utt28bOLJmwGck2ZdE0JG02hZUBtAtVZmWUQyo+aCi7vDWnIM1/mPziGI/CJeUBQe sd/1/zosonXP0c58JzGoSzacNu4YT1j+rb8AVcVY+znruw7ySRE3OHuyHTkxd5WJLkqbyc v9T1n80cPeB5Cc/aY7bHqipvcUWbirUZCW4K0VDxxLKC+IqMX5IWHAgGEeDcYqYJpk1Ley nx1JV33vJRWWK5VNkJW2bz9W7WRrE7L9Mf5oZfYx7b9L88+imKpSmEOcCfzx4GmrWlpoVY WqwkOT2sjj/WZglvQd+NUkSkTTzlqsESSnxcUWR189fEZqeNgkwbG6Yk8eQJQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKyDSUL1amNwxlBr23pQPkafbtd3ICwJA927eXJeYCw=; b=yFPbusdoe06f24fzglBG49dTvotamjTrYl9xyVArYg7Z/OicagqHmYHPzx8RAkCXUsf19u IFBeoHvUz7qYv1DN3OpSNlU4U2wXRfrztquKE3GjUzvhKMYjAy5shM/McPY82JC/r+rp/T 6B0h+txYofc2jSzjiVR2JV6Ye5OtMxjYuTBWvImRB3ZqIcXJoi9h/QmCiUJuGFqhnObwt2 B/1ZbVJxobv3EwkTszIq2Q3Ft8DwL9mVWRqfeUQPv4ahkwu5nNYlq0lNVR7EllqFQSOslF K9VUImZpcLNMmYSgISQKwKpsj/IwaNLhtgbZpm55di8GJqWU94c1m8rwBakbgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG8Df2cHdznr5 for ; Wed, 18 Feb 2026 08:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43fe3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 08:04:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4338c437910b - stable/15 - open.2: stop making impression that fd must be directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4338c437910bfd3ab262e4f4f544590f968b8d30 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 08:04:34 +0000 Message-Id: <69957292.43fe3.2fc76e8e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4338c437910bfd3ab262e4f4f544590f968b8d30 commit 4338c437910bfd3ab262e4f4f544590f968b8d30 Author: Konstantin Belousov AuthorDate: 2026-02-16 07:28:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-18 08:00:04 +0000 open.2: stop making impression that fd must be directory (cherry picked from commit 5bcccc702b29a0e173a5916b001771dd7b280c7c) --- lib/libsys/open.2 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index a0e905a8f375..b4463180e4bc 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -72,11 +72,18 @@ function is equivalent to the .Fn open function except in the case where the .Fa path -specifies a relative path. +specifies a relative path or the +.Va O_EMPTY_PATH +flag is specified. For .Fn openat and relative .Fa path , +when +.Fa fd +references directory and without the +.Va O_EMPTY_PATH +flag, the file to be opened is determined relative to the directory associated with the file descriptor .Fa fd @@ -104,6 +111,14 @@ it ignores the .Fa fd argument. .Pp +When +.Fn openat +is called with the +.Fa fd +argument that does not reference a directory, the call fails unless +.Va O_EMPTY_PATH +flag is specified, see below. +.Pp In .Xr capsicum 4 capability mode, @@ -421,9 +436,11 @@ by the descriptor at the time of the call. .Pp .Dv O_PATH -returns a file descriptor that can be used as a directory file descriptor for +returns a file descriptor that can be used as the first argument for .Fn openat -and other system calls taking a file descriptor argument, like +and other filesystem-related system calls collectively named +.Fn *at +taking a file descriptor argument, like .Xr fstatat 2 and others. The other functionality of the returned file descriptor is limited to From nobody Wed Feb 18 09:46:51 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGBVg6HxKz6Rs9w for ; Wed, 18 Feb 2026 09:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGBVg4Ch7z3J6S for ; Wed, 18 Feb 2026 09:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771408011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BAZAiAQbsG6q/k49b4VN4P1IfaXIdpW10TKc/Qp31A=; b=eUpnEZ1JV5S8uVj+jFFUiypDuO4IpnyxewMwC1GHTFrCcJLwpJzpOquAy/KWrmZ8QXveiu A+9/5eEk7U0rZfah/lXWU8bOHnGja9Mq+JukGZJ2SfvNCi2nbDSYg+ESOMBC5LtK4uc0Vd zah8qdfc0Gp0+fOZMeLd/Wzrw6+voRhY2OJpFrkXLe+bNkdVslYgZN9iNysbo+RgAAcYJw I0B4AtWuPhniw1wjtz0ih7tyaDLOD9hAlyCWbka4PjvqC2jjsIThR05NJimGaNOThXDP7O tBJUNC9jSc+A1SjX05XcQuq/9FruQarIf2AJGt6EFa7KLZ41Y48AyoTAydl35Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771408011; a=rsa-sha256; cv=none; b=r0nD9AgVDwwh1mPjqSAuXnsOFfNga3UTrh9ue8wLIg4JywWYHGTWVUPIhVrMmzKYqWm4zc hvEgUNXfarLsTEPmHWpli7HX9oulZGiGSk7cxmOskwHwjKm2hbziughaz2zE3jg6SspXLO IpyB8OVx19wnGyzkZ0SFIg+eqDgoMBve11qvhSF7qYbO9LNOyVaDhhqxpB0cl9nPADz3No kOS8Nazdx9dRnPEqx+/XmoVZAG/qf3esq+Et/PfVSBSDee+sV1ZojOBKx2GYkZllvQuDfv IeDdjclD5K9NBI02VcvR2oFDE3YCVI+c1hRfho0vKDXHK6xg6MERZwODHGS5cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771408011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BAZAiAQbsG6q/k49b4VN4P1IfaXIdpW10TKc/Qp31A=; b=BKC6mMLJISebBe72sI8XGfKbvD13czrhxeODhT2SRu+EDNyOPA29RQroauVLo0YeLaEbM0 KkjrYMRM8ZFQUGB2e5GoX3LQL0Ei9rCK5uc1EDjrgzaFFrtOGdIkQ/+3dCHvHF9+5v8ETm X5QPOLlqFsJHoG/fnxZ+jteFjBeT/RYwMeRgTLyUqdVQpV7QoAka8LJwdYim1kr32QxIxX lvp38cMe9uV4j8iLmGYEkRJwROy5aK+TZ10hXLgzj9wipZQmkvfDuSp2BJ8XEaKJUrgoVh 02iqmpSCJf9jotnR4x5Ez1uY+iBhiFikJlfqhzKImqu1j1Ch3eQTlkDiUX+DVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGBVg3bPdzrNC for ; Wed, 18 Feb 2026 09:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21317 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 09:46:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: 05305aceebab - stable/15 - pw: make manual page more friendly for uid/gid search List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 05305aceebabbf304f1fec312f2942f10535fe10 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 09:46:51 +0000 Message-Id: <69958a8b.21317.545ef0a8@gitrepo.freebsd.org> The branch stable/15 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=05305aceebabbf304f1fec312f2942f10535fe10 commit 05305aceebabbf304f1fec312f2942f10535fe10 Author: Dmitry Morozovsky AuthorDate: 2026-02-11 19:34:00 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-18 09:44:50 +0000 pw: make manual page more friendly for uid/gid search pw.8 structure is quite different from usual manual page, especially in describing -o option usage. Specifically, these paragraphs do not contain "uid/gid" terms, and have "user id"/"group id" instead, making searching for "override duplicate safety belt" difficult. Try to simplify such searches. Also, clarify uid/gid space between 100 and 1000 as "somewhat special", as it actually is. Discussed on: russian telegram FreeBSD group Reviewed by: eugen, novel MFC after: 1 week (cherry picked from commit e89454417b2bfecce9daee10dece2f49632640d3) --- usr.sbin/pw/pw.8 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index f6d9ebca6308..9b75ff772c25 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2025 +.Dd February 11, 2026 .Dt PW 8 .Os .Sh NAME @@ -572,8 +572,8 @@ It is possible to use to create a new account that duplicates an existing user id. While this is normally considered an error and will be rejected, the .Fl o -option overrides the check for duplicates and allows the duplication of -the user id. +option overrides the check for uniqueness and allows the duplication of +the uid. This may be useful if you allow the same user to login under different contexts (different group allocations, different home directory, different shell) while providing basically the same @@ -686,6 +686,9 @@ In general, user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . +Also, uids and gids between 100 and 999 are commonly used by pseudo-users +assotiated with third-party programs, and generally should be avoided for +assigning for normal users. .It Fl w Ar passmethod The .Fl w @@ -886,7 +889,7 @@ also has a option that allows allocation of an existing group id to a new group. The default action is to reject an attempt to add a group, and this option overrides the check for duplicate group ids. -There is rarely any need to duplicate a group id. +There is rarely any need to duplicate a gid. .Pp The .Cm groupmod From nobody Wed Feb 18 09:48: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 4fGBX04h9Sz6RsGJ for ; Wed, 18 Feb 2026 09:48: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 4fGBX021wvz3JcH for ; Wed, 18 Feb 2026 09:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771408080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRK2Mov/P4kGCGAGxReRnIarv4yHilnSwxnxb2VTupE=; b=DGY+A4Pdx0Y/R6fTpDO38tC5kDMHqy9bR16+W65TEyYIoEtKjPUitW5CwAzlYcabYquj4K L7QZQydMIJg1okIIWQi6k6ryOfGG+kxMWOujmDoadrmQX5R0jJQxVRfX5EgF3uDRce8MR0 n6NY67+UCMQfFoqQsuztCo57dXDoGiO4QqbB/qG24d3zUhFaIsGOXchEXPLS7cODrbIJ7x I28kgY59bnQPtHk3kMzGs65BnYo7/vHaIAEoiuHt/3/JmuILi0tSW2YRxegz6xfP0gQr/b g2EzmpzLLJnG1LtxQq1b3r2zyD7XpXN18b5Wf5r0TVHPyIZ8QYHKKpkaiHDR9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771408080; a=rsa-sha256; cv=none; b=qHLFcSK2/u509C85LVUDrN8A4iycMgnFlbbKzKstoTLnMQA2k5LNBUIKORVFvmj6AvpZ9n x3oJP6Qr5Cvx0QRLYterxsxoehQR4OEUbvd673xyr9kUxexggKHhLDALkXbGzXsmk68fpx AuIqiX4tatjYGWzNgjrMi3B1eY2gqREPWtEzY9BDADFQDPTEeLPgEZGP49VROjwUVQDMrh OsWBmmK+mR6E3fdNiNCeNVIH902XKqpiVEtOju/dFMHXDhwl0vq6BjLlhncsSON7jnfPUJ 1gom8nyqobKc0OOnIh4dT8T0DIGrYleGJUED+pduSQDklKrrGivWbu6S05DD2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771408080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRK2Mov/P4kGCGAGxReRnIarv4yHilnSwxnxb2VTupE=; b=B78YBjF2qRcp4sDw0yQANt5Ggd0Z7M77/rhnNC2xMO2f31LBMpDqSl1E5SZkLl5MOBbxQ5 f5RBHruuWgzrZW1YIbsjde+r2wsdATKEN/6jXfl7mzb1u0NNAtIeBJVAZoWXPQSlMUvgFX d4OjXOrEBj1U6xj9oStuNOSHkZu+kD/RcXAM0XXKG9u5yiXf3uZnV8yhHvmNcCImiErhLL l35gTJRN/qzqr0yZhTqp5Qn/R11XYWEp0y9touh5oa32KyKhpNE2KQahnk/N3D0pQwQg4c oYlpKXq1MWnTIpcSwvvQph2cfZj1LnazyOdQA2uhrj7uSC8MdYwc8mRi/CAhzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGBX01ZHgzrQp for ; Wed, 18 Feb 2026 09:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2106d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 09:48:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: 8a2d04cf8c86 - stable/14 - pw: make manual page more friendly for uid/gid search List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a2d04cf8c866ff3a6f358257d7aeeefbdd84455 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 09:48:00 +0000 Message-Id: <69958ad0.2106d.1e1f2029@gitrepo.freebsd.org> The branch stable/14 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=8a2d04cf8c866ff3a6f358257d7aeeefbdd84455 commit 8a2d04cf8c866ff3a6f358257d7aeeefbdd84455 Author: Dmitry Morozovsky AuthorDate: 2026-02-11 19:34:00 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-18 09:47:48 +0000 pw: make manual page more friendly for uid/gid search pw.8 structure is quite different from usual manual page, especially in describing -o option usage. Specifically, these paragraphs do not contain "uid/gid" terms, and have "user id"/"group id" instead, making searching for "override duplicate safety belt" difficult. Try to simplify such searches. Also, clarify uid/gid space between 100 and 1000 as "somewhat special", as it actually is. Discussed on: russian telegram FreeBSD group Reviewed by: eugen, novel MFC after: 1 week (cherry picked from commit e89454417b2bfecce9daee10dece2f49632640d3) --- usr.sbin/pw/pw.8 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index f6d9ebca6308..9b75ff772c25 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2025 +.Dd February 11, 2026 .Dt PW 8 .Os .Sh NAME @@ -572,8 +572,8 @@ It is possible to use to create a new account that duplicates an existing user id. While this is normally considered an error and will be rejected, the .Fl o -option overrides the check for duplicates and allows the duplication of -the user id. +option overrides the check for uniqueness and allows the duplication of +the uid. This may be useful if you allow the same user to login under different contexts (different group allocations, different home directory, different shell) while providing basically the same @@ -686,6 +686,9 @@ In general, user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . +Also, uids and gids between 100 and 999 are commonly used by pseudo-users +assotiated with third-party programs, and generally should be avoided for +assigning for normal users. .It Fl w Ar passmethod The .Fl w @@ -886,7 +889,7 @@ also has a option that allows allocation of an existing group id to a new group. The default action is to reject an attempt to add a group, and this option overrides the check for duplicate group ids. -There is rarely any need to duplicate a group id. +There is rarely any need to duplicate a gid. .Pp The .Cm groupmod From nobody Wed Feb 18 09:51:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGBcK4fDRz6RsYc for ; Wed, 18 Feb 2026 09:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGBcK16VXz3K95 for ; Wed, 18 Feb 2026 09:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771408305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBzrl2kylABTKUaQnX3CGRIrHpzZnpIq6+0Ej//ffcE=; b=QL/E6fyTUI0fpz5JXgUJagfNZLkqxcYBoGpaCRti8nD1OVMYtb17ij3Rh/G1H76YKo7s7Y WXzA0MLg5LUr2UzFSWk1GCOlcjtCdY9fohDYhOJLKDX7jxN2LFuorYZD55ojfYEtK9gS7v YSmvjywaXRGIH++NZ1aKYlY7Yx+Q0tTUXvvtlD1XDma1Ia0V+zxUJgz4Bkg0h6/mW9d1d2 VOVrk2X0stkPI2ElvROqFmHTVSBcKirFSRz93eAbDz8a5Js6klxramMzeT8CILtYE9t0tS cCIjhibs0sXPiDxXe4WagND9x8Vzi0F2o3dyz1tYCPtaJbyE/Hy5/+Gff5PyRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771408305; a=rsa-sha256; cv=none; b=f66TH2guGiRjN4Lvg/6zfIqiWKVnSN6fMleOoSiLBxAUSDEVeo/KTIuF7t7vczLP8P5voM iiEeIFg+pwh9vLAkPrsZh4SoBKdI6T26bP4KKH/4hEiLWYRJ9u8d3n/1pfPbmxeA+KUQTB xj+IbzLBUbddyhMkIZ1JHlZKzzJRyvOKLO1LPEsodIT9KYxF3elExNbM6xnDQZkc5jNA3+ 6rYH34DOYtdsVEbeMGp7fNEojR7Uc1rZkuRSABdvM4GF4/0AIhFEDoGHUp+wX6iTd+a6Kj ia+QlwpbV9NmIIzIkYv6nCathWvgPAnXjHSIAMVGKYsuZJA1vXZdThgf0aA/pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771408305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBzrl2kylABTKUaQnX3CGRIrHpzZnpIq6+0Ej//ffcE=; b=sUNaXZA4hRWtzEXXtLLP2xOepAOG94pRO8CKXepghCE+tEj64Y34tHHy/vCk2eYV0/uj2G BkTrijsBlO0Xarc7hNxmYXsTIXp77V7PhF/bbBstWWeUfz4RY8flEQ0zhBpQnYjOSEcfcm eqcL4mHrFqyx4L4gjdmEwlLLxO22PxSfyFBN2EJxZqDkr/IHzLtkCWJ+SVThAxFxAlt+jP Lyg7shRf8qcF2eDWNuXZBehek1ObxhX4zxOIakDWQs1X7d837F97iVWjw/J6+sntcHOm6n OOxszMh0pPvPahdKXOgusgGYCoIO07G/bSCBC+FSY8qlEkjk8iLf8jtyRKJscg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGBcJ6ycMzrTF for ; Wed, 18 Feb 2026 09:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2163b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 09:51:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: 4c66fafd6b29 - stable/13 - pw: make manual page more friendly for uid/gid search List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c66fafd6b29e306184ff3bd1bcd6c8f4a29f11c Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 09:51:44 +0000 Message-Id: <69958bb0.2163b.6f8a7e08@gitrepo.freebsd.org> The branch stable/13 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=4c66fafd6b29e306184ff3bd1bcd6c8f4a29f11c commit 4c66fafd6b29e306184ff3bd1bcd6c8f4a29f11c Author: Dmitry Morozovsky AuthorDate: 2026-02-11 19:34:00 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-18 09:50:59 +0000 pw: make manual page more friendly for uid/gid search pw.8 structure is quite different from usual manual page, especially in describing -o option usage. Specifically, these paragraphs do not contain "uid/gid" terms, and have "user id"/"group id" instead, making searching for "override duplicate safety belt" difficult. Try to simplify such searches. Also, clarify uid/gid space between 100 and 1000 as "somewhat special", as it actually is. Discussed on: russian telegram FreeBSD group Reviewed by: eugen, novel MFC after: 1 week (cherry picked from commit e89454417b2bfecce9daee10dece2f49632640d3) --- usr.sbin/pw/pw.8 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 5ba35c193811..9bbb05ae0082 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 28, 2022 +.Dd February 11, 2026 .Dt PW 8 .Os .Sh NAME @@ -551,8 +551,8 @@ It is possible to use to create a new account that duplicates an existing user id. While this is normally considered an error and will be rejected, the .Fl o -option overrides the check for duplicates and allows the duplication of -the user id. +option overrides the check for uniqueness and allows the duplication of +the uid. This may be useful if you allow the same user to login under different contexts (different group allocations, different home directory, different shell) while providing basically the same @@ -665,6 +665,9 @@ In general, user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . +Also, uids and gids between 100 and 999 are commonly used by pseudo-users +assotiated with third-party programs, and generally should be avoided for +assigning for normal users. .It Fl w Ar passmethod The .Fl w @@ -864,7 +867,7 @@ also has a option that allows allocation of an existing group id to a new group. The default action is to reject an attempt to add a group, and this option overrides the check for duplicate group ids. -There is rarely any need to duplicate a group id. +There is rarely any need to duplicate a gid. .Pp The .Cm groupmod From nobody Wed Feb 18 15:45: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 4fGLSH6V2Wz6SNp7 for ; Wed, 18 Feb 2026 15:45: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 4fGLSH30ffz44Nb for ; Wed, 18 Feb 2026 15:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429519; 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=emCGicxgIHyEIvUAQMhXF3jnAp6SbivZfJ5wyr7rT9I=; b=r55jAtM/VpzPiaeKdfbkQ6+pfbNyBJ3BrivjzSYpvM6cmfibYzwQU1xgifrwsK/TcnyAnD +cyPYRke2jrg8oShu8hpFaAuL2lFM0jyatHu3ybuI1NJLBFm2e7iPJ2B2p4BzfJviTi5Ou RrsMihwwNfa5T6Qqk6cWPksUrzolj6sJUnVO6yAG7LFNGUKpmmYVuIkdRFq3RGv6YgvukZ MYgRh+DXeGb6GlZensw7hAfZoXjXlqgnrW5EQuwu/flVcsGOQE6wN2Nfp/Ei90ozw68meE 44YxEtFhKD0bmiDGkbJsXdP6ELgNjB3E94SShwvKTgVBY3R/bhvGwSf9yEdZzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429519; a=rsa-sha256; cv=none; b=De8Cria7yNA18O51VRbDo1hX4cR0GJGAHZls0QKf2HSOKKqBJnDarSyhlNeizCvPXi5b3K /kPcdq7CVY49AHXQK9mLmFMnY6+hzfmXyihf20fGDUx0SgPccSQ/vU/JUPeMkdQ+186WK+ QP/AfkdaRkCidSHS+TBhyCDYCUDPwlKWrvTjMTmWDKFVYJSHl/RxvsWwSn/RY7li2/IWbT uIzgIp9R5j4+q0vvVuUEKp76w/Pnu7rsEaiNEBhycifoXQReE8XmHfiH8s513G9xOpwcQZ 4Bd3i2TwjFwmGRCm+ERcSWVrPObGGG19xWQYpIbN0uQDKCH7cRphKz+k1MKwUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429519; 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=emCGicxgIHyEIvUAQMhXF3jnAp6SbivZfJ5wyr7rT9I=; b=uA90uUtcx9wTe8s+eecoVuu8dLBd7qY2donFxKvP/0mFuuMwAqKlj2WDCffYMuv29q1oiU VM6hIxPH1Yo/uZdaT+YsDiwecDNRAXG5azIUrm8yoIhR8en2Pzl8RCZNVZnUq5asWrujzE MK4+qbwQuBkhfyYc+SZJkpPQ8d2MDfp94UVKvZ+JuQ2j5bZG1wi6+XqMWKjPlIS3GGvt1+ zm7SNn5KfLbAY+6yrTjCTZBcXi6o2YUqGiLUmkr77ISzZKcIekGE9M1enqnGn7MDmKOCr2 6cEj8jCpD7KLlPLlTrqBdRkdXfUXiLNAm1xs18bcz+IbOtOCxyJ2Vavdok/bpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLSH12b6z12P9 for ; Wed, 18 Feb 2026 15:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:45:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: mothcompute From: Warner Losh Subject: git: 5bce9d67103c - stable/15 - linux: support termios2 ioctls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5bce9d67103c50584b0c768e35fafa929404af30 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:45:19 +0000 Message-Id: <6995de8f.26c58.47805f48@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5bce9d67103c50584b0c768e35fafa929404af30 commit 5bce9d67103c50584b0c768e35fafa929404af30 Author: mothcompute AuthorDate: 2026-01-06 03:19:21 +0000 Commit: Warner Losh CommitDate: 2026-02-18 15:41:45 +0000 linux: support termios2 ioctls Signed-off-by: mothcompute Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1949 (cherry picked from commit 85bf328868c8f6d8fede9d8d4b4ff8a589636990) --- sys/compat/linux/linux_ioctl.c | 69 +++++++++++++++++++++++++++++++++++++++++- sys/compat/linux/linux_ioctl.h | 10 ++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index ceb17bd040b5..f6c239b08ac2 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -331,6 +331,17 @@ struct linux_termios { unsigned char c_cc[LINUX_NCCS]; }; +struct linux_termios2 { + unsigned int c_iflag; + unsigned int c_oflag; + unsigned int c_cflag; + unsigned int c_lflag; + unsigned char c_line; + unsigned char c_cc[LINUX_NCCS]; + unsigned int c_ispeed; + unsigned int c_ospeed; +}; + struct linux_winsize { unsigned short ws_row, ws_col; unsigned short ws_xpixel, ws_ypixel; @@ -386,7 +397,7 @@ bsd_to_linux_speed(int speed, struct speedtab *table) for ( ; table->sp_speed != -1; table++) if (table->sp_speed == speed) return (table->sp_code); - return (-1); + return (LINUX_BOTHER); } static void @@ -508,6 +519,14 @@ bsd_to_linux_termios(struct termios *bios, struct linux_termios *lios) lios->c_line = 0; } +static void +bsd_to_linux_termios2(struct termios *bios, struct linux_termios2 *lios2) +{ + bsd_to_linux_termios(bios, (struct linux_termios *)lios2); + lios2->c_ospeed = bios->c_ospeed; + lios2->c_ispeed = bios->c_ispeed; +} + static void linux_to_bsd_termios(struct linux_termios *lios, struct termios *bios) { @@ -628,6 +647,16 @@ linux_to_bsd_termios(struct linux_termios *lios, struct termios *bios) linux_to_bsd_speed(lios->c_cflag & LINUX_CBAUD, sptab); } +static void +linux_to_bsd_termios2(struct linux_termios2 *lios2, struct termios *bios) +{ + linux_to_bsd_termios((struct linux_termios *)lios2, bios); + if ((lios2->c_cflag & LINUX_CBAUD) == LINUX_BOTHER) + bios->c_ospeed = lios2->c_ospeed; + if ((lios2->c_cflag & LINUX_CIBAUD) == LINUX_BOTHER << LINUX_IBSHIFT) + bios->c_ispeed = lios2->c_ispeed; +} + static void bsd_to_linux_termio(struct termios *bios, struct linux_termio *lio) { @@ -664,6 +693,7 @@ linux_ioctl_termio(struct thread *td, struct linux_ioctl_args *args) { struct termios bios; struct linux_termios lios; + struct linux_termios2 lios2; struct linux_termio lio; struct file *fp; int error; @@ -1001,6 +1031,43 @@ linux_ioctl_termio(struct thread *td, struct linux_ioctl_args *args) args->cmd = TIOCCBRK; error = (sys_ioctl(td, (struct ioctl_args *)args)); break; + + case LINUX_TCGETS2: + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, + td); + if (error) + break; + bsd_to_linux_termios2(&bios, &lios2); + error = copyout(&lios2, (void *)args->arg, sizeof(lios2)); + break; + + case LINUX_TCSETS2: + error = copyin((void *)args->arg, &lios2, sizeof(lios2)); + if (error) + break; + linux_to_bsd_termios2(&lios2, &bios); + error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td->td_ucred, + td)); + break; + + case LINUX_TCSETSW2: + error = copyin((void *)args->arg, &lios2, sizeof(lios2)); + if (error) + break; + linux_to_bsd_termios2(&lios2, &bios); + error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td->td_ucred, + td)); + break; + + case LINUX_TCSETSF2: + error = copyin((void *)args->arg, &lios2, sizeof(lios2)); + if (error) + break; + linux_to_bsd_termios2(&lios2, &bios); + error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td->td_ucred, + td)); + break; + case LINUX_TIOCGPTN: { int nb; diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 8345b7e4b719..d01a30538981 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -383,6 +383,11 @@ #define LINUX_TIOCSBRK 0x5427 #define LINUX_TIOCCBRK 0x5428 +#define LINUX_TCGETS2 0x542A +#define LINUX_TCSETS2 0x542B +#define LINUX_TCSETSW2 0x542C +#define LINUX_TCSETSF2 0x542D + #define LINUX_TIOCGPTN 0x5430 #define LINUX_TIOCSPTLCK 0x5431 @@ -501,6 +506,7 @@ #define LINUX_FF1 0x0008000 #define LINUX_CBAUD 0x0000100f +#define LINUX_CIBAUD (LINUX_CBAUD << LINUX_IBSHIFT) #define LINUX_B0 0x00000000 #define LINUX_B50 0x00000001 @@ -537,8 +543,12 @@ #define LINUX_HUPCL 0x00000400 #define LINUX_CLOCAL 0x00000800 +#define LINUX_BOTHER 0x00001000 + #define LINUX_CRTSCTS 0x80000000 +#define LINUX_IBSHIFT 16 + /* Linux c_lflag masks */ #define LINUX_ISIG 0x00000001 #define LINUX_ICANON 0x00000002 From nobody Wed Feb 18 16:29: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 4fGMQq0nsFz6SRM5 for ; Wed, 18 Feb 2026 16:29: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 4fGMQq0Bc7z3GHs for ; Wed, 18 Feb 2026 16:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771432147; 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=rUGU0ozR1V6g5NNAbkp7ob4b0NqJNkd/s/yx0lLBRqk=; b=HXes4XTsqDcJvIpPGlYvojyuPw/2St/lDjHEwQPA1F4jdm2w9NPHuLsunxRb41sBxgGWHH tVqGCsUjuI9dmjZnWUin5HrKJ4cBj0r5OqOTsYC/ERqa/prRpN7yyEcMn8fHBRiNBABuD3 nwmmWekq6X2Jvx4DCWeQjAIHlf8Vp/sVLAIEt4zYe/YGUiTD1gEMfCGLHheUcJu6MazPoj s2GuyFwjAVhQhOwXEbwR24IHSjjfNiAJFAKIweh9mvu1Ph+oiyRyDjPmSNhgAZdECBWFEg MUL2iqrB4nCB2D63MwJ63e+MGfBO9nbq/1YvSmjK/aocYjO9yluE8G28sWN/nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771432147; a=rsa-sha256; cv=none; b=B4U01yjbb9L0dkKLr7Wcgf5HrhX/0Zqt/f+IXXYQGk6xUTdozjBl+UWZ0RU3kcX2HxdD86 5YYjkLCSDBTDMoOn784inWeV+lPak5AZ22LLj7rHZCcKgjBzY8ns/hg0wrShx1oq/IUrxw 0O1d2E+MQbUdKgUU7cuBeliw/ZgLwbcA/BIDiLnR67lqS132xZC4qnNfkW4OsTRx92RWiK bPV2cWJvyvYFWw6WU7Wj/VJirDDGct8OffB5YBvmrjrnilSzpwxjGj+f9blH57hlO1OxYp jxtP49h/cbwrXSgYdF2wiZ6NMn9c5dVSBQLmohYfK0A53wod1ASDWpYEh4CAcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771432147; 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=rUGU0ozR1V6g5NNAbkp7ob4b0NqJNkd/s/yx0lLBRqk=; b=laf5SqFJeoRpHN2lM8uIwA00fmoNkzBOOBIH9j9qibuxYYHPdbhOyYwHbUEhW6YH5fv3x6 UFQayZY0NlfTw32/HrhUoc8tE52yZwTybp9UwkElgd2IUd9dXgB/jacMtwSU7YzFHHN8Ch QNbAzShljP42uo6slzek18Ux61uLhBi97UzhrRhS8jKdBjWLU4HDqnQeW/xwSLI+d21iCK GgKYZdJVJpsWFIxqNr4RJpI/oKkfVyJ980M+j2u6RgW9vmPUdmlkAsnK8082B//HkoGXla /t+1yAvXn+Hl9L6qfQTNRk8c0TTIHBJP2EVm29oZK+Z8zTT1OHw//9chi/vrfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGMQp6bfqz138b for ; Wed, 18 Feb 2026 16:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3174a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:29:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dmitry Morozovsky From: Colin Percival Subject: git: 7f1e9f945154 - releng/14.4 - pw: make manual page more friendly for uid/gid search List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 7f1e9f945154485f9f73bfb4ddb44ea231ae1cf0 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:29:06 +0000 Message-Id: <6995e8d2.3174a.3bbe7d9b@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7f1e9f945154485f9f73bfb4ddb44ea231ae1cf0 commit 7f1e9f945154485f9f73bfb4ddb44ea231ae1cf0 Author: Dmitry Morozovsky AuthorDate: 2026-02-11 19:34:00 +0000 Commit: Colin Percival CommitDate: 2026-02-18 16:28:43 +0000 pw: make manual page more friendly for uid/gid search pw.8 structure is quite different from usual manual page, especially in describing -o option usage. Specifically, these paragraphs do not contain "uid/gid" terms, and have "user id"/"group id" instead, making searching for "override duplicate safety belt" difficult. Try to simplify such searches. Also, clarify uid/gid space between 100 and 1000 as "somewhat special", as it actually is. Discussed on: russian telegram FreeBSD group Reviewed by: eugen, novel MFC after: 1 week (cherry picked from commit e89454417b2bfecce9daee10dece2f49632640d3) (cherry picked from commit 8a2d04cf8c866ff3a6f358257d7aeeefbdd84455) --- usr.sbin/pw/pw.8 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index f6d9ebca6308..9b75ff772c25 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2025 +.Dd February 11, 2026 .Dt PW 8 .Os .Sh NAME @@ -572,8 +572,8 @@ It is possible to use to create a new account that duplicates an existing user id. While this is normally considered an error and will be rejected, the .Fl o -option overrides the check for duplicates and allows the duplication of -the user id. +option overrides the check for uniqueness and allows the duplication of +the uid. This may be useful if you allow the same user to login under different contexts (different group allocations, different home directory, different shell) while providing basically the same @@ -686,6 +686,9 @@ In general, user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . +Also, uids and gids between 100 and 999 are commonly used by pseudo-users +assotiated with third-party programs, and generally should be avoided for +assigning for normal users. .It Fl w Ar passmethod The .Fl w @@ -886,7 +889,7 @@ also has a option that allows allocation of an existing group id to a new group. The default action is to reject an attempt to add a group, and this option overrides the check for duplicate group ids. -There is rarely any need to duplicate a group id. +There is rarely any need to duplicate a gid. .Pp The .Cm groupmod From nobody Wed Feb 18 17:14: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 4fGNRH2gX1z6SVml for ; Wed, 18 Feb 2026 17:14: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 4fGNRH22G8z3MZ4 for ; Wed, 18 Feb 2026 17:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771434875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzMLk5utXxeJnv4CF5nSHzzy0ENAS+JwcHIn81Peqpc=; b=O7xUV1wS6CcoKN9XlgAYYsPQEPMt4skoRxPBgBEgcyW2UKNIeIWf7/txeFtl4NGGdjLnTt bTiooEXJ2Y8dlvNUoaUKA+4m3dg2oi6C+DExQ0GlaPn0FB5CALFvQuzdG4t6CI+CTvPD3t DbRKc/FNuhtc8sgEZAxjl2vp0K6P67BDBINu7K5MhKpHfo5McemfqZSzTFz4ySf4pMwEvk x0eHO9dOE5gveufD596e07jv6kv/JlDpKutT1rk6c9vo/nkRDAVCog6O8VH5eEjBqZprLJ m0p9SEmrwU+PQsI791vq+X+/NnLB3itrz5EDeExYNTNmeWLopZbXj1EwVJcLoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771434875; a=rsa-sha256; cv=none; b=Ft+ExSeBp/FACcq+QuYB9MdAXrBUSPcqsvSA8dYRT0UWqzdF2qgFyvx7RTgKZriZ3nlQFe 4LDTXFVeQcwEnyHbSdLyRaB3zxewPrhx3pjIMv4QtpLrB/5Uho4MrIn+j59zNoHpNXI4wJ Aj7sX5l9uU9kzXwIrwikHgdrZmqpknpO+MT1CqtoFM5q0OjuDfRvlzyGvp6+777K5xsR5B uQbzb/CcIoPIbZN5GsFGqOdwkpQDT50qB9KKCIvnYy3rgks8xWO/fnIWdH68OPgQzfIQK4 s2SEtRGEPlTcdsj3AvrehH9XH/3FwnCqWNO99gYPZTmMOrKEZvI8icHvAmNmOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771434875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzMLk5utXxeJnv4CF5nSHzzy0ENAS+JwcHIn81Peqpc=; b=mDnczsYhI3hxlfam6xpvHtJxGoVSYSxGBxvbF3K8hsuCTmSzMVam8pl8B+Q+VUQuoOA3Zw y3cHho2JKkLJG7COgO53XO4tuPANMpNTzZIw4fDE0Cvkz3LFq65ja6pYBhsPli5za67dgP BeLrKPEJNlkadqkU02pMV4ZDozLhMA5oo86+TzQHi98jg400TASPg6eTZj9C0cLl0Igl/Z 9d2oNXnylsg8X4DgD0gT6s8UNzJ51Ql6xbTqadRvwmcWBfT8TcSPhHp8CONkYj+lz2A8lM wPucIPRZYahhgYII9lHFX737tVoJZHh1fvwGSPdrxD6DI6FEDd3aqzYTE0JTCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGNRH1c2Zz14hM for ; Wed, 18 Feb 2026 17:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3920b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 17:14:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 9fa21f66e48b - stable/15 - libnv/tests: unskip nvlist_send_recv__send_many_fds__dgram List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9fa21f66e48ba0c00c80a9ed1c8bf1a09e9ecdae Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 17:14:35 +0000 Message-Id: <6995f37b.3920b.32feeb9@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=9fa21f66e48ba0c00c80a9ed1c8bf1a09e9ecdae commit 9fa21f66e48ba0c00c80a9ed1c8bf1a09e9ecdae Author: Siva Mahadevan AuthorDate: 2026-02-11 21:05:25 +0000 Commit: Siva Mahadevan CommitDate: 2026-02-18 16:36:03 +0000 libnv/tests: unskip nvlist_send_recv__send_many_fds__dgram The test passes consistently for 1000+ consecutive iterations. PR: 260891 Reviewed by: oshogbo Approved by: lwhsu (mentor) Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55223 (cherry picked from commit fbe6da7f7592169ad7c26aa563f4c6305de1e345) --- lib/libnv/tests/nvlist_send_recv_test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c index 79297dfe2043..4a5c10df656d 100644 --- a/lib/libnv/tests/nvlist_send_recv_test.c +++ b/lib/libnv/tests/nvlist_send_recv_test.c @@ -482,8 +482,6 @@ ATF_TC_BODY(nvlist_send_recv__send_many_fds__dgram, tc) size_t len; int error; - atf_tc_skip("https://bugs.freebsd.org/260891"); - /* size of the largest datagram to send */ temp_maxdgram = 16772; len = sizeof(maxdgram); From nobody Wed Feb 18 17:46: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 4fGP8B0C8xz6SXw2 for ; Wed, 18 Feb 2026 17:46: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 4fGP894s1Fz3Q5M for ; Wed, 18 Feb 2026 17:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436793; 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=2gMeePdXA7BV/32BJ0jxL8GtJ4O5tJcLC5eO66MlMOc=; b=aIkczFWGQX4BYS/HdobDdjM0BYy6dlcylZxDvuqNvzmcvI12D8JbkC//wlfnelllTiaoWQ PwwsbRACtVwoWwvVx+T4sKlz63QF/g/4DFxTOV/5TCrNaA1d3nSS3qSs6+gim+eDWs37yu l/lr8UQKz9szxLSbRDnUhwfPvXuHw2+ZFBwY1Xqt/EcxelWeCgv63StwPUrx7kOo6lDuiA ga3HGY0ZlXOUMTWdyTCjqRzacOTWLxMXAXEwg9TD44vdTPotVsAjAe9fvcwGmPcuG1/rFc XOea/okAHnizGVVA4aq3M8FRhgVNwRTawuNOHkqeQjzyNwXuD9FYwA67gc/O9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771436793; a=rsa-sha256; cv=none; b=qEd6HtquUgsTEdvQg8MXMUW3Xc26ZEfgLOMX3o1mMN+2J7Sk0W0jQaHSs+nKSjqBUXmwA0 sM+DVqsGOHAQGNSLg/u5nFuAqA9H2R8TcRp7zqzhPNALOQBZp0+w8M0uQ0GqrJgJ37B45B b8t22WingPTipjpiNlkwecxv+/P8mwqNamLgMi+I6SS4lLplRkeK7KyA5lWamNKHMBuOct ZYFmNGzkKTIV47sCqyiSj0qjW1Dhm3GRMheXMK6y05qVhY/2Aqq3ae/Sggt44zTjVoZsNY sYjnLgqye7eVSNktg6CGaWez7s7yHhGAyplZvyserPFw9y3BiJrKeNKAZqiq5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436793; 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=2gMeePdXA7BV/32BJ0jxL8GtJ4O5tJcLC5eO66MlMOc=; b=I9UDChWwNTs7crJb0TOpHmN2ysBRYgq4Zoq/zX7hlhPUGo+4uOubaAy7NhFf7gJgcreVsL 23XHC8NdWLr6qS9lWUOhI/CgBZ+fftrJnlQ4tk19623YnZU/ue3ThlInekEwoCRmzoZOTB /BzjWi/imIRywdrQWTQWUExg8Ve5W4+C7ymOOgW/ZeSzDxpyk+f5iah4R1bGPoTBhwyUXY 4Maj2gzJO5M/OoJCI/PlVA/an/QM1D28dbWFSnm0nTcQDl/Vdz1Xuj2oueal5jiRKO2QC/ S25yFX8DGA9KyN/CUBTvfwjjqP1Y7fJozlS19VYfM2cEWk51nlsJRx89lUp/mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGP893dHRz157L for ; Wed, 18 Feb 2026 17:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 17:46:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Pouria Mousavizadeh Tehrani Subject: git: 4dc38e71ccd5 - stable/14 - ng_ksocket: use new macros to lock socket buffers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4dc38e71ccd522bc5460f3ded3977baa35dad4b9 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 17:46:33 +0000 Message-Id: <6995faf9.3b0c4.5a0022c5@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=4dc38e71ccd522bc5460f3ded3977baa35dad4b9 commit 4dc38e71ccd522bc5460f3ded3977baa35dad4b9 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-18 17:45:18 +0000 ng_ksocket: use new macros to lock socket buffers PR: 292885 Reported by: Walker R. Thompson (cherry picked from commit 1a3d1be4965afddded0b2582b9c4969c1e6a4129) --- sys/netgraph/ng_ksocket.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 777f3261356d..5baf25579fd9 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -608,12 +608,12 @@ ng_ksocket_connect(hook_p hook) struct socket *const so = priv->so; /* Add our hook for incoming data and other events */ - SOCKBUF_LOCK(&priv->so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(priv->so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_rcv); - SOCKBUF_LOCK(&priv->so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(priv->so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_snd); + SOCK_SENDBUF_UNLOCK(so); SOCK_LOCK(priv->so); priv->so->so_state |= SS_NBIO; SOCK_UNLOCK(priv->so); @@ -1239,12 +1239,12 @@ ng_ksocket_accept(priv_p priv) */ LIST_INSERT_HEAD(&priv->embryos, priv2, siblings); - SOCKBUF_LOCK(&so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_snd); + SOCK_SENDBUF_UNLOCK(so); /* Fill in the response data and send it or return it to the caller */ resp_data = (struct ng_ksocket_accept *)resp->data; From nobody Wed Feb 18 18:39: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 4fGQJx3n2tz6ScCN for ; Wed, 18 Feb 2026 18:39: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 4fGQJx1wKxz3Xqv for ; Wed, 18 Feb 2026 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqjFNeUjJAYSHcBmgSlAr0IYHhGjkkuUkIJC8UzDnaQ=; b=uUBpjiNfZ58SxxIy9ENKOCbl0Xy9osnTxctS+LYMucwOa73j5KeaFhpFF7//qjE9NpGlE1 ptIoLcpfVZNkcT1+T8/qLXCg+4hOjWUgYTYYnt8naw8yS4tDSo6CAqvDOd6rB7xQIyF2wD n92U6c/r0hfn91FpPiJJoN2U7ECguPH6/zdWdNJDTPZysrlLzuKDiEQWozpV313ZlFx2vf HCFLTP/gi0pTOnlC8nGa5LSNWJ9kRK/D3XKKA/aMTqvZAV0a8tlgyXBYwloou9DNKU/2tF K3oERTUWpR/jrYnqNPVfadfVaB5uygB8LPvxruTWz2eqm4OOM/JoVtb5aigIyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771439953; a=rsa-sha256; cv=none; b=uHdsniK3kfxsTcR4oAlLwXGgHKpGuBYmPu5Z2CcZ+tSU8E5HX1YmKOXZpsNtzlH0wZRJPQ V4oxBuxC6FPj+mrpP0Ir8Y26YT7e3kxjEGtZXaVOwWVmqF4O59qBdz1ntXmmbwHUM72ILV UC6ztqHjs7GfexOsOfSXOorbIIcU9s6cIc/sSp4Bqhn07rDCxgC+/EtaWNRF84Mx+jvRdd NFL82ragTb317+xR/e8T/QLEZpa1RBVN12kF5AEpEhLJoWRVUbhPa2kYJqKdH+29OZaU3O 3tiqvVMYdM7m+oTi+Zl3aoUW3DItH9OS5uU2YPPm6FRraaZWSy1CmKEKCns6cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqjFNeUjJAYSHcBmgSlAr0IYHhGjkkuUkIJC8UzDnaQ=; b=Kj32b2XEHP/LWq9q0vJjHTM4s3qtVZldkzKKp1MB23Dy2k+Bbr6td1kYfBSdnXtFtnsoEv 7GYAftIfvGPva72f+Rr2yHz25lt31r41/lq3IsxtXDxm9CVaOw64ubESdD+F9R/TonCVU3 AlXbmM/ewQ7E9q8QP3Bm8JbHVNX18jNGpysixNT+idKgJcIJSzII/3ykwvmO32zl2kSx05 016ZKeqKqzYGRfNf+E3Nrrmc5fRfiBJ/tXePsh0tpqApxaIiLWCp9vx2tiIiU/95NmDtW2 zQEqO8T1UE8/Dw389Hr4gx6RfpbBtek7az/UjS+IC73nMER5pFznfY5Pw9DVZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQJx0Z6jz16VN for ; Wed, 18 Feb 2026 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41089 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:39:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ae12f0f08e02 - stable/15 - libfetch: Restore timeout functionality List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: ae12f0f08e02804f5f2e70a0558c39a2cb4c5b23 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:39:12 +0000 Message-Id: <69960750.41089.1d3e6b43@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ae12f0f08e02804f5f2e70a0558c39a2cb4c5b23 commit ae12f0f08e02804f5f2e70a0558c39a2cb4c5b23 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:38:48 +0000 libfetch: Restore timeout functionality PR: 293124 MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 (cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207) (insta-mfc requested by re@) --- lib/libfetch/common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 584973476068..f679b2afc95c 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -286,6 +286,9 @@ fetch_reopen(int sd) flags = fcntl(sd, F_GETFD); if (flags != -1 && (flags & FD_CLOEXEC) == 0) (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + flags = fcntl(sd, F_GETFL); + if (flags != -1 && (flags & O_NONBLOCK) == 0) + (void)fcntl(sd, F_SETFL, flags | O_NONBLOCK); (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; @@ -1271,14 +1274,6 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; - struct timeval tv; - - if (fetchTimeout > 0) { - tv.tv_sec = fetchTimeout; - tv.tv_usec = 0; - setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, - &tv, sizeof(tv)); - } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Wed Feb 18 18:39: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 4fGQKG0Nq6z6ScNM for ; Wed, 18 Feb 2026 18:39: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 4fGQKF5THnz3YMZ for ; Wed, 18 Feb 2026 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YG75XmxuqRh0Fx5l4+YKIuTi8GJmfgjVD1pNV7CTe4I=; b=MgKxhC5y2bdE7pYEA/wrjhhXPYB5NkWgPRmpc5rdJ0hSNvl8i3ud/uOrTevio24YUS15ZH L2qFUNqs8JxOiNDV+J3/Q25c6Z6R50dyZwq9pVSIYRIA0inDuP6TSGjsJ4BROdojrSZjSx Bhum74iHfeETh2nQ1N6EbDtNb5NWc2uia4W4bk1yeEzDTmVmQYVvaz5wkbsJZnK3iHAoww 2slK9e37aukVvTnwyH7dVRpF1NaPzIdlsWA2DXiz0gR/SirzNMgsm2+jUbHkE0dIzQ/y1R Rgm9s4vD63nuq4jlD3haIcQz6UFc+O25Fhg+XCE9xNk4GGfH37wLZul7AG6dIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771439969; a=rsa-sha256; cv=none; b=n6VDMTCDEVKcozBjVDJ8BuUaXBXceeF4mYLHPzmT18C8pmY4XbYAXiQfhrRc07v2yoG10O wFC9inc2kc0Cedc1T2F406u7dLB7HglYWWReujUIr2SjeATeraLzePddLuRyL7x/ZPyne8 VVrcWlGU3hUIVgfRhH0iUQwqCJmoY5bgyMTtMgoGMuDXRNxMq2Stsjn7sPBXVUFR+2M4VM Mg3ZN5SGLBHSiSA3h8jpRjF7XMrfMt/8Sx7ZKKEkYchbS5tx4h/ypAQhOTk6UfNPRz3OQz Hz4KgIaxfhieoWY+Og7GyjvWzOFtOo4UqqMmuwyg0wfJSX7S0YqhMAhBIgJ4rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YG75XmxuqRh0Fx5l4+YKIuTi8GJmfgjVD1pNV7CTe4I=; b=khMk/8pn3Ye45EPBe+6wng+rYwBQtTf2XhYjE/4i0/DnuCOU+VL+IUqvPdm2bPV5FvGtRt Eu2+7yUFfP7H/2aKyD3X/jtzUCFs0BXd4wTk2HyIxCGMhGrMkOm+Qmz0FgnoIAp+mpxrKe E6xdWL4LX+7ejdv8/RVvZeEjPkr6OitFL+2D11E6ufgA42tm7Vl3QpaLbWjQvfoe4vLEZB EWKEy+WweQ8CvNTcOHkCuCJdqAWgqe9WFibYvoGkv/7bWMNWEmClqwVdKne9pGd/tFLMfV pHKeV3EiYAJQj0/6gP3PzTGGofhbNhiXtufLk8tlamCIZEEjSgIrg+9tY2mUDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQKF53RQz16FG for ; Wed, 18 Feb 2026 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4108d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:39:29 +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: d97c824f5b4c - stable/14 - libfetch: Restore timeout functionality List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: d97c824f5b4c9e7e3a1400699022cba146e450fa Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:39:29 +0000 Message-Id: <69960761.4108d.113db3a6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d97c824f5b4c9e7e3a1400699022cba146e450fa commit d97c824f5b4c9e7e3a1400699022cba146e450fa Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:39:23 +0000 libfetch: Restore timeout functionality PR: 293124 MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 (cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207) (insta-mfc requested by re@) --- lib/libfetch/common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index d5423d8eb5d1..bdc72f67c9a0 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -287,6 +287,9 @@ fetch_reopen(int sd) flags = fcntl(sd, F_GETFD); if (flags != -1 && (flags & FD_CLOEXEC) == 0) (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + flags = fcntl(sd, F_GETFL); + if (flags != -1 && (flags & O_NONBLOCK) == 0) + (void)fcntl(sd, F_SETFL, flags | O_NONBLOCK); (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; @@ -1272,14 +1275,6 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; - struct timeval tv; - - if (fetchTimeout > 0) { - tv.tv_sec = fetchTimeout; - tv.tv_usec = 0; - setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, - &tv, sizeof(tv)); - } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Wed Feb 18 18:41: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 4fGQMt6Bjcz6ScR8 for ; Wed, 18 Feb 2026 18:41: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 4fGQMt5jPRz3Zbv for ; Wed, 18 Feb 2026 18:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dDD7Y7h92PB5sOXOQbj6unV80thH+WChcxf75z853q0=; b=njbGOeYnlUvvfR9QkD0/eUROElMhm8KxpYSXbhM+xb94E6mbtmFJrlu4XAa7AgkwoDHOF0 JmYMSPXGH0EbIndxE7BQiaxlHsIDwhM7WRlq/78hYjrfmxDs6BVRyolAn2emMimIhq2BCI fzVfW14EWRG0MN4SkkFsONV63wkUaEWwrqx/x17iwsee629obKwMW8/UIPgFAXzSrUdOqF u/aPyPqp9NWl0huMKQRZh4zBzhTQh1FLcm8Eb/gfZk9o1FtsCN8hpcGbwXhVBylqykYjKx Rsz5T2ubv5wHMjYNTJiugFDxiybk40EMJoP7jRw6JZEKu+R9DleRZGjVNh0Wvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440106; a=rsa-sha256; cv=none; b=DCsVaoVvMjGY0izO94QoEyHn8XRcsB3KmyHGyK/+rb70RikczI+bABUijpJI6GJOuIBTyS 2OA/Ls+Iq2cquI+c78l17+cknU4GxRKHNIgD/b3o5u43mB3uxjsyka+3Ve8z9kUfOCul1N fgpPP1ZxkeLHh+MvMr2uXfcBqmkFpQDt07iB/2TlCJf7SeoCOfdCttRUaxj4e5VlaP5mXx 7pUEOWaX1ZZS5K9vfXkzkatjwgb4h0zprVis7QXTAMJavTSxUINf4NTFSzI96jaC3jYtWz UZqYTvAoc/QdkKNmIo2ESH4DD5BaZW8EI1Ueg3p/baUN3Qmypq7tX63hJgWuWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dDD7Y7h92PB5sOXOQbj6unV80thH+WChcxf75z853q0=; b=WLChyHhC9OQd3zsFBiaF9jG1pdbxzdPJ5yBjVHxYHHM1kboawIwry/5FD/HYH8xkzLnqsd cac+yP0LwYuBV0ampHxcD7LXfcHiClLTxf1EYAsqLpNa9z3hbCZ9zbt2s1Azg4U6XA+MCV B+6xHQitt2Jv1/RGUPQusz5kbk/YI1/EXJ5mlbvlimpdrR0xUo9bhADu4HQ0E1witIwUWS hJoUm9sB9FrGnltjRVhTrdQNLTeX3qED+Meh5mu90NxD5MJR1+gUNGW1I7JAawFsw5pc3z B4mtaRpuP/gmPAq4fLfXLI0zuNSvxED7ZcjWkP6DTDd7mlLJQVhNR2Rs+WZXMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQMt5Jzpz16jr for ; Wed, 18 Feb 2026 18:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 424a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:41:46 +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: 589cef5d5151 - stable/13 - libfetch: Restore timeout functionality List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 589cef5d51512782cee8b4562a62e70c654a7427 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:41:46 +0000 Message-Id: <699607ea.424a5.6b0e98a6@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=589cef5d51512782cee8b4562a62e70c654a7427 commit 589cef5d51512782cee8b4562a62e70c654a7427 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:41:17 +0000 libfetch: Restore timeout functionality PR: 293124 MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 (cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207) (insta-mfc requested by re@) --- lib/libfetch/common.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index ca5022df38b4..008185720f16 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -278,13 +278,18 @@ conn_t * fetch_reopen(int sd) { conn_t *conn; - int opt = 1; + int flags, opt = 1; /* allocate and fill connection structure */ if ((conn = calloc(1, sizeof(*conn))) == NULL) return (NULL); - fcntl(sd, F_SETFD, FD_CLOEXEC); - setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof opt); + flags = fcntl(sd, F_GETFD); + if (flags != -1 && (flags & FD_CLOEXEC) == 0) + (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + flags = fcntl(sd, F_GETFL); + if (flags != -1 && (flags & O_NONBLOCK) == 0) + (void)fcntl(sd, F_SETFL, flags | O_NONBLOCK); + (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; return (conn); @@ -1269,14 +1274,6 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; - struct timeval tv; - - if (fetchTimeout > 0) { - tv.tv_sec = fetchTimeout; - tv.tv_usec = 0; - setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, - &tv, sizeof(tv)); - } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Wed Feb 18 18:48: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 4fGQWY4HpBz6ScpB for ; Wed, 18 Feb 2026 18:48: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 4fGQWY1nJtz3c6s for ; Wed, 18 Feb 2026 18:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lnYZ5fP2TtSiLKMjl3up77zuWr0wiLvCfdyNIhDqqLo=; b=XJnOK1mXQz7hknn3c8xszuoveFihFm4QM/V5SKe6R7+2Ez9eiCHN3d+1/s1FXsX8cGKdRE wlSL+JiXBpOnCvKR1V3D7K7g6CIcrcdi7Bfl0zDBuAVBlEvJ9RgeJNU5LQtEtIFJKP2OG8 gDXR4vL69gxnnASJGPh7FMedbEy5jWkuJesKRK9vRxL/ClJ3h6W1X3eLbpZFfIKlhNyGhq wnvNclUqkSpX92ATUMLgmX7sXjIXrngVf1rh7pH/LfY4X3t9M2QVo90xZNL2NviD1XBlNx HjpgCOcbM1RvlgLT+7ZrtfDq+40JJoAuzlxg5nB/oWU9x4qyrlrqr5eS20XhxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440505; a=rsa-sha256; cv=none; b=r9HKQdQwjTPM4ytTiKkaOzkBHRWEfZdcRoQOYWa7TciQNdBUBY+IEDw8dmxfKk678ZSotY c7vZjbBAXH391mO/5rpHr6NcloIXqQclhspLU6EVSjZhQxGYBZ9Ac+OaVR7GaZ+Q3CahoE UpA2ENkbhOJvTtlvce7e7rKbU1Xa4fmG4yam8CmRMPIKmcDMYoFpZGPN99sOD9bWJ49oqp 5dt/Gv99ISr7H7CyfOGjUYitOa+TadG+taHJD7wMCfScajq9tM3Oa33IVWFZEaKaEXRA1i OaHRcjmIt/gfKPl9RS8N9g/O4B41Kynko/FGPt29yVBqIcOGp8x1ITsmuv4H1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lnYZ5fP2TtSiLKMjl3up77zuWr0wiLvCfdyNIhDqqLo=; b=W6nXcNjgSA/BZZ7Rxrf06K3kciZqanPlrZ1lByg9Am0hglTi41q5/wqH3gXFH1hdZPqB0c DuhPxqWUaGJXtW8ufMyuSZuiQFJl692XesMza+63Ply2MN8skju6gJ865SQxpcc8/rLtJp SqXKOZf6CV4wcJmgkx7DmBRZB7YqoPZA5B6Ka5mSv2dPjzsPlgJHHkzTGEqzaD+eqasSAg 0elmHmWVYacK8+hogrMgwMQA7QKFUqdaDV2VT4KCzsJfrKNCszzZOPUisBZ+j+JNKn5QiJ fe2JbpqKTBMf5gEZCfwVPo5c7fekD08q0I8ZFG0gogYmnTbCsB6IJ/G1OiaUow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQWY1MRsz1697 for ; Wed, 18 Feb 2026 18:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:48:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: a82128d03d36 - stable/13 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a82128d03d36c8febfb0f0faf315128df03fb89f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:48:25 +0000 Message-Id: <69960979.41c31.4739cf79@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a82128d03d36c8febfb0f0faf315128df03fb89f commit a82128d03d36c8febfb0f0faf315128df03fb89f Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:48:15 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index fbc679aacf93..396bdd6ce8c6 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -52,7 +52,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else From nobody Wed Feb 18 18:48: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 4fGQX55dyjz6Sd3x for ; Wed, 18 Feb 2026 18:48: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 4fGQX54lrXz3cWc for ; Wed, 18 Feb 2026 18:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rM24S9csfgFL9etDeu2NIa73IgPuc2j+LwOOn6yiO8c=; b=Ojg4UzaSQxLabivUYsD1ifRUn0mvWA42EQPPicttIrbLJqx+XWEzAJfmcjuRhqTRRSGGw1 FioPVNmHbPLc5RVpC1cVnph0ncO1hwp+65ZxZcwZqWp93k5H861lP0CM5nuAhb91rnr3Tz 5ULvrlri4e8TTQLTde6/Mlu29Vu132/UeBKMciSwyQJ5ZrbhYDDQhSxDuFGZzsgkKlEUhe o8qFWRggL2jvjB3G9vHq2TQdpk0COb3/Pg8HRyaiAVwxgL9/B/IsUgE0qDzQnHI/pnaJJ0 I6wnxqKMnVGSUKvfAIwxQBcG1hFA0s77lX5TsJEp6x9sOQTN1QTmj/I+VUBF8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440533; a=rsa-sha256; cv=none; b=Nm/0rVJuqoQJ/FnNpggXMgQO/gSAA0ow1TjK9riogLCSQAJig8iagIOqgh8Jmp3T0D8aX6 2aT9F7H+q/v2bzCLTRTdl5P/SaRL9t9/zbi2LXkIK6YkF3ZyXnjSdt2AkdE46Dx87mAxFX U9i9LiNt1omEgCoYhfqYUZmz7ujawlhRI0Ft5laKxRBkFzutjp/+FSmASTfN8UR4gS9AWG Xaj0sgobQKoNg7UMPGz0//XkmRyatV8ovH00MmbPcOySCKTfizSgqPXyyeY+JHoAd2zKuR x5g1RJWvSddAN0uhjpCVCl1j4EEM3yKr8nAaRcihcXZxd4iv7dtZGh8jeiEwTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rM24S9csfgFL9etDeu2NIa73IgPuc2j+LwOOn6yiO8c=; b=lJSqiXfVb/4I7oNtoz2tGgNREXJRiwQh10e5hkEQDpEnb/Kc5PbZrbBt0u65pafWQkf+1t DY/cYJ84m6nJtpBwYgZ4nTbMNzjUe2hFs9qJ0d5dFsjJdM7cCpXP0fazJ+Wsk/WbvWh6nk JveTy1k695oqWLeDzsY2GhR9ou+Gy5GWNfC1/udchotWNQ0g0WlSHUF6arsa1iSU8Cod/i FIl+JY3Y5cPftv0WPWHd/xqog8MYhoWDQxFds/CqiFeWUAayMUtlaWLguP/jWnyu5b3p5m FBUt3P+UuhTovz2Ub0wEEBCam3nrGi70wwCUixSZwVEzBcstxOexWLVtRj2JGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQX54H67z16wf for ; Wed, 18 Feb 2026 18:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 410bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:48:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 354cc5e14263 - stable/14 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 354cc5e142634afbc967ede56572b939fbdb5d38 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:48:53 +0000 Message-Id: <69960995.410bf.1000f305@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=354cc5e142634afbc967ede56572b939fbdb5d38 commit 354cc5e142634afbc967ede56572b939fbdb5d38 Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:48:46 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index fbc679aacf93..396bdd6ce8c6 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -52,7 +52,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else From nobody Wed Feb 18 18: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 4fGQXT2Gc0z6Scts for ; Wed, 18 Feb 2026 18: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 4fGQXS658Qz3d49 for ; Wed, 18 Feb 2026 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EmYSfTDUBI+G9QXuDX6BpLyxtQfWZAxNue0u4OkiAnQ=; b=ynbq4DCTRUXTxdcsEepZ6brSlAh6hbHZsA+jYEJrhdZrRM4PidfQeJ3xZbDlYK+sfRMiNS QEPNInzb5li6BTu3UHB4cF4q8CuCKYS+tWnRM8phKXxKrPYno74DWuFI0wiR4nVjJvls0s IIwAcBlcpDiySX/FOe28T4pRlFTFw6T0sLm0DiKVj4aPRNi5oiZkf6xC47TfedoRwVlb4L 7P8wi2llEtf5PtrOJCe5O5qnw4KAKujn3tYCGI8nmmdh1wqtkM8fBDtd1Wkl2fEwtFyT+t QhJ2Jx8xKuA2zaxwrdCBolDrog9bBVQDEnD+iu/sB4tHd6k7mBihyV6VzXugOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440553; a=rsa-sha256; cv=none; b=ZgQe1SEyX3pLb8iA8dcfkGycea+aVoFBlZ8jkeHHdS9JaW4j18DPFU8Chlpm5iw8O7hQsq mgax0REj+PwBoZ9S1Lu3mqyfP6U7sYZClagbNknKArUCGeLKuY13ANNtuYY3BkGWseXkRL 5DWiH/R+LNlpNU0084Ut+WLnSOgeTAgblP8mm+9QG28O0WYhcbHsk2g2Qf3UQBSSYw1Ne7 8wvYf9UqjLOQogoSu3bJGW+XmtbW46CuzZFEw6nWnR73FnspdB+f9rMZI4uey3Ygonkctb EAC6dSff3yK7uEGAwj8NpSjismuR+KCBTNGOs0LDnANecepdTCtQFiOT3QUeJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EmYSfTDUBI+G9QXuDX6BpLyxtQfWZAxNue0u4OkiAnQ=; b=X7Pkz05OSHrgPIvDIQIuCyDmi8zYXbA9pXSCUU77e6AqRC9sECOIJ6UPvP9Vqrtn3uxbM0 P/A/BVvp4xl3rlujFewu+bxXiWnCDYh4ipI2T4hDS95ABDLbsVWgLs6nxcsSm7RiQWN3mg KhVVJJ/mzgZb0aJL9lBzgHxZaDOs7v5DmuBfybLLZYmG0GZ/7B1ebfJYfje016xTVRFPrr O1i9hg8tw2cGZOjJ+5WT6yHkgip/mPUKWUO3xYpa2mirI/PKgV/DHmsj7hdZaNvsNo5DNm tdEypeYEpnYkkosHt9zdeiBa9oLGpYLrciXObM3gzUWziZkcT6EO5ZKHqVwkew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQXS55zCz16wg for ; Wed, 18 Feb 2026 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 410c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:49:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: ddefff3810c1 - stable/15 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ddefff3810c1b40801bd99f42533e0d414fa0236 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:49:12 +0000 Message-Id: <699609a8.410c3.d78fca0@gitrepo.freebsd.org> The branch stable/15 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ddefff3810c1b40801bd99f42533e0d414fa0236 commit ddefff3810c1b40801bd99f42533e0d414fa0236 Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:49:01 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index 14b42f2e7087..c72c3ea3648f 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -51,7 +51,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else From nobody Wed Feb 18 18:53: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 4fGQdf6fQ3z6SdHV for ; Wed, 18 Feb 2026 18:53:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGQdd6NSvz3fVX for ; Wed, 18 Feb 2026 18:53:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-4359a302794so124819f8f.1 for ; Wed, 18 Feb 2026 10:53:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771440820; x=1772045620; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=k0nNFxtHzRcXAMFf4UrFTnlk9MJq4g7aIw04nr1FUmw=; b=GbXUv0Kia8n0CRI54X4z6/eQWRs+RRvbqDA7Pk6CUcAp4eYCltJlkizDOC/IQET9BH K6O7JLaaCrT9JGVogwGIu1PUOAUwVtvlbjyf+X1+MOxx/hAhlu5aDxgHHRW8LxDqEcOp 6qtrDYLP971MzUdGjm8UOkxGcqI2pGOqd6qGR+P2+nvWen3RRqYZo/jURsJxGUrS0WTS PMHok+fLiFeMIrkNVXiC2/9dugjzBYdrnwvHnkrYlwIngrvKJEXQgriWps/tKh3aqFfZ 8gra/eSdYsvhw47meAkAx0S6fYY9jBS0fxBuSSx0YvudsnXn7gc6JhL1jT2te1Q30y2Q 3ZPw== X-Forwarded-Encrypted: i=1; AJvYcCXZYxdDHz9fXAmQB0udYViaPp7JsGjkUrkitXDLdKD4qxMwVq0l5oV5MLBLvqx+3MRho7+tJ08SIQp/Vn7o2bpwpHm8Q9UYTFI=@freebsd.org X-Gm-Message-State: AOJu0Yw3sgH9uDXb473mjxfI1e9VgwNhMdfqWA1wT1aSq5xM5QY069ID SrFNKU6U+mNWVzB32bU/8K842C1rFvZCyGnQt2zbbzKy8eVu8Zw6Hptm4loLEHNHxaNigQ+YuTQ dxwp4 X-Gm-Gg: AZuq6aLI8X2HTobbQL1aw1oJQMRFmM4FcAHr0uLPBWJVaMbSNXoGW7UWLwNbpniGjmp bmNMkRjkhG3bJhO/DGlIBR66KF1naalouUZaK5fiTyq/bT78y/WsYW/oTEBCOL4otQF8rdhacp6 i9gEQ/zRDfi6wxdDgYt9hpNN28CtENx4ijMX//OVZaSGCDoJSNi1Jp2ECyNGeWk2X081lL4QBXH IAcBr79FN2f986/97pcWrL4N5K17bK/wobnUk8TOd5t6veQF4RvkDzJW6bmdDKF3FwuxX0W7OOD kkr1fZQfJq74l5ikGavj+8qKjvH7DNEF9JgAedmqtV0Or7+wuZYdd2dIp5AUrsWaBoltR0SUAKG yndsD1pjQG3XMuIGskyHKImZTuJDHZTuasbRY1hjh084JRCBzRAlU6LD8YKvgOd6td4hPY/0aOD dw/U65PVxavU1QWVNoV0z5BFGq7lKZREsgygLMwJeaZjdiDejFYd68YMu8LkrVkc/q5w== X-Received: by 2002:a05:6000:18a7:b0:437:6dac:458a with SMTP id ffacd0b85a97d-4379dbb080dmr26249482f8f.57.1771440820126; Wed, 18 Feb 2026 10:53:40 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796a74918sm43696001f8f.17.2026.02.18.10.53.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2026 10:53:39 -0800 (PST) From: Jessica Clarke Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: 354cc5e14263 - stable/14 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Date: Wed, 18 Feb 2026 18:53:28 +0000 References: <69960995.410bf.1000f305@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" In-Reply-To: <69960995.410bf.1000f305@gitrepo.freebsd.org> Message-Id: <549554B7-B7D1-4149-9EC5-1B4AA53100F4@freebsd.org> X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Spamd-Result: default: False [-2.39 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.995]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; FREEFALL_USER(0.00)[jrtc27]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_ALL(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.50:from]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-branches@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-branches@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.50:from] X-Rspamd-Queue-Id: 4fGQdd6NSvz3fVX X-Spamd-Bar: -- On 18 Feb 2026, at 18:48, Jessica Clarke wrote: > The branch stable/14 has been updated by jrtc27: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D354cc5e142634afbc967ede56572b939= fbdb5d38 >=20 > commit 354cc5e142634afbc967ede56572b939fbdb5d38 > Author: Jessica Clarke > AuthorDate: 2026-02-18 18:45:26 +0000 > Commit: Jessica Clarke > CommitDate: 2026-02-18 18:48:46 +0000 >=20 > Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) >=20 > Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, = but > FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI = break, > which predates the addition of FreeBSD support to OpenZFS. = Moreover, > 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ = is also > defined (alongside __powerpc64__ to disambiguate), which has = always had > a 64-bit time_t. This code has therefore always been wrong for = all > PowerPC variants. Fix this by limiting the 32-bit case to just = i386, > which is the only architecture in FreeBSD to have a 32-bit time_t = and > not have broken ABI, due to its special legacy compatibility = status. >=20 > Reviewed-by: Brian Behlendorf > Reviewed-by: Alexander Motin > Signed-off-by: Jessica Clarke > Closes #18217 > Closes #18218 >=20 > Reported by: fuz > MFC after: 1 day >=20 > (cherry picked from commit = 45c1e44779e3d365f5e31f75546d48ce34e4ee05) MFCed early at the request of cperciva@ for 14.4. Jessica From nobody Wed Feb 18 19:03: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 4fGQrh5BQlz6SdhR for ; Wed, 18 Feb 2026 19:03:16 +0000 (UTC) (envelope-from 0100019c722283f0-afe89447-f481-4b74-a559-be7f008a6753-000000@amazonses.com) Received: from a8-56.smtp-out.amazonses.com (a8-56.smtp-out.amazonses.com [54.240.8.56]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGQrh2HhVz3gMR for ; Wed, 18 Feb 2026 19:03:16 +0000 (UTC) (envelope-from 0100019c722283f0-afe89447-f481-4b74-a559-be7f008a6753-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1771441390; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=43GEDV04UlgO2Uo2h9QoZq+bS5ZD8RCo/j6DMn4sEVw=; b=an033XczEOCWT0mtABnh/TdIISv7RcdZQGh5kyglZMj5yceKwLb2kJaxszGnOszx xeLQfoOk2RMPqbW0/pKv7JR89o3+6b4Smeqy/gdtLRW6jtt8q11ff1tFJxXGvGbJMcK 0JowdbUIm89eS1kkTE02r7HOJdR37Iw33dwBDrHY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1771441390; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=43GEDV04UlgO2Uo2h9QoZq+bS5ZD8RCo/j6DMn4sEVw=; b=lH2WZQODzywo0Uw8QRJ/S+Eo7nYVA+Hons31iC7ugF380hSnRHWCJHwkM0QX4Tou Z8ISuMxHWgl03NBVUfRtsWQZulyn7NrcRUKvJEujpbGV8Q5CgqXU2jErj9Ke0t2Gwkr eEWQhcY1Wh6p1zJvZS3j5ZmaAW0sTi68m58E0rmc= Message-ID: <0100019c722283f0-afe89447-f481-4b74-a559-be7f008a6753-000000@email.amazonses.com> Date: Wed, 18 Feb 2026 19:03:10 +0000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 354cc5e14263 - stable/14 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) To: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" References: <69960995.410bf.1000f305@gitrepo.freebsd.org> <549554B7-B7D1-4149-9EC5-1B4AA53100F4@freebsd.org> Content-Language: en-US Cc: FreeBSD Release Engineering Team From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <549554B7-B7D1-4149-9EC5-1B4AA53100F4@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2026.02.18-54.240.8.56 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4fGQrh2HhVz3gMR X-Spamd-Bar: ---- On 2/18/26 10:53, Jessica Clarke wrote: > On 18 Feb 2026, at 18:48, Jessica Clarke wrote: >> commit 354cc5e142634afbc967ede56572b939fbdb5d38 >> >> Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) > > MFCed early at the request of cperciva@ for 14.4. Thanks! Just to provide some context for readers: 14.4-BETA3 builds start in about 29 hours, but the stable/14 weekly snapshot builds start in about 5 hours and I prefer to have changes get snapshot-build-tested there before merging, even if it requires an expedited MFC. Obviously the preferred route is for patches to land in main no later than Sunday so that they can wait there for 3 days before being MFCed and still make it in by Wednesday for the snapshot builds which start at 00:00 UTC on Thursday. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Feb 19 07:31: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 4fGlS42Ctqz6STwx for ; Thu, 19 Feb 2026 07:31: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 4fGlS41M3Sz3qM8 for ; Thu, 19 Feb 2026 07:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771486292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZkHNrO8hSgHLL/UXsdQWIOSWbPf8VKDgwgrg6l7DDWs=; b=SKCVljCe44DsCKvXQav5OpJb8Wr8uGMnrb7pXK0KkOCZpAZs42JfA9ywsCTMRIs47ZT32G JWjPVo2n+yeivyq9KU8zUMCQlhvG2O24+leFr7og6Ivih69C/e1UUjxiV+DEAAfwvas0qM 1Ev1gLkYOOh/t7Yq++lT/nLf15TFiOS3hNhxoyraPN3c5ac7ZmnLRJAWfaRXLw/5npSX4l 0JIuhfuHFKk9pQCp6FwLaj3Y8rODAKdFdaB+8nsM9FfrGeUaJHtGnEIyFh452rsvMuWhFi SbcmTXewCsyxlG6udltx51Ss3RAatZZpqF4o+Jnlnf848sCmVb1xxtu0zUzFng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771486292; a=rsa-sha256; cv=none; b=cARI2tZkvHbYLNn9r5L0gMH0moMAozTfbFdoWiJRN+hRLB/vzx5CA4vG7q7ToCy952bwln /RMYHqj0hZpij8uZ+w/i3Mb+r3mY32vEZLHmMw3bHa8Gjn5BNizLT3An97jk5ye36qJ0Ck oEYn8t8LzW5dDGVijSNHExoBEuhld70Xv4AXEHedy1pHMQcnJ//wYHomQXC2+JLhwfE8eJ eU/ndM/u7pzHqPSj45sbtmm3JZXA/3icdC0LvcX31BpC/Wk3ERUESSh6Vqx6pVDD4zTPWH xDP6B2LQ6cizE+sPsPvyH6DVRwAdoW1JzlNhmJgsaP5YLuChqPPtUjZIB9RHbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771486292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZkHNrO8hSgHLL/UXsdQWIOSWbPf8VKDgwgrg6l7DDWs=; b=R6PY5RaqNSqNoT22iT8SvjS0lofCH7vRXkDbGwhQJ2+p9LmaC/An3QhDBgur0R8fP3qWvJ p119pvZcrYwwOH5TI5jKBaE0EUklT1XdPKLbzIGlQRK9Uj9T+QCKDh59Hb0wJJjyyEqR6A vp9kT+hFSKxr7B2BVGihYBFAZl8supwyoln7D1SKsQWNlwR7C/oweKSYHZK1Yxn0+3z6gJ ThDsiEgJfRGEa6eF5A0iTZfEGD/1Z2jbyKxdKH93O9UfL765npUa9PGn62ptdAl3iLK0o9 N3rYm4OWx2Og0/zyXm1Y/BlDCJY0VsEy0RH2vJbQGpZzY59AnUgriiLbv3sdbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGlS40yGwzYw2 for ; Thu, 19 Feb 2026 07:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41beb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 07:31:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: 03631ff3ffd6 - stable/15 - committers-ports: add andy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 03631ff3ffd69b3739caf0824c02f19c2882a01e Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 07:31:32 +0000 Message-Id: <6996bc54.41beb.64cc04ba@gitrepo.freebsd.org> The branch stable/15 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=03631ff3ffd69b3739caf0824c02f19c2882a01e commit 03631ff3ffd69b3739caf0824c02f19c2882a01e Author: Dmitry Morozovsky AuthorDate: 2026-02-12 06:08:30 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-19 07:28:57 +0000 committers-ports: add andy Following up ziaee's pattern, and add andy's line. I'm not sure whether the original commit bit creation date should be used, and use commit bit re-activation date for now. MFC after: 1 week (cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92) --- share/misc/committers-doc.dot | 1 + 1 file changed, 1 insertion(+) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index ba4c229bc658..f9c6f3718338 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -76,6 +76,7 @@ node [color=lightblue2, style=filled, bgcolor=black]; "0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2019/09/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] +andy [label="Andrey Zakhvatov\nandy@FreeBSD.org\n2025/09/15"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] From nobody Thu Feb 19 07:31: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 4fGlSH3QGkz6STsQ for ; Thu, 19 Feb 2026 07:31: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 4fGlSH1Zvlz3qtW for ; Thu, 19 Feb 2026 07:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771486303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXcsmnicFuaeGF0mqFrEn4xs4rheXIdByzHozx8yuZw=; b=VU/ia0lmm/y+b+WI52UIMKOyBfUq9yDM+Dhwcy6tG86TxCwiNtY2oQSMdDFZh0HQdnRSrO I5yKs7v1HDxmNBTqi7K5Tp5aIuY6894kg0qXtnRvhW5X/orNR/4NA2TndM0ykCPQDA8u4v Y+Nbm2WumNCE9PPj1VJnI5RK1xeWTCG/uThrdgEukXGIML+a/X2CcQmqCKvqx9uCNmRzqI KhoTqQ8KR3/paqSEu2Dq88ExQnB58/lQ4ufWq7l1HMq96pddOKnYy6XWANUJx54jhdKUvQ YJL17DJnbMFRczsSrjzyv3JDQMpC0mniTEFmkRSmmHrlO3hQsdQbK2wR3NxmtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771486303; a=rsa-sha256; cv=none; b=QBpARntNFeFVxSgM2qcJnRa2ftYOKUrNX0xeqpes3aq3VunLukgzkJgfMipSkd2QFzHhYR +Y2S5dQeF+F3idd3+NzWXy8wDPjXbK9FamLwR6+/puD7AIChpOF9DDwhfBpRZzMt3O9B0U 5qku4qkfZCkDdBHXOTzCbqSD6i5XaMuwELG3AyNX+8CZvkpNtSZ0G7esdmuVVSkQN5QI1C uMujDA4HRCnNQjP3iHqG9PvnSLB1A4H5wbTGAdktBoRHipsf2lwrgMbREgYdZ16jXXOIPm zqXiqGvkXf4C3HifIA0/av8pKPeWajt8QwuVdT+SXqfB0Hjw/ynMsdds/uiFAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771486303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXcsmnicFuaeGF0mqFrEn4xs4rheXIdByzHozx8yuZw=; b=x68Ljba+rI8Bfxn8on1Ped62HimLfpYfg/3INPdh3XCjDrEOZRBo0ASpEaiuWEd3uXLNe+ 1pV9GrRCHM8rLkiAuD35tk+g8D/VQqwsLJoTs16taIxPdUbUkHC4CLpRnRmS523rz8UE71 lblUm9a5Fnbxa4DxqmX1v+pTL6BrZA8GGOaVDQOIj6HQp5jaDUrv+KbnLcXNgNnSeOywwk TrzUxxPKOmZX+VT6hIyxnj2ssTghAn1vq2kbyON95aVFnTV9DYCvINGuhZXUXdacyDWrGO wGKfJhH1RsfCG3dlCzLmb7ZdK/gKY1HVCQqokjDZWJfQaEZybtBZVy0PjAhZ8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGlSH1BGqzXrr for ; Thu, 19 Feb 2026 07:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 427a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 07:31:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: dae0d86844de - stable/14 - committers-ports: add andy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dae0d86844de55b3289c27baa3d32c7499ecefd4 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 07:31:43 +0000 Message-Id: <6996bc5f.427a3.78289fe8@gitrepo.freebsd.org> The branch stable/14 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=dae0d86844de55b3289c27baa3d32c7499ecefd4 commit dae0d86844de55b3289c27baa3d32c7499ecefd4 Author: Dmitry Morozovsky AuthorDate: 2026-02-12 06:08:30 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-19 07:30:04 +0000 committers-ports: add andy Following up ziaee's pattern, and add andy's line. I'm not sure whether the original commit bit creation date should be used, and use commit bit re-activation date for now. MFC after: 1 week (cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92) --- share/misc/committers-doc.dot | 1 + 1 file changed, 1 insertion(+) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 46583e758f1b..f711e5258c54 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -75,6 +75,7 @@ node [color=lightblue2, style=filled, bgcolor=black]; "0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2019/09/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] +andy [label="Andrey Zakhvatov\nandy@FreeBSD.org\n2025/09/15"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] From nobody Thu Feb 19 07:31: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 4fGlSW303Yz6SV2d for ; Thu, 19 Feb 2026 07:31: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 4fGlSW1Dclz3r6S for ; Thu, 19 Feb 2026 07:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771486315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s50v73RLBO+EBo71WlpGJoE7JXcISStF9lL+DGiAVhY=; b=Hqw5W/7bwhYiVRiuEAidISD+OA4rgCTRNE6yOaE9AgJrhl3m1U6fu7xkUw9AlXS1c9+IIO ggzCfKzWO1yD8yDU/+dsPZ18QO4BAikfdGFImRdId6n3M/RUR7qxW9awVxO6PYDnaV033c zG7fogzp8RFIeGeNzdMJX7ruRjX+bDoQGX7mWXe/EXj5wunNOq6pnh/E2FjZFKW6d0gGan JlnIYKQdyVk6EErrggGYPWyWDSbMY1gGG5DqWRbd5p9HBNf6dn3/hxyAv4ZgL5RH1ukRMI AtqxXHJZ+vKLkXaeQhL1l3/rpq8Qz6jH4Z7jlHpmZNURvaXnUlUuMErVQq8Nzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771486315; a=rsa-sha256; cv=none; b=wA/9V4Svl0NP+RfAg7HhuZQ3Yzua03iyNbFcUOdhJU01OlTRG8mX4w7j/dCLVTHymh8uwa C3AVbGlP5ECjp+y9gNPd7nNNYqa5eep4gFq8kqBRbeZoO5Rg0YqKE7w80dU2uNDkJZOrxQ yZ3NTZFw9HyTfqjMi1+Mu1z+QCiH1z8ZYXcw/3wR4aVGNlaEPFlhWUAeYdh02Nw0Au0wGX jmCDB9cIqg7sMaMF42rgOXqhzx02QLZeaZHEV+OVLDZeZx2xQkMn/dcOGy21GB+ZJ8HnHc jNZU+wqbwPDeSm5rkb1Sv2BaunXR8j+500giwKFbzt8z4vWMCR5+dzn9ieGMEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771486315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s50v73RLBO+EBo71WlpGJoE7JXcISStF9lL+DGiAVhY=; b=EneRO8GHOVjoDW6va2JIZSAt7rUq3DcZ1mmxFaxpcOJhLzGC6g92TRD257i1GDV/bSv00u QJOfM6zeP6ulJUX6Y7bt+q2NSEWnHXBbvCgoGZzhjD/yG1rkc01qe5H1LJGSlAGNIDW+yD QBj215PBX0XxevNwYmA4MnIsOcr2VC9eohodJxZg9orgMtdvjEWnuPqv7y1WuFlzzwgaZZ w8Xb5X5gJbcjebLJhio/3JAzORjH7Awe2QIFMNMuLGOTDZE7AZ9FrYPxW/ZQSNJ7C4W4b9 SlwOCSelHOoYsNN4slRgUXM8qeDlYog7YOWv3mEvX5HbvqywQP2BN9LjogzK5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGlSW0kRlzYpd for ; Thu, 19 Feb 2026 07:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 07:31:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: 072c3a70dcf2 - stable/13 - committers-ports: add andy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 072c3a70dcf2d626865d521256fa1e08ea7f6718 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 07:31:55 +0000 Message-Id: <6996bc6b.3fd71.376cb358@gitrepo.freebsd.org> The branch stable/13 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=072c3a70dcf2d626865d521256fa1e08ea7f6718 commit 072c3a70dcf2d626865d521256fa1e08ea7f6718 Author: Dmitry Morozovsky AuthorDate: 2026-02-12 06:08:30 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-19 07:30:33 +0000 committers-ports: add andy Following up ziaee's pattern, and add andy's line. I'm not sure whether the original commit bit creation date should be used, and use commit bit re-activation date for now. MFC after: 1 week (cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92) --- share/misc/committers-doc.dot | 1 + 1 file changed, 1 insertion(+) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index c83aca1a4116..a58720a21105 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -52,6 +52,7 @@ node [color=lightblue2, style=filled, bgcolor=black]; "0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2019/09/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] +andy [label="Andrey Zakhvatov\nandy@FreeBSD.org\n2025/09/15"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] From nobody Thu Feb 19 08: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 4fGnJ54ygHz6Sb4J for ; Thu, 19 Feb 2026 08:54: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 4fGnJ52BNTz3ydv for ; Thu, 19 Feb 2026 08: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=1771491285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOxHQtvBBpcgigWABOgc4YCV3uiNydktjI7plJBJ4Us=; b=vn7XcPNsngD2t+ebUttNAUC655D7Rxx7RaISwkBp5REyU4k81b251AzbXpadAvLBeZf1ry UAPzALloDp8/ncmzyUBqPpFGTBUybCVPi/IaT9iyV+KmLiG5N6N25RLdEgkEl0RTX8RuSB 6F+mFoiqpQQ+cESQj1uZTpqBHNP4Bm8hcwB62FWa5GxfdRJKrgtNG7L5yffT57lXtrBCfe 6Mo/Qq+EvbEUYbYprC7VLojDok8QtS60CvzshlqssqRpYsusqyBL9tr09FIw6AjwspexfX G7PKS4Hjmh2M7+EK2DmIWESgLGvm8ljhRKt5fQHh5vGw8zC0CTVsldZfTgeg4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771491285; a=rsa-sha256; cv=none; b=kH41Ka+mi/hWV3aWoh+15Qq1yA2ha2wG6HE/Kfauh02Nx+6NprZWBbkIdiH3lhIW4eDZPY 8r5poSnY4S1GX93JsxP7TESP+7Qz34dTbFTPvj91hhoJV/H9O8kCpHdjDNELaoTMLCoO/f hSd7NUX0AiTZ/6oyxnKSGAobeCi2fcfnyrukI6JmjREWQHfUuXuo4g9yYZLUP4tZTxJfZB 9eHL15di1ZVoW719XOQbQWDJxiv6QzF7U8GejxT0W6Jv+OwMnuRWK8yddXH+cL2xsro3/5 GBjlHK7+S8v7V7BGAbuGzvUp2igCayqKVgtohyHo/bGO9VzMVssn+1KYhrBrWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771491285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOxHQtvBBpcgigWABOgc4YCV3uiNydktjI7plJBJ4Us=; b=ddgP1gClm14kHTLNKCR+M2RQJqUI+/wlCMTF6UkGdIkil1kePfttUF5OePqPimm66RKFA2 ZDURXwabYVwd0ZwnbhrPF3GbS2CW1NFHRsFvGOQDOpUOybavrp4qwntGVyYc2KrsFq0adO 9YuRLnpxbPLeJkHoZ6XezRetst0NyyKCWhTcbd/1MIh4iZDD4SvsJcMQ/D2pqhpCeH6gQM qeCny0dfHtozVTcC1Wrg6sVCCPf3QWcC+j8RBxhQthVtjELaeyLzTdFh9IvY8NRd0Uqps9 nTidd5goxOPdRqqq5SAl2Qxb0fNRI8gQFc4+fc3aXfWwmWhSwBm55SaZ2/g7eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnJ51lnTzbt5 for ; Thu, 19 Feb 2026 08:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 08:54:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: cab59e268e59 - stable/15 - ncurses: fix cross build on MacOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: cab59e268e59d443150faa513c8f40b651e847e7 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 08:54:45 +0000 Message-Id: <6996cfd5.1a4d7.13394772@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=cab59e268e59d443150faa513c8f40b651e847e7 commit cab59e268e59d443150faa513c8f40b651e847e7 Author: Baptiste Daroussin AuthorDate: 2026-01-15 06:28:28 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 08:54:31 +0000 ncurses: fix cross build on MacOS (cherry picked from commit ad553bd419a81274e9369e91753b74d3942ce938) --- lib/ncurses/tinfo/ncurses_cfg.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ncurses/tinfo/ncurses_cfg.h b/lib/ncurses/tinfo/ncurses_cfg.h index d93921d5c1d7..f231f3b96a05 100644 --- a/lib/ncurses/tinfo/ncurses_cfg.h +++ b/lib/ncurses/tinfo/ncurses_cfg.h @@ -149,7 +149,6 @@ #define HAVE_GETOPT_H 1 #define HAVE_LIMITS_H 1 #define HAVE_LOCALE_H 1 -#define HAVE_MALLOC_H 1 #define HAVE_MATH_H 1 #define HAVE_POLL_H 1 #define HAVE_SYS_AUXV_H 1 From nobody Thu Feb 19 08:54: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 4fGnJ45Zpnz6Sb8t for ; Thu, 19 Feb 2026 08:54: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 4fGnJ41s7bz40BP for ; Thu, 19 Feb 2026 08:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771491284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGoVJdg1F6ShJXqomUPioGDiT+ZxLYOAOUG0LYhFzwk=; b=XxmwTlZulzPc0ht5LHMUIat5aCNYdtRoIk/o+U7BK14azXNixjN3aQVgI+fBkcYDrL+CEh aXiTJ1zKLqNH4A4iR9W+hfk1Gy/MsTVakk6dDxjGNrz3l9RhLZNlAiwX4tXhKhVDWnah4R uUOSiMBni5oRUoLP0uoGNA9ghtqnjtLB3tEFSiHOwGoyqwjmIexcabYO7ZO3AGZmg3Owiz Lf8HViEI75WYyJzMiZM3zEHt8l/OHgiuKJYY1qKE6uB70ruNQqsdiYpcufqLuP17OoY3WC fJMDCKerrPqnwIZ271xSgjmwFFU19cxj/ett7iDSSJ4XrTqNvnehEd/SRs6bIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771491284; a=rsa-sha256; cv=none; b=wQJBmH0OwRCAXjv6gFVAuoNwNq4CpVc3y0dunxZpk3MYA5ZgHg/NCBpIAm7VfteBxo2onx 7+trZmehbYLEojO/lW2qPeQGsOsGUms2xeGLeGNQjxF4q6kwvJ9pNpPXh//J9JCdsITc90 UOUnXvANLcdAppO08T3sNvG1WbcNA96jUUZ4BEKX0DvlzOJcQ2EKFm7Kr4S6nDiHcuNBCc lA0A2jxcUF0qjA0frhtku2R/I9ugAqYPAbU/eMv/DJMHB5tZ2t7TpUWUUwhv20FLxCHcFQ VNfD8kxNgbpJP+R8glO5WkfPKNRwGwqxfxRI46e9Z6b5DA9o7vVK70+K8SBNZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771491284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGoVJdg1F6ShJXqomUPioGDiT+ZxLYOAOUG0LYhFzwk=; b=JiUH7qdZWiCfWssOSnjmytRDQlRzwWZn4f0NRgWUe35DK7IxbdyJVeCyLSwxuFGE3qyMwX 7lXbiYwp090GRH4x3+9MW7DnCmTuQWkvaz/SNEXOvoryBqTftP0HxB5eu6rDo1sY14rOyN 4pAu65jwi0A5fxBbleX+Wbg/yBtJYLCdxHEYfHY6ipuB53ItfDNo+h8pJjzdGLI+MQ2FOR QrFMrnAVslW88aILWUWUPwrhyCGA8hbLhMoI5tARAn6wRqnEaUWb+u7S8VNY4uSfc7jbL1 Mwu14HBU3ugzuNRWvg2XvneD3xlaqOhZKnWMHrQRFG8lUpDoqxpzJ2ywug73IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnJ419RczcCJ for ; Thu, 19 Feb 2026 08:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c403 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 08:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 297d5bf89067 - stable/15 - ncurses: merge update to ncurses 6.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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 297d5bf8906776137aeac82e48ca2e87944d95b7 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 08:54:43 +0000 Message-Id: <6996cfd3.1c403.1e98d5da@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=297d5bf8906776137aeac82e48ca2e87944d95b7 commit 297d5bf8906776137aeac82e48ca2e87944d95b7 Author: Baptiste Daroussin AuthorDate: 2026-01-14 13:48:32 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 08:53:57 +0000 ncurses: merge update to ncurses 6.6 6.6 is ABI compatible with 6.5 (tested with abidiff) Remove html documentation to ease updates MFC After: 1 month (cherry picked from commit 68ad2b0d7af2a3571c4abac9afa712f9b09b721c) --- ObsoleteFiles.inc | 21 + contrib/ncurses/AUTHORS | 7 +- contrib/ncurses/COPYING | 4 +- contrib/ncurses/INSTALL | 111 +- contrib/ncurses/MANIFEST | 23 +- contrib/ncurses/Makefile.in | 17 +- contrib/ncurses/Makefile.os2 | 6 +- contrib/ncurses/NEWS | 615 +- contrib/ncurses/VERSION | 2 +- contrib/ncurses/aclocal.m4 | 1380 ++- contrib/ncurses/announce.html.in | 1015 +- contrib/ncurses/config.guess | 26 +- contrib/ncurses/config.sub | 749 +- contrib/ncurses/configure | 10856 ++++++++++--------- contrib/ncurses/configure.in | 318 +- contrib/ncurses/dist.mk | 12 +- contrib/ncurses/doc/html/hackguide.html | 962 -- contrib/ncurses/doc/html/ncurses-intro.html | 3390 ------ contrib/ncurses/doc/ncurses-intro.doc | 5 +- contrib/ncurses/form/Makefile.in | 28 +- contrib/ncurses/form/fld_arg.c | 6 +- contrib/ncurses/form/fld_attr.c | 6 +- contrib/ncurses/form/fld_current.c | 12 +- contrib/ncurses/form/fld_def.c | 30 +- contrib/ncurses/form/fld_dup.c | 6 +- contrib/ncurses/form/form.priv.h | 15 +- contrib/ncurses/form/frm_data.c | 8 +- contrib/ncurses/form/frm_driver.c | 91 +- contrib/ncurses/form/frm_post.c | 6 +- contrib/ncurses/form/frm_req_name.c | 6 +- contrib/ncurses/form/frm_sub.c | 15 +- contrib/ncurses/form/frm_win.c | 16 +- contrib/ncurses/form/fty_enum.c | 53 +- contrib/ncurses/form/fty_generic.c | 17 +- contrib/ncurses/form/fty_int.c | 14 +- contrib/ncurses/form/fty_num.c | 16 +- contrib/ncurses/form/fty_regex.c | 8 +- contrib/ncurses/include/Caps | 44 +- contrib/ncurses/include/Caps.aix4 | 26 +- contrib/ncurses/include/Caps.hpux11 | 26 +- contrib/ncurses/include/Caps.keys | 26 +- contrib/ncurses/include/Caps.osf1r5 | 20 +- contrib/ncurses/include/Caps.uwin | 20 +- contrib/ncurses/include/MKkey_defs.sh | 8 +- contrib/ncurses/include/MKterm.h.awk.in | 57 +- contrib/ncurses/include/Makefile.in | 9 +- contrib/ncurses/include/capdefaults.c | 6 +- contrib/ncurses/include/curses.h.in | 104 +- contrib/ncurses/include/curses.tail | 54 +- contrib/ncurses/include/curses.wide | 7 +- contrib/ncurses/include/headers | 9 +- contrib/ncurses/include/nc_alloc.h | 25 +- contrib/ncurses/include/nc_termios.h | 91 +- contrib/ncurses/include/nc_tparm.h | 5 +- .../ncurses/include/{nc_win32.h => nc_win32.h.in} | 131 +- contrib/ncurses/include/ncurses_cfg.hin | 6 +- contrib/ncurses/include/ncurses_defs | 23 +- contrib/ncurses/include/ncurses_mingw.h | 82 - contrib/ncurses/include/term_entry.h | 9 +- contrib/ncurses/include/tic.h | 10 +- contrib/ncurses/include/unctrl.h.in | 10 +- contrib/ncurses/include/win32_curses.h | 75 - contrib/ncurses/install-sh | 27 +- contrib/ncurses/man/MKada_config.in | 8 +- contrib/ncurses/man/MKncu_config.in | 4 +- contrib/ncurses/man/MKterminfo.sh | 66 +- contrib/ncurses/man/Makefile.in | 24 +- contrib/ncurses/man/captoinfo.1m | 159 +- contrib/ncurses/man/clear.1 | 12 +- contrib/ncurses/man/curs_add_wch.3x | 735 +- contrib/ncurses/man/curs_add_wchstr.3x | 139 +- contrib/ncurses/man/curs_addch.3x | 529 +- contrib/ncurses/man/curs_addchstr.3x | 122 +- contrib/ncurses/man/curs_addstr.3x | 101 +- contrib/ncurses/man/curs_addwstr.3x | 107 +- contrib/ncurses/man/curs_attr.3x | 512 +- contrib/ncurses/man/curs_beep.3x | 85 +- contrib/ncurses/man/curs_bkgd.3x | 243 +- contrib/ncurses/man/curs_bkgrnd.3x | 196 +- contrib/ncurses/man/curs_border.3x | 239 +- contrib/ncurses/man/curs_border_set.3x | 96 +- contrib/ncurses/man/curs_clear.3x | 46 +- contrib/ncurses/man/curs_color.3x | 524 +- contrib/ncurses/man/curs_delch.3x | 56 +- contrib/ncurses/man/curs_deleteln.3x | 126 +- contrib/ncurses/man/curs_extend.3x | 93 +- contrib/ncurses/man/curs_get_wch.3x | 175 +- contrib/ncurses/man/curs_get_wstr.3x | 431 +- contrib/ncurses/man/curs_getcchar.3x | 384 +- contrib/ncurses/man/curs_getch.3x | 441 +- contrib/ncurses/man/curs_getstr.3x | 598 +- contrib/ncurses/man/curs_getyx.3x | 150 +- contrib/ncurses/man/curs_in_wch.3x | 85 +- contrib/ncurses/man/curs_in_wchstr.3x | 139 +- contrib/ncurses/man/curs_inch.3x | 148 +- contrib/ncurses/man/curs_inchstr.3x | 179 +- contrib/ncurses/man/curs_initscr.3x | 677 +- contrib/ncurses/man/curs_inopts.3x | 939 +- contrib/ncurses/man/curs_ins_wch.3x | 110 +- contrib/ncurses/man/curs_ins_wstr.3x | 179 +- contrib/ncurses/man/curs_insch.3x | 71 +- contrib/ncurses/man/curs_insstr.3x | 175 +- contrib/ncurses/man/curs_instr.3x | 188 +- contrib/ncurses/man/curs_inwstr.3x | 239 +- contrib/ncurses/man/curs_kernel.3x | 467 +- contrib/ncurses/man/curs_legacy.3x | 35 +- contrib/ncurses/man/curs_mouse.3x | 554 +- contrib/ncurses/man/curs_move.3x | 64 +- contrib/ncurses/man/curs_opaque.3x | 33 +- contrib/ncurses/man/curs_outopts.3x | 414 +- contrib/ncurses/man/curs_overlay.3x | 53 +- contrib/ncurses/man/curs_pad.3x | 244 +- contrib/ncurses/man/curs_print.3x | 105 +- contrib/ncurses/man/curs_printw.3x | 139 +- contrib/ncurses/man/curs_refresh.3x | 33 +- contrib/ncurses/man/curs_scanw.3x | 129 +- contrib/ncurses/man/curs_scr_dump.3x | 192 +- contrib/ncurses/man/curs_scroll.3x | 143 +- contrib/ncurses/man/curs_slk.3x | 77 +- contrib/ncurses/man/curs_sp_funcs.3x | 272 +- contrib/ncurses/man/curs_termattrs.3x | 199 +- contrib/ncurses/man/curs_termcap.3x | 446 +- contrib/ncurses/man/curs_terminfo.3x | 842 +- contrib/ncurses/man/curs_threads.3x | 8 +- contrib/ncurses/man/curs_touch.3x | 70 +- contrib/ncurses/man/curs_trace.3x | 14 +- contrib/ncurses/man/curs_util.3x | 446 +- contrib/ncurses/man/curs_variables.3x | 298 +- contrib/ncurses/man/curs_window.3x | 318 +- contrib/ncurses/man/define_key.3x | 108 +- contrib/ncurses/man/form.3x | 21 +- contrib/ncurses/man/form_driver.3x | 9 +- contrib/ncurses/man/form_field.3x | 15 +- contrib/ncurses/man/form_field_buffer.3x | 8 +- contrib/ncurses/man/form_field_new.3x | 7 +- contrib/ncurses/man/form_field_opts.3x | 20 +- contrib/ncurses/man/form_field_userptr.3x | 7 +- contrib/ncurses/man/form_field_validation.3x | 30 +- contrib/ncurses/man/form_fieldtype.3x | 23 +- contrib/ncurses/man/form_hook.3x | 27 +- contrib/ncurses/man/form_new.3x | 11 +- contrib/ncurses/man/form_opts.3x | 20 +- contrib/ncurses/man/form_page.3x | 8 +- contrib/ncurses/man/form_requestname.3x | 8 +- contrib/ncurses/man/form_userptr.3x | 7 +- contrib/ncurses/man/form_win.3x | 16 +- contrib/ncurses/man/infocmp.1m | 299 +- contrib/ncurses/man/infotocap.1m | 62 +- contrib/ncurses/man/key_defined.3x | 60 +- contrib/ncurses/man/keybound.3x | 79 +- contrib/ncurses/man/keyok.3x | 88 +- contrib/ncurses/man/legacy_coding.3x | 42 +- contrib/ncurses/man/make_sed.sh | 10 +- contrib/ncurses/man/man_db.renames.in | 28 +- contrib/ncurses/man/manhtml.aliases | 29 +- contrib/ncurses/man/manhtml.externs | 15 +- contrib/ncurses/man/manlinks.sed | 13 +- contrib/ncurses/man/menu.3x | 60 +- contrib/ncurses/man/menu_driver.3x | 11 +- contrib/ncurses/man/menu_hook.3x | 28 +- contrib/ncurses/man/menu_items.3x | 13 +- contrib/ncurses/man/menu_mark.3x | 17 +- contrib/ncurses/man/menu_new.3x | 11 +- contrib/ncurses/man/menu_opts.3x | 20 +- contrib/ncurses/man/menu_pattern.3x | 9 +- contrib/ncurses/man/menu_requestname.3x | 8 +- contrib/ncurses/man/menu_spacing.3x | 8 +- contrib/ncurses/man/menu_userptr.3x | 7 +- contrib/ncurses/man/menu_win.3x | 16 +- contrib/ncurses/man/mitem_current.3x | 10 +- contrib/ncurses/man/mitem_name.3x | 7 +- contrib/ncurses/man/mitem_new.3x | 8 +- contrib/ncurses/man/mitem_opts.3x | 20 +- contrib/ncurses/man/mitem_userptr.3x | 7 +- contrib/ncurses/man/ncurses.3x | 896 +- contrib/ncurses/man/new_pair.3x | 14 +- contrib/ncurses/man/panel.3x | 27 +- contrib/ncurses/man/resizeterm.3x | 59 +- contrib/ncurses/man/scr_dump.5 | 22 +- contrib/ncurses/man/tabs.1 | 73 +- contrib/ncurses/man/term.5 | 431 +- contrib/ncurses/man/term.7 | 16 +- contrib/ncurses/man/term_variables.3x | 228 +- contrib/ncurses/man/terminfo.head | 11 +- contrib/ncurses/man/terminfo.tail | 409 +- contrib/ncurses/man/tic.1m | 612 +- contrib/ncurses/man/toe.1m | 23 +- contrib/ncurses/man/tput.1 | 410 +- contrib/ncurses/man/tset.1 | 22 +- contrib/ncurses/man/user_caps.5 | 584 +- contrib/ncurses/man/wresize.3x | 105 +- contrib/ncurses/menu/Makefile.in | 28 +- contrib/ncurses/menu/m_driver.c | 14 +- contrib/ncurses/menu/m_global.c | 14 +- contrib/ncurses/menu/m_item_new.c | 14 +- contrib/ncurses/menu/m_item_vis.c | 6 +- contrib/ncurses/menu/m_pattern.c | 6 +- contrib/ncurses/menu/m_post.c | 42 +- contrib/ncurses/menu/m_req_name.c | 6 +- contrib/ncurses/menu/menu.priv.h | 7 +- contrib/ncurses/menu/mf_common.h | 8 +- contrib/ncurses/misc/Makefile.in | 79 +- contrib/ncurses/misc/gen-pkgconfig.in | 14 +- contrib/ncurses/misc/gen_edit.sh | 16 +- contrib/ncurses/misc/magic | 9 +- contrib/ncurses/misc/makellib | 28 +- contrib/ncurses/misc/ncurses-config.in | 134 +- contrib/ncurses/misc/run_tic.in | 145 +- contrib/ncurses/misc/terminfo.src | 4424 ++++---- contrib/ncurses/mk-1st.awk | 105 +- contrib/ncurses/ncurses/Makefile.in | 36 +- contrib/ncurses/ncurses/base/MKkeyname.awk | 30 +- contrib/ncurses/ncurses/base/MKlib_gen.sh | 77 +- contrib/ncurses/ncurses/base/MKunctrl.awk | 10 +- contrib/ncurses/ncurses/base/define_key.c | 12 +- contrib/ncurses/ncurses/base/key_defined.c | 10 +- contrib/ncurses/ncurses/base/keybound.c | 8 +- contrib/ncurses/ncurses/base/keyok.c | 10 +- contrib/ncurses/ncurses/base/legacy_coding.c | 6 +- contrib/ncurses/ncurses/base/lib_addch.c | 12 +- contrib/ncurses/ncurses/base/lib_addstr.c | 14 +- contrib/ncurses/ncurses/base/lib_beep.c | 10 +- contrib/ncurses/ncurses/base/lib_bkgd.c | 6 +- contrib/ncurses/ncurses/base/lib_chgat.c | 7 +- contrib/ncurses/ncurses/base/lib_color.c | 84 +- contrib/ncurses/ncurses/base/lib_colorset.c | 6 +- contrib/ncurses/ncurses/base/lib_delch.c | 8 +- contrib/ncurses/ncurses/base/lib_delwin.c | 29 +- contrib/ncurses/ncurses/base/lib_dft_fgbg.c | 12 +- contrib/ncurses/ncurses/base/lib_driver.c | 50 +- contrib/ncurses/ncurses/base/lib_echo.c | 8 +- contrib/ncurses/ncurses/base/lib_endwin.c | 6 +- contrib/ncurses/ncurses/base/lib_erase.c | 6 +- contrib/ncurses/ncurses/base/lib_flash.c | 8 +- contrib/ncurses/ncurses/base/lib_freeall.c | 18 +- contrib/ncurses/ncurses/base/lib_getch.c | 51 +- contrib/ncurses/ncurses/base/lib_getstr.c | 12 +- contrib/ncurses/ncurses/base/lib_initscr.c | 12 +- contrib/ncurses/ncurses/base/lib_insch.c | 10 +- contrib/ncurses/ncurses/base/lib_insnstr.c | 8 +- contrib/ncurses/ncurses/base/lib_instr.c | 16 +- contrib/ncurses/ncurses/base/lib_mouse.c | 170 +- contrib/ncurses/ncurses/base/lib_mvwin.c | 6 +- contrib/ncurses/ncurses/base/lib_newterm.c | 47 +- contrib/ncurses/ncurses/base/lib_newwin.c | 80 +- contrib/ncurses/ncurses/base/lib_nl.c | 12 +- contrib/ncurses/ncurses/base/lib_overlay.c | 10 +- contrib/ncurses/ncurses/base/lib_pad.c | 22 +- contrib/ncurses/ncurses/base/lib_printw.c | 12 +- contrib/ncurses/ncurses/base/lib_redrawln.c | 6 +- contrib/ncurses/ncurses/base/lib_refresh.c | 8 +- contrib/ncurses/ncurses/base/lib_restart.c | 12 +- contrib/ncurses/ncurses/base/lib_screen.c | 104 +- contrib/ncurses/ncurses/base/lib_set_term.c | 128 +- contrib/ncurses/ncurses/base/lib_slk.c | 22 +- contrib/ncurses/ncurses/base/lib_slkatr_set.c | 8 +- contrib/ncurses/ncurses/base/lib_slkatrof.c | 6 +- contrib/ncurses/ncurses/base/lib_slkatron.c | 6 +- contrib/ncurses/ncurses/base/lib_slkatrset.c | 6 +- contrib/ncurses/ncurses/base/lib_slkattr.c | 6 +- contrib/ncurses/ncurses/base/lib_slkclear.c | 6 +- contrib/ncurses/ncurses/base/lib_slkcolor.c | 8 +- contrib/ncurses/ncurses/base/lib_slklab.c | 8 +- contrib/ncurses/ncurses/base/lib_slkrefr.c | 18 +- contrib/ncurses/ncurses/base/lib_slkset.c | 16 +- contrib/ncurses/ncurses/base/lib_slktouch.c | 6 +- contrib/ncurses/ncurses/base/lib_touch.c | 12 +- contrib/ncurses/ncurses/base/lib_ungetch.c | 6 +- contrib/ncurses/ncurses/base/lib_wattron.c | 6 +- contrib/ncurses/ncurses/base/lib_winch.c | 6 +- contrib/ncurses/ncurses/base/lib_window.c | 14 +- contrib/ncurses/ncurses/base/nc_panel.c | 6 +- contrib/ncurses/ncurses/base/new_pair.c | 22 +- contrib/ncurses/ncurses/base/resizeterm.c | 47 +- contrib/ncurses/ncurses/base/safe_sprintf.c | 19 +- contrib/ncurses/ncurses/base/tries.c | 20 +- contrib/ncurses/ncurses/base/vsscanf.c | 8 +- contrib/ncurses/ncurses/base/wresize.c | 22 +- contrib/ncurses/ncurses/build.priv.h | 6 +- contrib/ncurses/ncurses/curses.priv.h | 331 +- contrib/ncurses/ncurses/llib-lncurses | 26 +- contrib/ncurses/ncurses/llib-lncursest | 26 +- contrib/ncurses/ncurses/llib-lncursestw | 40 +- contrib/ncurses/ncurses/llib-lncursesw | 40 +- contrib/ncurses/ncurses/llib-ltinfo | 20 +- contrib/ncurses/ncurses/llib-ltinfot | 20 +- contrib/ncurses/ncurses/llib-ltinfotw | 20 +- contrib/ncurses/ncurses/llib-ltinfow | 20 +- contrib/ncurses/ncurses/modules | 18 +- contrib/ncurses/ncurses/new_pair.h | 10 +- .../{include/nc_mingw.h => ncurses/report_ctype.c} | 116 +- contrib/ncurses/ncurses/report_hashing.c | 6 +- contrib/ncurses/ncurses/report_offsets.c | 19 +- contrib/ncurses/ncurses/term.priv.h | 8 +- contrib/ncurses/ncurses/tinfo/MKcaptab.awk | 6 +- contrib/ncurses/ncurses/tinfo/MKcaptab.sh | 22 +- contrib/ncurses/ncurses/tinfo/MKcodes.awk | 12 +- contrib/ncurses/ncurses/tinfo/MKfallback.sh | 35 +- contrib/ncurses/ncurses/tinfo/MKkeys_list.sh | 26 +- contrib/ncurses/ncurses/tinfo/MKnames.awk | 12 +- contrib/ncurses/ncurses/tinfo/MKuserdefs.sh | 10 +- contrib/ncurses/ncurses/tinfo/access.c | 188 +- contrib/ncurses/ncurses/tinfo/add_tries.c | 18 +- contrib/ncurses/ncurses/tinfo/alloc_entry.c | 27 +- contrib/ncurses/ncurses/tinfo/alloc_ttype.c | 43 +- contrib/ncurses/ncurses/tinfo/captoinfo.c | 87 +- contrib/ncurses/ncurses/tinfo/comp_error.c | 16 +- contrib/ncurses/ncurses/tinfo/comp_expand.c | 22 +- contrib/ncurses/ncurses/tinfo/comp_hash.c | 14 +- contrib/ncurses/ncurses/tinfo/comp_parse.c | 59 +- contrib/ncurses/ncurses/tinfo/comp_scan.c | 68 +- contrib/ncurses/ncurses/tinfo/db_iterator.c | 66 +- contrib/ncurses/ncurses/tinfo/doalloc.c | 6 +- contrib/ncurses/ncurses/tinfo/entries.c | 30 +- contrib/ncurses/ncurses/tinfo/getenv_num.c | 14 +- contrib/ncurses/ncurses/tinfo/hashed_db.c | 49 +- contrib/ncurses/ncurses/tinfo/home_terminfo.c | 12 +- contrib/ncurses/ncurses/tinfo/init_keytry.c | 10 +- contrib/ncurses/ncurses/tinfo/lib_acs.c | 24 +- contrib/ncurses/ncurses/tinfo/lib_baudrate.c | 21 +- contrib/ncurses/ncurses/tinfo/lib_cur_term.c | 22 +- contrib/ncurses/ncurses/tinfo/lib_data.c | 44 +- contrib/ncurses/ncurses/tinfo/lib_has_cap.c | 8 +- contrib/ncurses/ncurses/tinfo/lib_kernel.c | 18 +- contrib/ncurses/ncurses/tinfo/lib_napms.c | 10 +- contrib/ncurses/ncurses/tinfo/lib_options.c | 30 +- contrib/ncurses/ncurses/tinfo/lib_print.c | 15 +- contrib/ncurses/ncurses/tinfo/lib_raw.c | 39 +- contrib/ncurses/ncurses/tinfo/lib_setup.c | 148 +- contrib/ncurses/ncurses/tinfo/lib_termcap.c | 60 +- contrib/ncurses/ncurses/tinfo/lib_termname.c | 10 +- contrib/ncurses/ncurses/tinfo/lib_tgoto.c | 18 +- contrib/ncurses/ncurses/tinfo/lib_ti.c | 12 +- contrib/ncurses/ncurses/tinfo/lib_tparm.c | 52 +- contrib/ncurses/ncurses/tinfo/lib_tputs.c | 32 +- contrib/ncurses/ncurses/tinfo/lib_ttyflags.c | 46 +- contrib/ncurses/ncurses/tinfo/lib_win32con.c | 414 +- contrib/ncurses/ncurses/tinfo/lib_win32util.c | 11 +- contrib/ncurses/ncurses/tinfo/make_hash.c | 51 +- contrib/ncurses/ncurses/tinfo/make_keys.c | 25 +- contrib/ncurses/ncurses/tinfo/name_match.c | 16 +- contrib/ncurses/ncurses/tinfo/obsolete.c | 14 +- contrib/ncurses/ncurses/tinfo/parse_entry.c | 56 +- contrib/ncurses/ncurses/tinfo/read_entry.c | 42 +- contrib/ncurses/ncurses/tinfo/read_termcap.c | 78 +- contrib/ncurses/ncurses/tinfo/strings.c | 14 +- contrib/ncurses/ncurses/tinfo/tinfo_driver.c | 125 +- contrib/ncurses/ncurses/tinfo/trim_sgr0.c | 98 +- contrib/ncurses/ncurses/tinfo/write_entry.c | 76 +- contrib/ncurses/ncurses/trace/lib_trace.c | 22 +- contrib/ncurses/ncurses/trace/lib_traceatr.c | 35 +- contrib/ncurses/ncurses/trace/lib_tracebits.c | 22 +- contrib/ncurses/ncurses/trace/lib_tracechr.c | 10 +- contrib/ncurses/ncurses/trace/lib_tracedmp.c | 8 +- contrib/ncurses/ncurses/trace/lib_tracemse.c | 10 +- contrib/ncurses/ncurses/trace/trace_buf.c | 26 +- contrib/ncurses/ncurses/trace/trace_tries.c | 10 +- contrib/ncurses/ncurses/trace/varargs.c | 38 +- contrib/ncurses/ncurses/trace/visbuf.c | 24 +- contrib/ncurses/ncurses/tty/MKexpanded.sh | 11 +- contrib/ncurses/ncurses/tty/hardscroll.c | 16 +- contrib/ncurses/ncurses/tty/hashmap.c | 26 +- contrib/ncurses/ncurses/tty/lib_mvcur.c | 84 +- contrib/ncurses/ncurses/tty/lib_tstp.c | 16 +- contrib/ncurses/ncurses/tty/lib_twait.c | 12 +- contrib/ncurses/ncurses/tty/lib_vidattr.c | 12 +- contrib/ncurses/ncurses/tty/tty_update.c | 48 +- contrib/ncurses/ncurses/wcwidth.h | 966 +- contrib/ncurses/ncurses/widechar/charable.c | 9 +- contrib/ncurses/ncurses/widechar/lib_add_wch.c | 12 +- contrib/ncurses/ncurses/widechar/lib_box_set.c | 6 +- contrib/ncurses/ncurses/widechar/lib_cchar.c | 8 +- contrib/ncurses/ncurses/widechar/lib_get_wch.c | 10 +- contrib/ncurses/ncurses/widechar/lib_get_wstr.c | 8 +- contrib/ncurses/ncurses/widechar/lib_hline_set.c | 6 +- contrib/ncurses/ncurses/widechar/lib_in_wch.c | 8 +- contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c | 10 +- contrib/ncurses/ncurses/widechar/lib_ins_wch.c | 53 +- contrib/ncurses/ncurses/widechar/lib_inwstr.c | 33 +- contrib/ncurses/ncurses/widechar/lib_key_name.c | 6 +- contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c | 6 +- contrib/ncurses/ncurses/widechar/lib_slk_wset.c | 8 +- contrib/ncurses/ncurses/widechar/lib_unget_wch.c | 10 +- contrib/ncurses/ncurses/widechar/lib_vid_attr.c | 26 +- contrib/ncurses/ncurses/widechar/lib_vline_set.c | 6 +- contrib/ncurses/ncurses/widechar/lib_wacs.c | 8 +- contrib/ncurses/ncurses/widechar/lib_wunctrl.c | 13 +- contrib/ncurses/ncurses/widechar/widechars.c | 12 +- contrib/ncurses/ncurses/win32con/gettimeofday.c | 9 +- contrib/ncurses/ncurses/win32con/wcwidth.c | 13 +- contrib/ncurses/ncurses/win32con/win32_driver.c | 101 +- contrib/ncurses/ncurses/win32con/win_driver.c | 2282 ---- contrib/ncurses/panel/Makefile.in | 28 +- contrib/ncurses/panel/p_above.c | 16 +- contrib/ncurses/panel/p_below.c | 18 +- contrib/ncurses/panel/p_new.c | 6 +- contrib/ncurses/panel/panel.c | 18 +- contrib/ncurses/panel/panel.priv.h | 6 +- contrib/ncurses/progs/Makefile.in | 67 +- contrib/ncurses/progs/capconvert | 44 +- contrib/ncurses/progs/clear.c | 6 +- contrib/ncurses/progs/clear_cmd.c | 69 +- contrib/ncurses/progs/dump_entry.c | 66 +- contrib/ncurses/progs/infocmp.c | 295 +- contrib/ncurses/progs/modules | 28 +- contrib/ncurses/progs/progs.priv.h | 4 +- contrib/ncurses/progs/reset_cmd.c | 90 +- contrib/ncurses/progs/tabs.c | 51 +- contrib/ncurses/progs/tic.c | 183 +- contrib/ncurses/progs/toe.c | 82 +- contrib/ncurses/progs/tput.c | 156 +- contrib/ncurses/progs/tset.c | 70 +- lib/ncurses/tinfo/Makefile | 16 +- lib/ncurses/tinfo/ncurses_cfg.h | 30 +- tools/build/mk/OptionalObsoleteFiles.inc | 3 - 415 files changed, 30510 insertions(+), 25899 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a81407a93453..7067dab2ad03 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20260114: remove ncurses html documentation +OLD_FILES+=usr/share/doc/ncurses/hackguide.html +OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html +OLD_DIRS+=usr/share/doc/ncurses + # 20260204: replaced with ATF test OLD_FILES+=usr/tests/usr.bin/m4/legacy_test OLD_FILES+=usr/tests/usr.bin/m4/regress.sh @@ -70,6 +75,22 @@ OLD_FILES+=usr/lib/libkrb5profile.so # 20251218: Remove old MLINK to apmconf(8) OLD_FILES+=usr/share/man/man8/apmconf.8.gz +# 20251215: Remove intrinsic utilities +OLD_FILES+=usr/bin/alias +OLD_FILES+=usr/bin/bg +OLD_FILES+=usr/bin/cd +OLD_FILES+=usr/bin/fc +OLD_FILES+=usr/bin/fg +OLD_FILES+=usr/bin/getopts +OLD_FILES+=usr/bin/hash +OLD_FILES+=usr/bin/jobs +OLD_FILES+=usr/bin/read +OLD_FILES+=usr/bin/type +OLD_FILES+=usr/bin/ulimit +OLD_FILES+=usr/bin/umask +OLD_FILES+=usr/bin/unalias +OLD_FILES+=usr/bin/wait + # 20251208: Rename iwm8000C to correct name. OLD_FILES+=boot/firmware/iwm8000C diff --git a/contrib/ncurses/AUTHORS b/contrib/ncurses/AUTHORS index 09dfc9a9efa6..f588fc44f2f4 100644 --- a/contrib/ncurses/AUTHORS +++ b/contrib/ncurses/AUTHORS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020,2021 Thomas E. Dickey -- +-- Copyright 2020-2024,2025 Thomas E. Dickey -- -- Copyright 2006,2017 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $ +-- $Id: AUTHORS,v 1.8 2025/11/12 01:25:55 tom Exp $ ------------------------------------------------------------------------------- These are the principal authors/contributors of ncurses since 1.9.9e, in decreasing order of their contribution: @@ -36,5 +36,6 @@ JPF Juergen Pfeifer ESR Eric S Raymond AVL Alexander V Lukyanov PB Philippe Blain +GBR Branden Robinson SV Sven Verdoolaege -NB Nicolas Boulenguez +NB Nicolas Boulenguez diff --git a/contrib/ncurses/COPYING b/contrib/ncurses/COPYING index 540047f121f1..6182a3bc671f 100644 --- a/contrib/ncurses/COPYING +++ b/contrib/ncurses/COPYING @@ -1,4 +1,4 @@ -Copyright 2018-2023,2024 Thomas E. Dickey +Copyright 2018-2024,2025 Thomas E. Dickey Copyright 1998-2017,2018 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining a @@ -26,4 +26,4 @@ sale, use or other dealings in this Software without prior written authorization. -- vile:txtmode fc=72 --- $Id: COPYING,v 1.13 2024/01/05 21:13:17 tom Exp $ +-- $Id: COPYING,v 1.14 2025/01/04 10:53:46 tom Exp $ diff --git a/contrib/ncurses/INSTALL b/contrib/ncurses/INSTALL index a2076eeec261..fea738a4c465 100644 --- a/contrib/ncurses/INSTALL +++ b/contrib/ncurses/INSTALL @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2023,2024 Thomas E. Dickey -- +-- Copyright 2018-2024,2025 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.254 2024/04/27 14:21:05 tom Exp $ +-- $Id: INSTALL,v 1.263 2025/12/30 20:42:25 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -550,8 +550,8 @@ CONFIGURE OPTIONS: problem. --enable-bsdpad - Recognize BSD-style prefix padding. Some ancient BSD programs (such as - nethack) call tputs("50") to implement delays. + Recognize BSD-style prefix padding. Some programs written using + the BSD curses API use tputs("50") to implement delays. --enable-check-size Compile-in feature to detect screensize for terminals which do not @@ -587,7 +587,8 @@ CONFIGURE OPTIONS: as such to the debugger. See also the --disable-macros option. --enable-exp-win32 - When configuring for MinGW, use the experimental Windows 10 driver. + This is an obsolete option used for configuring the Windows 10 driver + for MinGW. --enable-ext-colors Extend the cchar_t structure to allow more than 16 colors to be @@ -650,6 +651,12 @@ CONFIGURE OPTIONS: may not be accurate, or that your stty settings have disabled the use of tabs. + --enable-install-prefix + Extend the --with-install-prefix feature to replace the prefix value + with $DESTDIR rather than simply prepending $DESTDIR to install + pathnames. This works with any "make" which supports AT&T style + variable substitution. + --enable-interop Compile-in experimental interop bindings. These provide generic types for the form-library. @@ -660,6 +667,10 @@ CONFIGURE OPTIONS: systems). If you do not specify this option, the configure script checks the current filesystem. + --enable-named-pipes + Compile-in support for named pipes, used to connect to Windows 10 + pseudo-console. + --enable-no-padding Compile-in support for the $NCURSES_NO_PADDING environment variable, which allows you to suppress the effect of non-mandatory padding in @@ -703,7 +714,7 @@ CONFIGURE OPTIONS: Use rpath option when generating shared libraries, and (with some restrictions) when linking the corresponding programs. This originally (in 1997) applied mainly to systems using the GNU linker (read the - manpage). + man page). More recently it is useful for systems that require special treatment shared libraries in "unusual" locations. The "system" libraries reside @@ -768,9 +779,9 @@ CONFIGURE OPTIONS: unless you have disabled the extended functions. --enable-term-driver - Enable experimental terminal-driver. This is currently used for the - MinGW port, by providing a way to substitute the low-level terminfo - library with different terminal drivers. + Enable terminal-driver. This is required for the MinGW port, by + providing a way to substitute the low-level terminfo library with + different terminal drivers. --enable-termcap Compile in support for reading terminal descriptions from termcap if no @@ -1097,34 +1108,35 @@ CONFIGURE OPTIONS: ./configure --enable-static --with-manpage-aliases - Tell the configure script you wish to create entries in the - man-directory for aliases to manpages which list them, e.g., the - functions in the panel manpage. This is the default. You can disable - it if your man program does this. You can also disable - --with-manpage-symlinks to install files containing a ".so" command - rather than symbolic links. + Create files in subdirectories of the installation "man" directory that + alias the man pages documenting them. For example, the "beep" man page + also documents the function "flash". This is the default. You can + disable this procedure if your system's makewhatis(8) or mandb(8) + program indexes the directory to which the pages are installed. If you + disable man page symlinks by specifying "--without-manpage-symlinks", + the alias pages are created as stubs containing ".so" *roff requests. --with-manpage-format=XXX - Tell the configure script how you would like to install man-pages. The - option value must be one of these: gzip, compress, BSDI, normal, - formatted. If you do not give this option, the configure script + Tell the configure script how you would like to install man pages. The + option value must be one of these: "gzip", "compress", "BSDI", "normal", + "formatted". If you do not specify this option, the configure script attempts to determine which is the case. --with-manpage-renames=XXX - Tell the configure script that you wish to rename the manpages while - installing. Currently the only distribution which does this is Debian. + Tell the configure script that you wish to rename the man pages when + installing them. Debian and distributions descended from it do this. The option value specifies the name of a file that lists the renamed - files, e.g., $srcdir/man/man_db.renames + files, e.g., "$srcdir/man/man_db.renames". --with-manpage-symlinks Tell the configure script that you wish to make symbolic links in the - man-directory for aliases to the man-pages. This is the default, but - can be disabled for systems that provide this automatically. Doing - this on systems that do not support symbolic links will result in - copying the man-page for each alias. + man-directory for aliases to the man pages. This is the default, but + can be disabled for systems that provide this service automatically. + Doing this on systems that do not support symbolic links creates a copy + of the target man page for each alias. --with-manpage-tbl - Tell the configure script that you wish to preprocess the manpages + Tell the configure script that you wish to preprocess the man pages by running them through tbl to generate tables understandable by nroff. @@ -1182,11 +1194,11 @@ CONFIGURE OPTIONS: --with-pkg-config-libdir[=DIR] If pkg-config was found, override the automatic check for its library path. The optional DIR value can be - + "auto", automatically use pkg-config's library directory, or - + "libdir", use a ${libdir}/pkgconfig (based on the configuration), or - + a directory path, i.e., beginning with "/". The configure script allows only a single directory, because @@ -1351,11 +1363,9 @@ CONFIGURE OPTIONS: several builds, some symbols will be listed in the the ".map" files that do not happen to be present in one configuration or another. - The sample ".map" (and ".sym") files are generated using a set of - scripts which build several configurations for each release version, - checking to see which of the "_nc_" symbols can be made local. In - addition to the ncurses libraries and programs, the symbols used - by the "tack" program before version 1.08 are made global. + The sample ".map" (and ".sym") files were generated using a set of + scripts which built several configurations for each release version, + checking to see which of the "_nc_" symbols can be made local. These sample ".map" files will not cover all possible combinations. In some cases, e.g., when using the --with-weak-symbols option, you @@ -1393,10 +1403,10 @@ CONFIGURE OPTIONS: --without-curses-h Don't install the ncurses header with the name "curses.h". Rather, - install as "ncurses.h" and modify the installed headers and manpages + install as "ncurses.h" and modify the installed headers and man pages accordingly. - Likewise, do not install an alias "curses" for the ncurses manpage. + Likewise, do not install an alias "curses" for the ncurses man page. --without-cxx XSI curses declares "bool" as part of the interface. C++ also declares @@ -1419,7 +1429,7 @@ CONFIGURE OPTIONS: Do not use dlsym() to load GPM dynamically. --without-manpages - Tell the configure script to suppress the install of ncurses' manpages. + Tell the configure script to suppress the install of ncurses' man pages. --without-progs Tell the configure script to suppress the build of ncurses' application @@ -1451,7 +1461,32 @@ COMPATIBILITY WITH OLDER RELEASES: you may encounter when building a system with different versions of ncurses: - 6.5 (Apt 27, 2024) + 6.6 (Dec 30, 2025) + Interface changes: + + + none + + Added extensions: + + + none + + Added internal functions (other than "_sp" variants): + + + _nc_is_path_found + + Removed internal functions: + + + none + + Modified internal functions: + + + These now pass a const parameter: _nc_has_mouse, + _nc_reset_color_pair, _nc_free_entry, and _nc_timed_wait. + + These now use a NCURSES_BOOL where an int was used: + _nc_setupscreen, _nc_keypad, _nc_unicode_locale, and + _nc_retrace_bool. + + 6.5 (Apr 27, 2024) Interface changes: + the WINDOW structure and some related internal data types declared diff --git a/contrib/ncurses/MANIFEST b/contrib/ncurses/MANIFEST index a9395d2f8a09..dc791dbe0f1c 100644 --- a/contrib/ncurses/MANIFEST +++ b/contrib/ncurses/MANIFEST @@ -36,6 +36,8 @@ ./Ada95/mk-pkg.awk ./Ada95/package/AdaCurses-doc.spec ./Ada95/package/AdaCurses.spec +./Ada95/package/debian/adacurses.lintian-overrides +./Ada95/package/debian/adacurses.triggers ./Ada95/package/debian/compat ./Ada95/package/debian/control ./Ada95/package/debian/copyright @@ -556,21 +558,18 @@ ./include/headers ./include/nc_access.h ./include/nc_alloc.h -./include/nc_mingw.h ./include/nc_panel.h ./include/nc_string.h ./include/nc_termios.h ./include/nc_tparm.h -./include/nc_win32.h +./include/nc_win32.h.in ./include/ncurses_cfg.hin ./include/ncurses_defs ./include/ncurses_dll.h.in -./include/ncurses_mingw.h ./include/term_entry.h ./include/termcap.h.in ./include/tic.h ./include/unctrl.h.in -./include/win32_curses.h ./install-sh ./man/MKada_config.in ./man/MKncu_config.in @@ -900,6 +899,7 @@ ./ncurses/llib-ltinfow ./ncurses/modules ./ncurses/new_pair.h +./ncurses/report_ctype.c ./ncurses/report_hashing.c ./ncurses/report_offsets.c ./ncurses/term.priv.h @@ -1007,12 +1007,11 @@ ./ncurses/win32con/gettimeofday.c ./ncurses/win32con/wcwidth.c ./ncurses/win32con/win32_driver.c -./ncurses/win32con/win_driver.c ./package/debian-mingw/changelog ./package/debian-mingw/compat ./package/debian-mingw/control ./package/debian-mingw/copyright -./package/debian-mingw/mingw32-ncurses6.lintian-overrides +./package/debian-mingw/mingw32-ncurses6td.lintian-overrides ./package/debian-mingw/rules ./package/debian-mingw/source/format ./package/debian-mingw/watch @@ -1020,7 +1019,7 @@ ./package/debian-mingw64/compat ./package/debian-mingw64/control ./package/debian-mingw64/copyright -./package/debian-mingw64/mingw64-ncurses6.lintian-overrides +./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides ./package/debian-mingw64/rules ./package/debian-mingw64/source/format ./package/debian-mingw64/watch @@ -1028,10 +1027,10 @@ ./package/debian/compat ./package/debian/control ./package/debian/copyright -./package/debian/ncurses6.lintian-overrides -./package/debian/ncurses6.triggers -./package/debian/ncursest6.lintian-overrides -./package/debian/ncursest6.triggers +./package/debian/ncurses6td.lintian-overrides +./package/debian/ncurses6td.triggers +./package/debian/ncursest6td.lintian-overrides +./package/debian/ncursest6td.triggers ./package/debian/rules ./package/debian/source/format ./package/debian/watch @@ -1190,6 +1189,8 @@ ./test/package/debian/control ./test/package/debian/copyright ./test/package/debian/docs +./test/package/debian/ncurses-examples.lintian-overrides +./test/package/debian/ncursest-examples.lintian-overrides ./test/package/debian/rules ./test/package/debian/source/format ./test/package/debian/watch diff --git a/contrib/ncurses/Makefile.in b/contrib/ncurses/Makefile.in index 1303e171cfa1..9a55006e0331 100644 --- a/contrib/ncurses/Makefile.in +++ b/contrib/ncurses/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.46 2022/10/01 22:53:36 tom Exp $ +# $Id: Makefile.in,v 1.51 2025/10/25 18:01:01 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2022,2025 Thomas E. Dickey # # Copyright 1998-2014,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -35,11 +35,10 @@ SHELL = @SHELL@ VPATH = @srcdir@ -DESTDIR=@DESTDIR@ -RPATH_LIST=@RPATH_LIST@ -TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" - @SET_MAKE@ +@SET_DESTDIR@ +RPATH_LIST = @RPATH_LIST@ +TOP_MFLAGS = DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" NCURSES_MAJOR = @NCURSES_MAJOR@ NCURSES_MINOR = @NCURSES_MINOR@ @@ -93,6 +92,7 @@ preinstall : @ echo '' @ echo ' extended funcs: '`test @NCURSES_EXT_FUNCS@ != 0 && echo yes || echo no` @ echo ' xterm terminfo: '@WHICH_XTERM@ + @ echo ' ABI suffix: '`if test -n "@ABI_SUFFIX@"; then echo @ABI_SUFFIX@; else echo "(none)"; fi` @ echo '' @ echo ' bin directory: '$(bindir) @ echo ' lib directory: '$(libdir) @@ -114,13 +114,10 @@ preinstall : distclean \ realclean :: -check : - @ echo The test-programs are interactive - - # Put the common rules here so that we can easily construct the list of # directories to visit. all \ +check \ clean \ distclean \ mostlyclean \ diff --git a/contrib/ncurses/Makefile.os2 b/contrib/ncurses/Makefile.os2 index bc3407d65750..68d4f898413d 100644 --- a/contrib/ncurses/Makefile.os2 +++ b/contrib/ncurses/Makefile.os2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2025 Thomas E. Dickey # # Copyright 1998-2000,2006 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ################################################################################ -# $Id: Makefile.os2,v 1.13 2021/06/17 21:20:30 tom Exp $ +# $Id: Makefile.os2,v 1.15 2025/07/12 10:48:01 tom Exp $ # # Wrapper Makefile for ncurses library under OS/2. # Author: Juan Jose Garcia Ripoll . @@ -247,7 +247,7 @@ OS2NAME=ncurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-emx os2dist : $(MAKE) -f Makefile.os2 os2clean ./configure --without-debug --with-install-prefix=`pwd|sed -e 's@^.:@@'`/$(OS2NAME) - $(MAKE) -f Makefile.os2 $(CF_MFLAGS) install.os2 + $(MAKE) -f Makefile.os2 install.os2 -rm -f $(OS2NAME).zip echo NCurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-$(NCURSES_PATCH) for emx > $(OS2NAME)/FILE_ID.DIZ echo Binary release. >> $(OS2NAME)/FILE_ID.DIZ diff --git a/contrib/ncurses/NEWS b/contrib/ncurses/NEWS index 8bedbc8264e1..c10767b675c8 100644 --- a/contrib/ncurses/NEWS +++ b/contrib/ncurses/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2023,2024 Thomas E. Dickey -- +-- Copyright 2018-2024,2025 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4114 2024/04/27 18:00:35 tom Exp $ +-- $Id: NEWS,v 1.4390 2025/12/30 20:31:07 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,575 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20251230 6.6 release for upload to ftp.gnu.org + + update announcement + + corrected an ifdef needed for mouse support in MinGW/Windows + + eliminate remaining duplicate code between MinGW/Windows drivers + +20251227 + + make win32_curses.h obsolete in favor of nc_win32.h + + modify MinGW32 configuration to account for its use of Windows-style + pathnames in filesystem checks. + + replace --enable-exp-win32 option with --enable-named-pipes + +20251220 + > in-progress work to merge MinGW/Windows port. + + eliminate EXP_WIN32_DRIVER with USE_NAMED_PIPES + + change MS_TERMINAL to DEFAULT_TERM_VAR + +20251213 + + in-progress work to merge MinGW/Windows port. + + add a null-pointer check in tic -c option. + + add a limit-check in infocmp -i option (report/example by Yixuan Cao). + +20251206 + + in-progress work to merge MinGW/Windows port. + +20251129 + + in-progress work to merge MinGW/Windows port. + +20251123 + + revert change using NCURSES_SBOOL in tic.h which interfered with + sign-extension in tigetflag (Debian #1121191, cf: 20251101). + +20251122 + + in-progress work to merge MinGW/Windows port. + + correct expression for TINFO_LIB variable in misc/ncurses-config.in + (Debian #1121208, cf: 20251004). + +20251115 + + check for special case of wcrtomb() converting a single byte code to + a different single byte code, which glibc does for code 160 in the + KOI8-R encoding (report by Yury V Zaytsev). + + improve formatting/style of manpages (patches by Branden Robinson). + + amend recent changes to mouse handling to avoid a case which caused + a loop in wgetch until additional input is provided (htop #1769, + cf: 20250913). + +20251101 + + adjust generated terminfo.5 to omit tbl "x" column modifier if that *** 103542 LINES SKIPPED *** From nobody Thu Feb 19 09:12: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 4fGnhq6wSCz6ScGS for ; Thu, 19 Feb 2026 09:12: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 4fGnhq6VZgz41cS for ; Thu, 19 Feb 2026 09:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Q2u7szoatarZyoxJ6VQSUJCTpavf7UsMSul2ZZNQ+o=; b=Mt9xfpTzEB6ivroS4m2CjZ7orwFhlEbl//pg30MOAfYyUY5owzjl8dX3ZPOWIV7VZQTlH9 0KYjOxaPnh3NhGV3apVXvFzNaVIcu1DSnsIOEUoqbGjpejGDJ3uWafUp99+vz5OSMxKLId /CybtW1Y1fk4CwvyMzJRuLvj8c9DRtpclB6+o8fTHjWOy0aiTOUEoYkvGNgjy8b4/jyygY PUQKAggGinZhnZdYkMXpnEtsQkyQG1n0qjxn6fj6WZMNbVB9QzM4Pdw9sHQAi1zFj2mCER NT0j9UjaYgH32TERTDDS92CjivJpt+DUWn/VWOs3/mzsr0f5hA0LQLBoiLk/6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492363; a=rsa-sha256; cv=none; b=nQIW0vCfLRLC/QG/nhFJhi0jcVwcx6Hu8Woib2Kzf27P3bsOIo1HgdxIKuSpso2A5sPXX8 GD1eUhFD1X+jdJVkWNcwlrQCz37Lo06uhutc0qmhTkFFQaonLo0m8WFne6nHaz1EpLVkhM t3cQ1K5rIWWo7wKD2ZOJbcuzd1ZDnzGsHBU2MRrD5VCoF3bV6sgVtNW+CxKvTUX5QLKQ2L MS87hnXVxZpm5Y8qNHP4OM4//FhMOIx5QBCa08nadGAN/GcXqcy53lZSvmnX/Nfs9rGCEx 8u4UHkPIp6LpHQRgUMDaZ95m5TNA7yZIM2wVzr4uQkfG889Ldx4bRapufyi1nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Q2u7szoatarZyoxJ6VQSUJCTpavf7UsMSul2ZZNQ+o=; b=o8Tqc2G/WF6LrBBse/P0JwqRGk8oox44PPIGTuJI/9v+akWYh+R1oCFvrw/N2E+eM5aEa7 NUPSoorWqOFI0AUokXVuvtBD/of9DlnXSEO5UaI2WhdDrX2+DEVJE06Os5YPe7Sd90Eo95 AJnF6xZLQ45QM4mfG4NPlV111FMNtu9xxHPAmUO6eIVjTrX259nzZGdxkZ9w+JF+b3ecIB Lek8VGZrFIBvdKjqiQKjWrlwJzH0RDMVg/BX8UA4KePOzzsi2qb3bqOxtFIdjI6sH2mFHJ +l2V7wt/kiP21TStF6srBE4rP2Dkei1Xd+GhwX2W8pmbpQyiKh9WXJJGCmw1lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnhq5mqSzcPd for ; Thu, 19 Feb 2026 09:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ca4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:12:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2483216eecf3 - stable/15 - pci_vendors: update to 2026-02-10 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 2483216eecf34c8a19277ea37b322cd660183645 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:12:43 +0000 Message-Id: <6996d40b.1ca4e.e478a6a@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2483216eecf34c8a19277ea37b322cd660183645 commit 2483216eecf34c8a19277ea37b322cd660183645 Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:33:11 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:12:34 +0000 pci_vendors: update to 2026-02-10 (cherry picked from commit 1acfc913e6b936dec3effc7d1e902a50e5432406) --- share/misc/pci_vendors | 466 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 358 insertions(+), 108 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index bcb3d2f9e030..12ba7ca86ea5 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # -# List of PCI ID's +# List of PCI IDs # -# Version: 2025.12.12 -# Date: 2025-12-12 03:15:02 +# Version: 2026.02.10 +# Date: 2026-02-10 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -268,15 +268,7 @@ 0e11 409c Smart Array 6400 0e11 409d Smart Array 6400 EM 005a Remote Insight II board - Lights-Out - 007c NC7770 1000BaseTX - 007d NC6770 1000BaseTX - 0085 NC7780 1000BaseTX 00b1 Remote Insight II board - PCI device - 00bb NC7760 - 00ca NC7771 - 00cf NC7772 - 00d1 NC7783 - 00e3 NC7761 0508 Netelligent 4/16 Token Ring 1000 Triflex/Pentium Bridge, Model 1000 2000 Triflex/Pentium Bridge, Model 2000 @@ -324,7 +316,6 @@ b012 Netelligent 10 T/2 PCI UTP/Coax b030 Netelligent 10/100 TX UTP b060 Smart Array 5300 Controller - b0e1 NC3133 Fast Ethernet Module b178 Smart Array 5i/532 0e11 4080 Smart Array 5i 0e11 4082 Smart Array 532 @@ -839,6 +830,7 @@ 15d9 1d08 AOC-S4016L-L16IR Storage Adapter 17aa 7855 ThinkSystem RAID 950W-16i 8GB Flash PCIe Gen4 24Gb Adapter 1d49 020a ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA + 1d49 020c ThinkSystem 450W-16e PCIe Gen4 HBA 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) # 8 Internal and 8 External port channel 9400 HBA 1000 3040 HBA 9400-8i8e @@ -4027,6 +4019,7 @@ 1002 0b36 Reference RX 5700 XT 1458 2313 Radeon RX 5700 XT Gaming OC 1458 231d Radeon RX 5600 XT/REV 2.0 [Windforce 6GB OC] + 1462 381e RX 5600 XT MECH OC 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 1682 5701 RX 5700 XT RAW II 1849 5102 RX5700 CLD 8GO [ASRock Challenger D RX 5700 OC] @@ -4034,8 +4027,9 @@ 1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 1da2 e410 Sapphire NITRO+ RX 5700 XT 1da2 e411 Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] - 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M] + 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5300/5500M] 106b 0210 Radeon Pro 5300M + 106b 0219 iMac (Retina 5K, 27-inch, 2020) [Radeon Pro 5300] 7341 Navi 14 [Radeon Pro W5500] 7347 Navi 14 [Radeon Pro W5500M] 734f Navi 14 [Radeon Pro W5300M] @@ -4130,6 +4124,7 @@ 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] + 1462 7e26 Radeon RX 7800 XT [Nitro+] 148c 2427 RX 7800 XT [Hellhound / Red Devil] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC @@ -4153,6 +4148,7 @@ 1da2 e490 Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT] 7551 Navi 48 [Radeon AI PRO R9700] 7590 Navi 44 [Radeon RX 9060 XT] + 1458 2429 GV-R9060XTGAMING OC-16GD [Radeon RX 9060 XT GAMING OC 16G] 1eae 8601 RX-96TS316W7 [SWIFT RX 9060 XT OC White Triple Fan Gaming Edition 16GB] 75a0 Aqua Vanjaram [Instinct MI350X] 75a3 Aqua Vanjaram [Instinct MI355X] @@ -9547,7 +9543,7 @@ e1c5 0005 TA1-PCI e1c5 0006 TA1-PCI4 9036 9036 - 9050 PCI <-> IOBus Bridge + 9050 PCI9050 32-bit 33MHz PCI <-> IOBus Bridge 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended @@ -9583,6 +9579,8 @@ 15ed 1001 Macrolink MCCS 16-port Serial 15ed 1002 Macrolink MCCS 8-port Serial Hot Swap 15ed 1003 Macrolink MCCS 16-port Serial Hot Swap + 1761 018e 40-199-002 + 1761 025d 40-662-001 5654 2036 OpenSwitch 6 Telephony card 5654 3132 OpenSwitch 12 Telephony card 5654 5634 OpenLine4 Telephony Card @@ -10359,7 +10357,7 @@ 0068 nForce2 USB Controller 1043 0c11 A7N8X Mainboard a0a0 03b4 UK79G-1394 motherboard - 006a nForce2 AC97 Audio Controler (MCP) + 006a nForce2 AC97 Audio Controller (MCP) 1043 8095 nForce2 AC97 Audio Controller (MCP) a0a0 0304 UK79G-1394 motherboard 006b nForce Audio Processing Unit @@ -10962,6 +10960,7 @@ 1043 02fb V9250 Magic 1043 8180 V9520-X/TD/128M 107d 2967 WinFast A340T 128MB + 1462 9073 MS-8907 (FX5200-TDR128) 1462 9110 MS-8911 (FX5200-TD128) 1462 9171 MS-8917 (FX5200-T128) 1462 9360 MS-8936 (FX5200-T128) @@ -14006,6 +14005,7 @@ 1385 4700 MA521 802.11b Wireless PC Card 1737 0019 WPC11v4 802.11b Wireless-B Notebook Adapter 8185 RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller + 187e 8225 ZyAIR G-302 v3 818b RTL8192EE PCIe Wireless Network Adapter 8190 RTL8190 802.11n PCI Wireless Network Adapter 8191 RTL8192CE PCIe Wireless Network Adapter @@ -16955,7 +16955,8 @@ 11c9 Magma 0010 16-line serial port w/- DMA 0011 4-line serial port w/- DMA -11ca LSI Systems, Inc +11ca IBEX Technology Co., Ltd. + 0039 PAC with Altera Agilex 7 FPGA M-Series [IPAC-1000] 11cb Specialix Research Ltd. 2000 PCI_9050 11cb 0200 SX @@ -18686,6 +18687,7 @@ 1028 23a6 MTFDLBQ30T7THL-1BK1JABDA 1028 23a7 MTFDLAL61T4THL-1BK1JABDA 1028 23a8 MTFDLAL30T7THL-1BK1JABDA + 51cd 9650 PRO NVMe SSD 5404 2210 NVMe SSD [Cobain] 5405 2300 NVMe SSD [Santana] 5407 3400 NVMe SSD [Hendrix] @@ -20743,10 +20745,6 @@ f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. [MSI] 3483 MSI USB 3.0 (VIA VL80x-based xHCI USB Controller) -# This is MSI refreshed variant of their MECH series Navi 23 GPU card (73EF) - 5027 RX 6650XT MECH 2X - 7c56 Realtek Ethernet controller RTL8111H - aaf0 Radeon RX 580 Gaming X 8G 1463 Fast Corporation 1464 Interactive Circuits & Systems Ltd 1465 GN NETTEST Telecom DIV. @@ -20795,8 +20793,6 @@ 148a OPTO 148b INNOMEDIALOGIC Inc. 148c Tul Corporation / PowerColor - 2391 Radeon RX 590 [Red Devil] - 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 148d DIGICOM Systems, Inc. 1003 HCF 56k Data/Fax Modem 148e OSI Plus Corporation @@ -20924,8 +20920,9 @@ 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7663 MT7663 802.11ac PCI Express Wireless Network Adapter 7902 MT7902 802.11ax PCIe Wireless Network Adapter [Filogic 310] - 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter - 7916 MT7905D/MT7975 + 7915 MT7915A/MT7915D normal link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] +# MT7905D/MT7975 contain MT7915. If it works at G1 speed this extra device appears for extra bandwidth + 7916 MT7915A/MT7915D hif link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 1a3b 5300 ASUS PCE-AXE59BT @@ -20933,8 +20930,10 @@ 7927 MT7927 802.11be 320MHz 2x2 PCIe Wireless Network Adapter [Filogic 380] 7961 MT7921 802.11ax PCIe Wireless Network Adapter [Filogic 330] 7988 MT7988 PCI Express Host Bridge [Filogic 880] - 7990 MT7996 802.11be PCI Express Wireless Network Adapter (Port 0) - 7991 MT7996 802.11be PCI Express Wireless Network Adapter (Port 1) + 7990 MT7996 primary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7991 MT7996 secondary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7992 MT7992 primary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] + 799a MT7992 secondary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] 8650 MT7650 Bluetooth 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -22025,6 +22024,8 @@ 0e11 0042 Yogi # Integrated in CX86111/CX86113 processors 1830 CX861xx Integrated Host Bridge + 1f86 DBH CX11880 Codec + 1f87 SMIC CX11880 Codec 2003 HSF 56k Data/Fax Modem 2004 HSF 56k Data/Fax/Voice Modem 2005 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem @@ -22632,7 +22633,8 @@ 0224 CX9 Family [ConnectX-9 Flash Recovery] 0225 CX9 Family [ConnectX-9 Secure Flash Recovery-RMA] 0226 CX10 Family [ConnectX-10 Flash Recovery] - 0227 CX10 Family [ConnectX-10 Secure Flash Recovery-RMA] +# Name change request + 0227 CX10 Family [ConnectX-10 RMA] 0228 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Flash Recovery] 0229 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Secure Flash Recovery-RMA] 024e MT53100 [Spectrum-2, Flash recovery mode] @@ -22659,11 +22661,11 @@ 0274 Spectrum-6 in Flash Recovery Mode 0275 Spectrum-6 RMA 0277 Spectrum-6 Tile - 0278 Quantum-4 in Flash Recovery Mode - 0279 Quantum-4 RMA + 0278 NVLink-6 Switch in Flash Recovery Mode + 0279 NVLink-6 Switch RMA 027a Eros Chiplet - 027c Nvlink-7 Switch in Flash Recovery Mode - 027d Nvlink-7 Switch RMA + 027c NVLink-7 Switch in Flash Recovery Mode + 027d NVLink-7 Switch RMA 027e Spectrum-7 Tile 0281 NPS-600 Flash Recovery 0282 ArcusE Flash recovery @@ -22687,8 +22689,8 @@ 029a OPHY3.1 # Sagitta 029c OPHY3.5 - 02a0 Nvlink-8 Switch in Flash Recovery Mode - 02a1 Nvlink-8 RMA + 02a0 NVLink-8 Switch in Flash Recovery Mode + 02a1 NVLink-8 Switch RMA 02a2 Spectrum-7 in Flash Recovery Mode 02a3 Spectrum-7 RMA 1002 MT25400 Family [ConnectX-2 Virtual Function] @@ -22757,6 +22759,8 @@ 117c 00b4 FastFrame N322 Dual-port 25Gb Ethernet Adapter 117c 40b7 ThunderLink TLN3-3252 Dual-port 25Gb Ethernet Adapter 117c 40b8 ThunderLink TLN3-3102 Dual-port 10Gb Ethernet Adapter + 1458 0280 CLN4C44 + 1458 0281 CLN4C44 with NCSI 15b3 0001 ConnectX-4 Lx EN network interface card, 25GbE single-port SFP28, PCIe3.0 x8, tall bracket, ROHS R6 15b3 0003 Stand-up ConnectX-4 Lx EN, 25GbE dual-port SFP28, PCIe3.0 x8, MCX4121A-ACAT 15b3 0004 ConnectX-4 Lx Stand-up dual-port 10GbE MCX4121A-XCAT @@ -22809,6 +22813,7 @@ 1024 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch] 1025 CX9 Family [ConnectX-9] 1027 CX10 Family [ConnectX-10] + 1028 CX10 Family [ConnectX-10 Trusted Network Control Memory] 1974 MT28800 Family [ConnectX-5 PCIe Bridge] 1975 MT416842 Family [BlueField SoC PCIe Bridge] 1976 MT28908 Family [ConnectX-6 PCIe Bridge] @@ -22827,6 +22832,8 @@ 2024 MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge] 2025 ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge] 2100 CX8 Family [CX8 Data Direct Interface] +# Chip to Chip Link + 2101 CX10 Family [ConnectX-10 C2C] 4117 MT27712A0-FDCF-AE 1bd4 0039 SN10XMP2P25 1bd4 003a 25G SFP28 SP EO251FM9 Adapter @@ -22920,9 +22927,9 @@ d2f2 Quantum-2 NDR (400Gbps) switch d2f4 Quantum-3 d2f6 Quantum-3CPO - d2f8 Quantum-4 - d2fa Nvlink-7 Switch - d2fc Nvlink-8 Switch + d2f8 NVLink-6 Switch + d2fa NVLink-7 Switch + d2fc NVLink-8 Switch 15b4 CCI/TRIAD 15b5 Cimetrics Inc 15b6 Texas Memory Systems Inc @@ -23296,8 +23303,6 @@ 167e ONNTO Corp. 1681 Hercules 1682 XFX Pine Group Inc. - 5701 Radeon 5700 XT Thicc III Ultra - c580 Radeon RX 580 1688 CastleNet Technology Inc. 1170 WLAN 802.11b card 168a Utimaco IS GmbH @@ -23310,9 +23315,14 @@ # nee Atheros Communications, Inc. 168c Qualcomm Atheros 0007 AR5210 Wireless Network Adapter [AR5000 802.11a] + 1186 3a00 DWL-A650 5GHz Wireless CardBus Adapter + 1186 3a02 DWL-A520 5GHz Wireless PCI Adapter + 1668 0429 802CA Wireless PC Card 1737 0007 WPC54A Wireless PC Card 1b47 0100 Harmony 8450CN Wireless CardBus Module 1b47 0110 Skyline 4030 / Harmony 8450 802.11a Wireless CardBus Adapter + 1b47 0400 PC50E-8-FC/A Wireless Access Point Radio Card + 8086 2500 PRO/Wireless 5000 LAN CardBus Adapter 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5211 Wireless Network Adapter [AR5001A 802.11a] 0012 AR5211 Wireless Network Adapter [AR5001X 802.11ab] @@ -23807,6 +23817,7 @@ 7174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller 172a Accelerated Encryption 13c8 AEP SureWare Runner 1000V3 +172f Sparkle Computer Co., Ltd. # nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions 1228 iRMC-S5 HTI Device @@ -23877,12 +23888,22 @@ 0843 PCA-8439 General-purpose multifunctional PCIe card with 16 analog inputs ff00 CTU CAN FD PCIe Card 1761 Pickering Interfaces Ltd - 4411 50-297A + 4411 Pickering Devices with FPGA Based Bus Communication + 1761 082f 40-737-901 + 1761 086c 40-576-001 + 1761 0881 40-584-001 + 1761 311a 42-738-001 + 1761 3190 41-765-004 + 1761 31ab 41-670-003 1761 331f 50-297A-014 1761 3320 50-297A-050 1761 3321 50-297A-056 + 1761 3366 41-625-004 1761 3368 50-297A-130 1761 3372 50-297A-122 + 1761 33a1 40-419-004 + 1761 33a3 41-770-002 + 1761 3714 42-297A-050 1771 InnoVISION Multimedia Ltd. 1775 General Electric 177d Cavium, Inc. @@ -24503,6 +24524,7 @@ 08b0 MVC200-DC 1846 Alcatel-Lucent 1849 ASRock Incorporation + 1150 ASPEED AST1150 PCI-to-PCI Bridge 9602 RS780/RS880 PCI to PCI bridge (int gfx) 184a Thales Computers 1100 MAX II cPLD @@ -24537,8 +24559,6 @@ a102 VigraWATCH PMC a103 Vigra I/O 187e ZyXEL Communications Corporation - 3403 ZyAir G-110 802.11g - 340e M-302 802.11g XtremeMIMO 1885 Avvida Systems Inc. 1888 Varisys Ltd 0301 VMFX1 FPGA PMC module @@ -25170,6 +25190,8 @@ 1993 Innominate Security Technologies AG 1998 Toyou Feiji Electronics Co., Ltd. 0001 TOBOLT1 51987 NVMe SSD + 1998 0384 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD + 1998 0768 TOBOLT1 51987 7680G 2.5" U.2 NVMe SSD 1998 2012 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD 1999 A-Logics a900 AM-7209 Video Processor @@ -25325,7 +25347,7 @@ 19e5 0125 HBA SP186-M-40i 19e5 0180 HBA SP186-M-16i 19e5 0188 HBA SP186-M-8i - a120 HiSilicon PCIe Root Port with Gen4 + a120 HiSilicon PCIe Root Port a121 HiSilicon PCI-PCI Bridge a122 HiSilicon Embedded DMA Engine a124 HiSilicon Internal SDI Function Engine @@ -25385,7 +25407,7 @@ 15d9 086b X10DRS (AST2400 BMC) 15d9 1b95 H12SSL-i (AST2500 BMC) 15d9 1d50 X14DBG-AP (AST2600 BMC) - 1849 2000 ROME2D32LM3 (AST2500 BMC) + 1849 2000 Onboard Graphics 1a05 deltaww 1a07 Kvaser AB 0006 CAN interface PC104+ HS/HS @@ -26167,7 +26189,9 @@ # Nytro 5060H (Rocinante High Performance) non-SED 1bb1 0181 Nytro 5060H 1bb1 01a1 Nytro XP7102 + 0153 Nytro 5x50 NVMe SSD 0155 Nytro 5x50 NVMe SSD + 2000 PCIe Gen4 SSD 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD @@ -26277,6 +26301,8 @@ 3252 CH382 PCIe Dual Port Serial Adapter # Device ID reused: CH352 is for PCI bus, CH382 for PCIe. 3253 CH352/CH382 PCI/PCIe Dual Port Serial Adapter + 3470 CH384 Serial Adapter, 4-port mode + 3853 CH384 Serial Adapter, 8-port mode 1c09 CSP, Inc. 4254 10G-PCIE3-8D-2S 4255 10G-PCIE3-8D-Q @@ -26633,7 +26659,7 @@ 1602 LEGEND 900 NVMe SSD (DRAM-less) # SX6000LNP 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) - 2708 Premier Extreme microSDXC SD7.1 Express Card (DRAM-less) + 2708 Premier Extreme SDXC SD 7.0 / microSDXC SD 7.1 Express Card (DRAM-less) 32a8 SM2P32A8 NVMe SSD (DRAM-less) 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f4 IM2P33F4 NVMe SSD (DRAM-less) @@ -26695,6 +26721,12 @@ 5201 AM520 PCIe 3.0 NVMe SSD 128GB 5212 AM521 PCIe 3.0 NVMe SSD 256GB 5414 AM541 PCIe 4.0 NVMe SSD 1024GB + 6020 NVMe SSD Controller UM3X1X series + 1cc4 8320 NVMe SSD UM301a M.2 480GB + 1cc4 8321 NVMe SSD UM301a M.2 960GB + 1cc4 8322 NVMe SSD UM301a M.2 1.92TB + 1ea0 8320 NVMe SSD TM1300 M.2 480GB + 1ea0 8322 NVMe SSD TM1300 M.2 1.92TB 6201 AM620 PCIe 3.0 NVMe SSD 128GB 6202 AM620 PCIe 3.0 NVMe SSD 256GB 6203 AM620 PCIe 3.0 NVMe SSD 512GB @@ -26717,6 +26749,15 @@ 6b14 RPJYJ1T24MLR1HWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 6c13 AM6C1 PCIe 4.0 NVMe SSD 6d03 AM6DX PCIe 5.0 NVMe SSD + 7030 NVMe SSD Controller UH7X3X series + 1cc4 7112 NVMe SSD UH733a U.2 1.6TB + 1cc4 7113 NVMe SSD UH733a U.2 3.2TB + 1cc4 7114 NVMe SSD UH733a U.2 6.4TB + 1cc4 7115 NVMe SSD UH733a U.2 12.8TB + 1cc4 7122 NVMe SSD UH713a U.2 1.92TB + 1cc4 7123 NVMe SSD UH713a U.2 3.84TB + 1cc4 7124 NVMe SSD UH713a U.2 7.68TB + 1cc4 7125 NVMe SSD UH713a U.2 15.36TB 8030 NVMe SSD Controller UH8X2X/UH7X2X series 1cc4 1122 NVMe SSD UH812a U.2 1.92TB 1cc4 1123 NVMe SSD UH812a U.2 3.84TB @@ -26764,6 +26805,8 @@ 1ea0 6125 NVMe SSD TP3510 U.2 15.36TB 1ea0 6224 NVMe SSD TP3510 E3.S 7.68TB 1ea0 6225 NVMe SSD TP3510 E3.S 15.36TB + 1ea0 7124 NVMe SSD TP3512 U.2 7.68TB + 1ea0 7125 NVMe SSD TP3512 U.2 15.36TB 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -27243,6 +27286,7 @@ 1466 Data Fabric: Device 18h; Function 6 1467 Data Fabric: Device 18h; Function 7 1468 NTBCCP + 6211 K100_AI 7901 FCH SATA Controller [AHCI mode] 7904 FCH SATA Controller [AHCI mode] 7906 FCH SD Flash Controller @@ -27664,6 +27708,9 @@ 1de5 Eideticom, Inc 1000 IO Memory Controller 2000 NoLoad Hardware Development Kit + 2100 NoLoad Accelerator Platform + 2200 NoLoad Cryptographic Accelerator + 2300 NoLoad Data Services 3000 eBPF-based PCIe Accelerator 1ded Alibaba (China) Co., Ltd. 107f Elastic RDMA Adapter @@ -27798,6 +27845,7 @@ 05c0 PCIe 6 Fabric Switch PF6xxx [Scorpio] 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter +1e0b Shenzhen Decenta Technology Co.,LTD 1e0d SambaNova Systems, Inc 1e0f KIOXIA Corporation 0001 NVMe SSD Controller BG4 (DRAM-less) @@ -28235,6 +28283,7 @@ 50d0 NVME RAID Card DP800 50d1 Flexraid6 NVMeRAID 1e3d Burlywood, Inc +1e3e Shanghai Iluvatar CoreX Semiconductor Co., Ltd. 1e43 MaxLinear Inc 8904 MxL8904 8906 MxL8906 @@ -28278,12 +28327,12 @@ 1602 NVMe SSD Controller MAP1602 (DRAM-less) 1608 NVMe SSD Controller MAP1608 (DRAM-less) 1e4c GSI Technology - 0010 Associative Processing Unit [Gemini-1] + 0010 Gemini-I 1e4c 0010 Leda-E 1e4c 0120 SE120 - 0020 Associative Processing Unit [Gemini-2] - 1e4c 0010 Leda-E2 + 0020 Gemini-II 1e4c 0011 Leda-E2 rev 1.1 + 1e4c 0020 G2-Edge 1e50 IP3 Tech (HK) Limited 1e52 Tenstorrent Inc 401e Wormhole @@ -28464,6 +28513,7 @@ 1ec8 12a2 Fantasy I Device 8900 GR308 8902 GR3 Audio + 8904 GR308 9800 Fantasy II 1ec8 12a2 Fantasy II Device 9802 Fantasy II @@ -28481,6 +28531,7 @@ 1ed2 FuriosaAI, Inc. 0000 Warboy 0001 RNGD + 0002 RNGD-Plus 2222 RNGD-S 1ed3 Yeston 1ed5 Moore Threads Technology Co.,Ltd @@ -28808,10 +28859,26 @@ 1f0f 0001 D1055AS vDPA Ethernet Controller 1042 D1055AS vDPA Storage Controller 1f0f 0001 D1055AS vDPA Storage Controller + 1045 D1205CQ vPDA Ethernet Controller + 1f0f 0001 D1205CQ vPDA Ethernet Controller + 1046 D1205CQ vPDA Storage Controller + 1f0f 0001 D1205CQ vPDA Storage Controller + 1047 D1205CQ RDMA Ethernet Controller + 1f0f 0001 D1205CQ RDMA Ethernet Controller 1220 D1055AS Ethernet Controller 1221 D1055AS Ethernet Controller 1222 D1055AS Ethernet Controller 1223 D1055AS Ethernet Controller + 1224 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1225 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1226 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1227 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1228 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller 1600 M16104 Family 1f0f 0001 N1045XS, Quad-port 10GbE, PCIe 3.0 x8 1601 M16104 Family Virtual Function @@ -28832,6 +28899,7 @@ 1a02 M16102 Family 1f0f 0001 N1025XT, Dual-port 10GbE, PCIe 3.0 x4, Fan 2022 D1055AS PCI Express Switch Upstream Port + 2023 D1205CQ PCI Express Switch Upstream Port 3403 M18110 Family 3404 M18110 Lx Family 3405 M18110 Family BASE-T @@ -28852,9 +28920,13 @@ 3502 M18305 Family 1f0f 0001 S2055AS, 2x 25GbE, SFP28, PCIe 4.0 x8 1f0f 0002 S2025XS, 2x 10GbE, SFP+, PCIe 4.0 x8 + 3504 M18305 Family BASE-T + 1f0f 0001 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8, Fan + 1f0f 0002 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8 350a M18305 Family Virtual Function 1f0f 0001 M18305 Family Virtual Function 9088 D1055AS PCI Express Switch Downstream Port + 9089 D1205CQ PCI Express Switch Downstream Port 1f16 XConn Technologies c500 XC50256 CXL2.0 Switch c510 XC51256 PCIe 5.0 Switch @@ -28944,7 +29016,7 @@ 5236 NV7000 NVMe SSD 5765 PCIe 3 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited -1f47 YUSUR Technology Co., Ltd. +1f47 YUSUR Technology 1001 K2-Pro Family [FLEXFLOW-2200T] 1f47 0001 FLEXFLOW-2200T 2*10GE Ethernet Adapter 1f47 0002 FLEXFLOW-2200T 2*25GE Ethernet Adapter @@ -28984,6 +29056,10 @@ 1f47 0006 Ethernet 25G 2P FLEXFLOW-2200R 1f47 0007 Ethernet 50G 2P FLEXFLOW-2200R 1f47 0008 Ethernet 100G 2P FLEXFLOW-2200R + 3301 K3 Family [FLEXFLOW-3100R] + 1f47 0001 FLEXFLOW-3100R 1*100GE Ethernet Adapter + 3302 K3 Family [FLEXFLOW-3100R Virtual Function] + 3303 K3 Family [CONFLUX-3100R MGMT Function] 4001 K2-Pro Family [CONFLUX-2200E] 1f47 0001 Ethernet 25G 2P CONFLUX-2200E 1f47 0002 Ethernet 40G 2P CONFLUX-2200E @@ -29042,6 +29118,7 @@ 6002 K2-Pro Family [CONFLUX-2200X Virtual Function] 6003 K2-Pro Family [CONFLUX-2200X MGMT Function] 6004 K2-Pro Family [CONFLUX-2200X DATA Offload Engine] +1f49 NeuReality LTD 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. 1008 Mango GPUBoost - RDMA @@ -29084,6 +29161,13 @@ 1608 PCIe Gen4 x4 M.2 2280 1f88 TE3420 PCIe Gen3 x4 M.2 2280 2269 XE4403 Series NVMe PCIe Gen4x4 SSD + 3101 EP1021 Series M.2 2242 NVMe PCIe Gen3x4 SSD + 3105 EP2021 Series M.2 2242 NVMe PCIe Gen4x4 SSD + 3201 EP1021 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3202 EP1031 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3205 EP2021 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3206 EP2031 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3261 DP1421 Series M.2 2280 NVMe PCIe Gen3x4 SSD 3420 PCIe Gen3 x4 M.2 2280 6100 TE3420 Series NVMe PCIe Gen3x4 SSD 6101 XE3420 Series NVMe PCIe Gen3x4 SSD @@ -29198,6 +29282,12 @@ 0028 IC695RMX228 RX3i 128MB Redundancy Memory Xchange with Single Fiber transceiver 0029 IC695PMM345 PACMotion Digital Motion Control Module (EtherCAT) 002a IC695HSC318 RX3i High Speed Counter (8 counters) + 8003 IC695CPU310/CMU310/NIU001 RX3i Controller 300 MHz Celeron + 8004 IC695CPU315/320/CRU320 RX3i Controller 1.0 GHz Celeron-M + 8005 IC695PNS001/101 RX3i Profinet Scanner + 8006 IC695CPE/CRE330 RX3i Controller 1.0 GHz G-series + 8007 IC695CPE302/305/310/NIU001+ RX3i Controller 1.1 GHz Atom Z510 + 800d IC695CPE302/305/310/NIU001+ RX3i Controller Atom x3930 1fc9 Tehuti Networks Ltd. 3009 10-Giga TOE SmartNIC 3010 10-Giga TOE SmartNIC @@ -29351,6 +29441,7 @@ 2004 Smart Link Ltd. 201f SpacemiT 0001 X60 PCIe 2.0 x2 Root Complex + 0002 X100 PCIe Root Complex 202c CAEN S.p.A. 5818 A5818 2036 Netforward Microelectronics Co., Ltd. @@ -29360,10 +29451,29 @@ 2036 0862 NF1618 Family NX862 (2*50GE) 2036 0863 NF1618 Family NX863 (2*100GE) 2036 0864 NF1618 Family NX864 (1*200GE) + 2036 0865 NF1618 Family NX865 (2*200GE) 1619 NF1618 Family Virtual Function + 8000 NP36xxx PCIe Gen 6 Switch + 2036 0104 NP36104 PCIe Gen 6 26 port/104 lane Switch Upstream/Downstream Port + 2036 0144 NP36144 PCIe Gen 6 36 port/144 lane Switch Upstream/Downstream Port + 2036 1000 NP36000 PCIe Gen 6 Virtual Upstream/Downstream Port + 2036 1001 NP36000 Virtual PCIe MGR 1.x Endpoint + 2036 1002 NP36000 Virtual PCIe DMA 1.x Endpoint + 2036 1003 NP36000 Virtual PCIe NTB 1.x Endpoint + 2036 1004 NP36000 Virtual PCIe Placeholder 1.x Endpoint + 2036 1005 NP36000 Virtual PCIe C2PMem 1.x Endpoint + 2036 1006 NP36000 Virtual PCIe Pktgen 1.x Endpoint 203b XTX Markets Technologies Ltd. +2044 Shenzhen Jiahua Zhongli Technology Co., LTD. + 8200 CeaCent CS211X 12G SAS RAID controller + 2044 2110 CeaCent CS2110-8i + 2044 2111 CeaCent CS2110-16i + 8201 CeaCent CS215X 12G SAS RAID controller + 2044 2150 CeaCent CS2150-8i + 2044 2151 CeaCent CS2150-16i 2046 GXMICRO Technology (Shanghai) Co., Ltd. 2048 Beijing SpaceControl Technology Co.Ltd +2052 Frontgrade Gaisler AB 2058 Lime Microsystems Ltd. 205c Zhejiang VMing Semiconductor Co., Ltd. 1514 EP9410 U.2 1.92TB NVME SSD @@ -29372,6 +29482,21 @@ 1535 EP9430 U.2 3.2TB NVME SSD 1536 EP9430 U.2 6.4TB NVME SSD 205d Shanghai Zijing Xinjie Intelligent Technology Co., Ltd. +205e SDTECH + 0000 SD85xxx PCIe Gen5 Switch + 205e 0048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 205e 0096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 205e 0104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port + 205e 2004 SD85000 PCIe NT Endpoint + 205e 2005 SD85000 PCIe gDMA Endpoint + 205e 2006 SD85000 PCIe Management Endpoint + 5048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 5096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 5104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port 2061 Unis Flash Memory 4000 E4000 controller 4100 E4100 controller @@ -29402,6 +29527,19 @@ 2061 2061 E520Q NVMe SSD 30.72TB PCIe 5.0 U.2 2061 2062 E520Q NVMe SSD 61.44TB PCIe 5.0 U.2 2061 2063 E520Q NVMe SSD 122.88TB PCIe 5.0 U.2 + 5300 E5300 NVMe Controller + 2061 2041 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2042 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2043 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2044 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2045 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 2046 E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 + 2061 2085 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2086 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2087 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2088 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2089 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 208a E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 2063 Hubei Yangtze Mason Semiconductor Technology Co., Ltd. 0bb8 MC3000 0bb9 RC3000 @@ -29444,16 +29582,18 @@ 208a MICIUS Laboratory 2094 Shenzhen Wodposit Electronics Co., Ltd. 1281 WPBSNM8-256GTP - 1282 WPBSNM8-512GTP NVMe SSD (DRAM-less) + 1282 WPBSNM8-512GTP 1283 WPBSNM8-1TTP 1284 WPBSNM8-256GMP - 1285 WPBSNM8-512GMP - 1286 WPBSNM8-2TMP - 1287 WPBSNM8-1TMP - 1661 WPBSN4M8-512GMP - 1662 WPBSN4M8-1TMP - 1663 WPBSN4M8-2TMP - 1664 WPBSN4M8-1TGP NVMe SSD (DRAM-less) + 1285 WPBSN4M8-512GMP + 1286 WPBSN4M8-1TMP + 1287 WPBSN4M8-2TMP + 1661 WPBSNM8-512GMP + 1662 WPBSNM8-1TMP + 1663 WPBSNM8-2TMP + 1664 WPBSN4M8-1TGP + 1665 WPBSN4M8-2TGP + 1666 WPBSN4M8-4TGP 2096 Kaitian Information Technology Co., Ltd. 5401 KCP54(01) 2280 PCIe G4 x4 TLCKCP54(01) 2280 PCIe G4 x4 TLC 5402 KCP54(02) 2280 PCIe G4 x4 TLC @@ -29513,6 +29653,12 @@ 20e3 Elix Systems SA 20e7 TOPSSD 20f4 TRENDnet +20f6 Shenzhen Zhishi Network Technology Co., Ltd. + 0001 MPU H1 +20f9 Shenzhen Silicon Dynamic Networks Co., Ltd. +2106 ZCHL Technology Co., Ltd + 0001 HL100 Accelerator Controller + 2106 0001 HLC100 Accelerator Card 2116 ZyDAS Technology Corp. 21b4 Hunan Goke Microelectronics Co., Ltd 21c3 21st Century Computer Corp. @@ -29755,10 +29901,10 @@ 7173 CH355 PCI Quad Serial Port Controller 434e Cornelis Networks 0001 CN5000 HFI Silicon, Dual Port, BGA [discrete] - 434e 0001 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled - 434e 0002 CN5000 HFI Adapter, Dual Port, QSFP-DD, x16 PCIe Gen 5, Air-Cooled - 434e 0003 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled, Thermally Enhanced - 434e 0004 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Conduction-Cooled + 434e 0001 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5 + 434e 0002 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5 + 434e 0003 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5, II + 434e 0004 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5, II 0002 CN6000 HFI Silicon, Dual Port, BGA [discrete] 8001 CN5000 Switch Silicon, 48 Port, BGA 4444 Internext Compression Inc @@ -31172,6 +31318,8 @@ 0dc5 Ethernet Connection (23) I219-LM 1028 0c06 Precision 3580 0dc6 Ethernet Connection (23) I219-V + 0dc7 Ethernet Connection I219-LM + 0dc8 Ethernet Connection I219-V 0dcd Ethernet Connection C825-X 0dd2 Ethernet Network Adapter I710 1137 0000 I710T4LG 4x1 GbE RJ45 PCIe NIC @@ -32138,11 +32286,13 @@ 8086 0002 Ethernet Network Adapter E835-C-Q2 for OCP 3.0 8086 0003 Ethernet Network Adapter E835-CC-Q1 8086 0004 Ethernet Network Adapter E835-CC-Q1 for OCP 3.0 + 8086 0005 Ethernet Network Adapter E835-C-Q2 124a Ethernet Controller E835-CC for SFP 8086 0001 Ethernet Network Adapter E835-XXV-2 for OCP 3.0 8086 0002 Ethernet Network Adapter E835-XXV-4 8086 0003 Ethernet Network Adapter E835-XXV-2 8086 0004 Ethernet Network Adapter E835-XXV-4 for OCP 3.0 + 8086 0008 Ethernet Network Adapter E835-XXV-2 124b 82380FB (MPCI2) Mobile Docking Controller 124c Ethernet Connection E823-L for backplane 124d Ethernet Connection E823-L for SFP @@ -32856,7 +33006,7 @@ 1603 Broadwell-U Processor Thermal Subsystem 1604 Broadwell-U Host Bridge -OPI 1605 Broadwell-U PCI Express x8 Controller - 1606 HD Graphics + 1606 Broadwell-U GT1 [HD Graphics] 1607 Broadwell-U CHAPS Device 1608 Broadwell-U Host Bridge -OPI 1609 Broadwell-U x4 PCIe @@ -32867,19 +33017,19 @@ 160e Broadwell-U Integrated Graphics 160f Broadwell-U SoftSKU 1610 Broadwell-U Host Bridge - DMI - 1612 HD Graphics 5600 + 1612 Broadwell-H GT2 [HD Graphics 5600] 1614 Broadwell-U Host Bridge - DMI - 1616 HD Graphics 5500 + 1616 Broadwell-U GT2 [HD Graphics 5500] 103c 2216 ZBook 15u G2 Mobile Workstation 1618 Broadwell-U Host Bridge - DMI 161a Broadwell-U Integrated Graphics 161b Broadwell-U Integrated Graphics 161d Broadwell-U Integrated Graphics - 161e HD Graphics 5300 - 1622 Iris Pro Graphics 6200 - 1626 HD Graphics 6000 - 162a Iris Pro Graphics P6300 - 162b Iris Graphics 6100 + 161e Broadwell-Y GT2 [HD Graphics 5300] + 1622 Broadwell-DT/H GT3 [Iris Pro Graphics 6200] + 1626 Broadwell-U GT3 [HD Graphics 6000] + 162a Broadwell-DT GT3 [Iris Pro Graphics P6300] + 162b Broadwell-U GT3 [Iris Graphics 6100] 162d Broadwell-U Integrated Graphics 162e Broadwell-U Integrated Graphics 1632 Broadwell-U Integrated Graphics @@ -32920,7 +33070,7 @@ 18f3 Atom Processor P5xxx Series SATA Controller 1900 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1901 6th-10th Gen Core Processor PCIe Controller (x16) - 1902 HD Graphics 510 + 1902 Skylake-S GT1 [HD Graphics 510] 1903 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem 1028 06d6 Latitude 7275 tablet 1028 06dc Latitude E7470 @@ -32936,7 +33086,7 @@ 17aa 2247 ThinkPad T570 17aa 382a B51-80 Laptop 1905 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x8) - 1906 HD Graphics 510 + 1906 Skylake-U GT1 [HD Graphics 510] 17aa 382a B51-80 Laptop 1908 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1909 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4) @@ -32956,8 +33106,8 @@ 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 17aa 225d ThinkPad T480 - 1912 HD Graphics 530 - 1916 Skylake GT2 [HD Graphics 520] + 1912 Skylake-S GT2 [HD Graphics 530] + 1916 Skylake-U GT2 [HD Graphics 520] 1028 06dc Latitude E7470 1028 06f3 Latitude 3570 103c 8079 EliteBook 840 G3 @@ -32966,24 +33116,24 @@ 1919 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Imaging Unit 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 - 191b HD Graphics 530 + 191b Skylake-H GT2 [HD Graphics 530] 1028 06e4 XPS 15 9550 103c 825b OMEN-17-w001nv - 191d HD Graphics P530 - 191e HD Graphics 515 + 191d Skylake-DT/H GT2 [HD Graphics P530] + 191e Skylake-Y GT2 [HD Graphics 515] 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 191f Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1921 HD Graphics 520 1923 HD Graphics 535 - 1926 Iris Graphics 540 - 1927 Iris Graphics 550 + 1926 Skylake-U GT3 [Iris Graphics 540] + 1927 Skylake-U GT3 [Iris Graphics 550] 192b Iris Graphics 555 - 192d Iris Graphics P555 + 192d Skylake-H GT3 [Iris Graphics P555] 1932 Iris Pro Graphics 580 - 193a Iris Pro Graphics P580 - 193b Iris Pro Graphics 580 - 193d Iris Pro Graphics P580 + 193a Skylake-H GT4 [Iris Pro Graphics P580] + 193b Skylake-H GT4 [Iris Pro Graphics 580] + 193d Skylake-H GT4 [Iris Pro Graphics P580] 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller @@ -36467,6 +36617,7 @@ 2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers 15d9 0821 X10DRW-i 3101 Killer E3100X 2.5 Gigabit Ethernet Controller + 3102 Ethernet Controller I226-K 3140 Easel/Monette Hill Image Processor [Pixel Visual Core] 3165 Wireless 3165 8086 4010 Dual Band Wireless AC 3165 [Stone Peak 1x1] @@ -37831,6 +37982,7 @@ 103c 87b9 Thunderbolt Dock G4 PCIe NIC 17aa 2303 ThinkPad Universal Thunderbolt 4 Dock PCIe NIC 1ab6 0225 TS4 On-Board 2.5GbE Ethernet Adaptor + 5503 Ethernet Controller I226-LMvP 550a Ethernet Connection (18) I219-LM 550b Ethernet Connection (18) I219-LM 550c Ethernet Connection (19) I219-LM @@ -37854,7 +38006,11 @@ 56a3 DG2 [Arc Xe Graphics] 56a4 DG2 [Arc Xe Graphics] 56a5 DG2 [Arc A380] + 172f 3941 A380 ELF + 172f 3943 A380 ELF + 172f 4017 A380 Pioneer 56a6 DG2 [Arc A310] + 172f 4019 A380 ECO 56a7 DG2 [Arc Xe Graphics] 56a8 DG2 [Arc Xe Graphics] 56a9 DG2 [Arc Xe Graphics] @@ -37915,13 +38071,13 @@ 1af4 1100 QEMU Virtual Machine 5900 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5901 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x16) - 5902 HD Graphics 610 + 5902 Kaby Lake-S GT1 [HD Graphics 610] 5904 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 1025 115f Aspire E5-575G 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 5905 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8) - 5906 HD Graphics 610 + 5906 Kaby Lake-U GT1 [HD Graphics 610] 5909 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4) 590b HD Graphics 610 590c Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers @@ -37932,31 +38088,31 @@ 1462 7a72 H270 PC MATE 5910 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5911 Xeon E3-1200 v6/7th Gen Core Processor Gaussian Mixture Model - 5912 HD Graphics 630 + 5912 Kaby Lake-S GT2 [HD Graphics 630] 1043 8694 H110I-PLUS Motherboard 1462 7994 H110M ECO/GAMING 1462 7a72 H270 PC MATE 5914 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 17aa 225d ThinkPad T480 - 5916 HD Graphics 620 + 5916 Kaby Lake-U GT2 [HD Graphics 620] 1025 1094 Aspire E5-575G 17aa 2248 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen - 5917 UHD Graphics 620 + 5917 Kaby Lake-R GT2 [UHD Graphics 620] 17aa 225d ThinkPad T480 (20L5) 17aa 225e ThinkPad T480 5918 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers - 591b HD Graphics 630 + 591b Kaby Lake-H GT2 [HD Graphics 630] 591c UHD Graphics 615 - 591d HD Graphics P630 - 591e HD Graphics 615 + 591d Kaby Lake-DT GT2 [HD Graphics P630] + 591e Kaby Lake-Y GT2 [HD Graphics 615] 591f Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5921 HD Graphics 620 5923 HD Graphics 635 - 5926 Iris Plus Graphics 640 - 5927 Iris Plus Graphics 650 + 5926 Kaby Lake-U GT3 [Iris Plus Graphics 640] + 5927 Kaby Lake-U GT3 [Iris Plus Graphics 650] 5a84 Apollo Lake [HD Graphics 505] - 5a85 HD Graphics 500 + 5a85 Apollo Lake GT1 [HD Graphics 500] 5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit 5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster 5a9a Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine @@ -38019,6 +38175,19 @@ 65fa 5100 Chipset PCI Express x16 Port 4-7 65ff 5100 Chipset DMA Engine 674c CRI + 6e23 Nova Lake PCH-S SMbus Controller + 6e24 Nova Lake PCH-S SPI Controller + 6e28 Nova Lake PCH-S Serial IO UART Controller #0 + 6e29 Nova Lake PCH-S Serial IO UART Controller #1 + 6e2a Nova Lake PCH-S Serial IO SPI Controller #0 + 6e2b Nova Lake PCH-S Serial IO SPI Controller #1 + 6e4c Nova Lake PCH-S Serial IO I2C Controller #0 + 6e4d Nova Lake PCH-S Serial IO I2C Controller #1 + 6e4e Nova Lake PCH-S Serial IO I2C Controller #2 + 6e4f Nova Lake PCH-S Serial IO I2C Controller #3 + 6e5e Nova Lake PCH-S Serial IO SPI Controller #2 + 6e7a Nova Lake PCH-S Serial IO I2C Controller #4 + 6e7b Nova Lake PCH-S Serial IO I2C Controller #5 6f00 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2 *** 204 LINES SKIPPED *** From nobody Thu Feb 19 09:12: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 4fGnhs2YDBz6SccM for ; Thu, 19 Feb 2026 09:12: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 4fGnhs0MG7z41TK for ; Thu, 19 Feb 2026 09:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQcjqHBsh3qJ6FAqopDs6IieTPAwPuk7uH8R/fCSBcw=; b=bJzDAH1VZL/rQUmvFB7Z1pk/hKGGadb75zLSHS7FakQHRyOTJJ/UiMj5qn2z6V9yIHoYbA j2IiBuCzQNbjgA52WXtrxxOTXEtQihw/rP45dglGa8Tgf3tPA03euJzkDnM5xj41Zxp2gB 6CQ3pSpHqQRP8VRT/PjWuB/jkhkYNMg3mzbY1DCgXrzQkRDdDBtIjDKzKxiE2cWj/0O3On KFpV9FtGu/J8T3hEty4YVcTrEM4J1gzZz5B7Uxfmy5l3fmkoNf+A8oi8nNeOISRXUrk2Wb nEnsSLzewF8obr27zxYZQitzjZ1zx3KRfQeP3fThXVSlyoaIExf93k70BOrOew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492365; a=rsa-sha256; cv=none; b=L2nDGiRmrm99N9RobOmb+cdsvg8iClNVUX8eOr10ZFHDeEhRF5lLpicf3C9vciI5l0wtvF +Ou/9iRDKuOJn+ptAAdg4fYjAJJMWaYCJZ3di+IXdyqF43rmRBviLFLngjhrnMo4FUJu/z lGsDQF+ezBq0APm57kNvJ1Qrz3UhiOFMWYFgWO7f4oLy+ne/0IE0O8RbZrb0HdX0D9irHX 09PUgve686w5NFLhr9nYcTkWVu/4o73MebVUTnR0v1OaGJc9rLow3DHRfYNL5OhVKMp5Yt bGUh+Wovoe6D+fID9T2t8+XddbSFnoeMozIHWJqByaNx2ue6H6a4B9AJMQrcfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQcjqHBsh3qJ6FAqopDs6IieTPAwPuk7uH8R/fCSBcw=; b=ioHQr8Nx1dUyS32CW3A8BIrpVa5YDGjfDPmCMOT2Sj6UV47w7X8gXDOBhBNpcMr2AeQYyF 0iREIPaEd9r24s/6wGMvyIaOoFp1wD+pdPpwWfaTuAuOk3Okw7+H8oWvDXIyTQWDIYNyUC nlJ6yFQBp51KOC1oK3ODOCVpyAorJwxYx22lHZgfn8Lq7YdituKz8yBaEZKnKERsfmZAXa S48zwNCEdUfNoN91h31IaRvY1IPJ6KSRTU1antdzDHzM6dU1Z6KhGZwNdXRawFh5JLp5tF Rk5bITPtqIJqNeEezq1GzMiKwEMT00CF7EhXdtC1JCs2/9N8l0waMtX1Qa6kIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnhr71XmzcR4 for ; Thu, 19 Feb 2026 09:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a3df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:12:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 9b2cba4a8a69 - stable/15 - usb_vendors: update to 2025.12.13 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 9b2cba4a8a690bc6d4ac174cc2f2daddbc43a84d Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:12:44 +0000 Message-Id: <6996d40c.1a3df.42a341a7@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9b2cba4a8a690bc6d4ac174cc2f2daddbc43a84d commit 9b2cba4a8a690bc6d4ac174cc2f2daddbc43a84d Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:38:37 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:12:34 +0000 usb_vendors: update to 2025.12.13 (cherry picked from commit 8d4c1043bb0630710cbea9f744cdaef499c0ed79) --- share/misc/usb_vendors | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index fa798e65ed9a..5832b6f9f660 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.09.15 -# Date: 2025-09-15 20:34:02 +# Version: 2025.12.13 +# Date: 2025-12-13 20:34:01 # # Vendors, devices and interfaces. Please keep sorted. @@ -24056,6 +24056,7 @@ C 08 Mass Storage 00 Control/Bulk/Interrupt 01 Control/Bulk 50 Bulk-Only + 62 USB Attached SCSI C 09 Hub 00 Unused 00 Full speed (or root) hub From nobody Thu Feb 19 09:13: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 4fGnjg1rjDz6ScGd for ; Thu, 19 Feb 2026 09:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGnjf6ymLz42GP for ; Thu, 19 Feb 2026 09:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slsgnL1u8hR90Aq9+nbpUOPyL9fdQC3CPyrDvMRg0zM=; b=RHoQB8s5D1i9nVcE4ELbbmAelHB30ObE7pfToWWYaHL9Rs4BetD7Mybq+fux1gynhRb9Vs 2jy23RwfhkJ3+cGYGBCtwXPyxQNS4ajn5fv4JZMqF8N5sgork0zbuaUIcvqTEpkCIeWRj0 F72T1xXaOneX9J+5DMpo2+xsMr6axEnk658zTQ8WkFwRizZ+SuhULqmryO4f8in+N8oi/j xX6CDB8PF+9zigBS71JbOUa85vCpqvZ+stnjwSlqSAKbI3TKiAxzAkIMUZp8bAqrfdd/FC RkUruFLo4X1ZFEoaJ0Jt1p5ahYK5h8J5wNRWwaO8rHVYQ2oi4fKIbccW7POaNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492407; a=rsa-sha256; cv=none; b=F+xGGYPw4h+hEJywXlBI63LMQguIaSg+PIl8pwyYHPXOGwnO3G8bHCKB1LYejQWYVu/lOv LNdomOzxEibAxirrIVqdpjhGYBubbhID8eVN3RYFVT1HokOcqdxWNuN4tQH4iqNOnSskd9 nUhw6DcPHcdrt8RQrnG0SHKFWCpA3hz0lf2PU4IAgZiQjx6/4bfLkBWKzyrInnobstmt2/ rAaFxW3fODw8Pps/9jAK+z88RCT6EtKhHPw1An/SzvRK/ifBrUWZHUlObNVnH3uimQZxS5 2xy5gP2ltLTNkiw2FTUAMZSbbIZDxFYh4qb7O+/gqXg+tFPYHVTrGph7iZzjDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slsgnL1u8hR90Aq9+nbpUOPyL9fdQC3CPyrDvMRg0zM=; b=fGRQ+G3YK2R8L+KTgd87aIGZoytmgO8AVfzizI8WaqaBWZ1A1ev7iS+v/l9o+QAwiYx7ci 3NNewGd/LR2t++ympdDv3rvmhCvbbb/rXOmVfPRMIkVYig/8da9ApnHK8nv9Lnisl+msU/ nV5MEnAnX1rEgBw/wdHHwCgh3xCaQUc3Y2CF6nLb5RELscFcm9P1uwh3nxd4YEJo3le7yQ LsM9+drVj2AtbkU3KcGQOgTUOHAGecD9eIkfQqZl1E/1/FFN69G4E+0rRMO6MF1SvF/HMO RljUhtxApEocxjstNDK0hu7l4w9CYaZmu6vDlWsE9/8e48YapE/XjozVVwGTMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnjf6KY3zcR5 for ; Thu, 19 Feb 2026 09:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:13:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8cb78e4865a9 - stable/15 - libusb: make libusb_hotplug_get_user_data actually return user_data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 8cb78e4865a949262e9634a4ce65385053bf60fb Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:13:26 +0000 Message-Id: <6996d436.1c5e4.4a1baef7@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8cb78e4865a949262e9634a4ce65385053bf60fb commit 8cb78e4865a949262e9634a4ce65385053bf60fb Author: Baptiste Daroussin AuthorDate: 2026-02-15 19:39:18 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:13:19 +0000 libusb: make libusb_hotplug_get_user_data actually return user_data MFC After: 2 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55291 (cherry picked from commit be522176951d8b542de9354f4ec9ac7603745b71) --- lib/libusb/libusb10_hotplug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index 9c46d4926bfa..359c818b5720 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -430,5 +430,7 @@ libusb_hotplug_get_user_data(struct libusb_context *ctx, } HOTPLUG_UNLOCK(ctx); - return (handle); + if (handle != NULL) + return (handle->user_data); + return (NULL); } From nobody Thu Feb 19 09:13: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 4fGnjf0Zl9z6Sc9V for ; Thu, 19 Feb 2026 09:13: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 4fGnjd60Rkz42MF for ; Thu, 19 Feb 2026 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oLfdbySe30IJiOr0sQO971n0BMBbn4SQqIgMkOg5skE=; b=UcUN+uMb3sAE8Ll6awGt0YiTy32Y4+YpPuDx5R+kmaYA89838X8LuxMA1MvkTZMLSK95cE NfPemKWxGCaVJqC5iiQq4LpFi/R4t9YfqrFD1yzccDfqftdBjOvonuhbGi5Wo1Xt8gE0BM 2t3pskrR3+eaMlzz7hRVh4QdEwwOb4yUuT63LXQ2sfSY6FscmYO5u+KqTcHwTuC7evEr6O pxLXFi3wsSddfFcWYzyEJW8ym/ukASz7M3a+rgiQVQALVqgW0m8MO2TEZIfKUg6krzOaTg LWEQXMEvvozI4xdaINlpoo1I+k2wdUTwpLOG6NbkasZ3GZeGDrekVksEfLvUEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492405; a=rsa-sha256; cv=none; b=FckoggL6jUUx1WGtkLWU5q3DZjEBHvyZLZ16rYGpDA1tmwB+r9L3nrVJdlQK3HeaKiBhNl mkDJNupT50NWP6yXmGuQ4Ol8UAsog5zGvua3BmyW8JdumykozeUPd8FxZhqSQ1DvfW5E/8 DJmOt1sLQP/SSf58eldITaDqhq/kmvz1MRHleW4v9BhfYMHPIRj0fV5DbBSV4hak0ZWf9f mwYfEX/3Bjfd2wikuLbOn5sAueakXmxZBS23Ej7e1+CSRwGZBJqQoknrmUxicuf+RkTWiL eFcB2HroCBIPZ+oebvetLBjEk4u7ByVhgqrvUvnfHN+p3dxM/2+4tCvqlZSFKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oLfdbySe30IJiOr0sQO971n0BMBbn4SQqIgMkOg5skE=; b=ThOhr/5hNUrfw4Bxf8sj1IfxTRsguRQnchho5kCr5gulAvUtaWrPycTJcX1htYyEwYExea +g7PoXzrsz4l93DyzWaFs7VsdxLXPvR8JmK9HJXm+VwGcPQ8qoe9pbJIAZOVu9GEO5v3He RojISpuVmfLNyQ0kFa7JASajQNi1HIWuR4NfWcxf6uQT9M4xJrNqcmuVdXlxgpEd4xyovp dZJCv59pfbSTHQDGOwCyhZSs9qYamKzR26+5qU4sHyt7cI7wY93GbY32/6tuXh7Wu0fyNu CSxOOTJRFuPPHWYRUgJpVL0aTN15tQvhVQa3I7hJioMPswv/962Gabo5gJLyDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnjd5b2vzby8 for ; Thu, 19 Feb 2026 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:13:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a51ec1cc5a82 - stable/15 - tr: fix class handling in unicode world List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: a51ec1cc5a82d770a37f3c5cfef9ee48cc7eab47 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:13:25 +0000 Message-Id: <6996d435.1de4c.db819b5@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a51ec1cc5a82d770a37f3c5cfef9ee48cc7eab47 commit a51ec1cc5a82d770a37f3c5cfef9ee48cc7eab47 Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:13:19 +0000 tr: fix class handling in unicode world toupper/tolower logic was only handled for CCLASS_TOUPPER and CCLASS_TOLOWER, add support for CCLASS ([:alpha:]) PR: 219900 MFC After: 1 week (cherry picked from commit 625dc44832cd760be3d7242d8e21a530c7e32bfc) --- usr.bin/tr/tr.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index d31a51a73542..75b7cd8be7c0 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -242,6 +242,40 @@ main(int argc, char **argv) break; } while (s2.state == CCLASS_LOWER && s2.cnt > 1); goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_UPPER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towupper(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswupper(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip upper set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_UPPER && s2.cnt > 1); + goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_LOWER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towlower(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswlower(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip lower set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_LOWER && s2.cnt > 1); + goto again; } else { cmap_add(map, s1.lastch, s2.lastch); if (sflag) From nobody Thu Feb 19 09:14: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 4fGnlH35cyz6Sccv for ; Thu, 19 Feb 2026 09:14: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 4fGnlH0llRz42y1 for ; Thu, 19 Feb 2026 09:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ny2Y7S5/PivN9XQLbbzN5Aq0MGPEvG/Wk81wJGBVflo=; b=QCuJp3GcxE7s03cwvmUCgEi4rCf6dcUm/9p9USExrA0PjPsAn54gSMxKxJnMKnz7lVDA7m amELcpRuqLVAC+rtvcCLUO6+8gT2tBXfIqjPVyvNcg7unKi8mVYhjh7FxwL5uQXE2RAwqc GsDrM1IU5mdvOuSxfLf8QeDYuHBYCkUOT6UHcJ5cMoYUSLuSqmQaowQI+Th1qe5t5P6jqL 3V+3AlEnF0vacOM5DalfTe53nBuWgT9knt7jC7aurUgoTiCvNPQAVFdIZtCO8oAV44XhI1 o8Z4NbMiETZoH/3zN2x0GXr+xeXy7Q5/X6S7lJpgO5k+FwpgNIVDngUTu8sEMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492491; a=rsa-sha256; cv=none; b=bwcLB2XcI8pceqKshz0/+gvVg3JFJ6gYXCWFR165iu5Q2h/cD6m44nNq3zauIIyMohxA8C Iyo29trbbWS1EN3SagrX2s3MeATCZJWXu5P4SvHQTN69lFa3exdtfCUhWknfHP9pDyJNht ZB+QvdYYRFto3yE9jCfX2hITo/2Ibdhz4E1OSAFYjkDJutUPoKkWdsPt1j8RZVTPbMBY4m dWJPozDji6tQzA3l4EiPn3TJD0ZY7qhDG7AqtBcCWbAEC3vq0AZfT78HJ9ITnYucyScCl9 xggTRZYDo/4K1JwtJU+reYTiX3pL6VUVkNRP8zikozTDOnfoX2zFZVd9ky4/og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ny2Y7S5/PivN9XQLbbzN5Aq0MGPEvG/Wk81wJGBVflo=; b=reyrdqu3wxfrnrVdVLilJ7ll9UwqiNTib8i8orARTKQSUdWfpF+3O5BkVKq3l+H1OU14lT kpAvhmrYX4CivbwwyxZI9Nhzjo6Jlc3/0g18biEQlwq61j13vC6SulaDsaVjndht9I9p2F UAzZQu3w1Dkc/QmE40en3cl2mH8AoWzcyXmjb7VqmtPs13K9OgsL/sp1d2dzePj3wBI+I2 c5ELg4UG25kc0nRQmfSq2YwsWmeY5zbg/Qr3O4i5tOgMsOclzqeNVKNlE2WSOw2ZbxWxMQ eCxBzSYYFqMxbty9W0d9kwFOuhZJKY3/mL/1o7qbMvCms0JeSod1QWv9CMVs+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 4fGnlH07NHzcTT for ; Thu, 19 Feb 2026 09:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:14:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: b28b6c6d33ac - stable/14 - pci_vendors: update to 2026-02-10 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: b28b6c6d33ac7a015c55184b162e060cedeed4f6 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:14:50 +0000 Message-Id: <6996d48a.1d7e1.356f377b@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b28b6c6d33ac7a015c55184b162e060cedeed4f6 commit b28b6c6d33ac7a015c55184b162e060cedeed4f6 Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:33:11 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:14:41 +0000 pci_vendors: update to 2026-02-10 (cherry picked from commit 1acfc913e6b936dec3effc7d1e902a50e5432406) --- share/misc/pci_vendors | 466 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 358 insertions(+), 108 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index bcb3d2f9e030..12ba7ca86ea5 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # -# List of PCI ID's +# List of PCI IDs # -# Version: 2025.12.12 -# Date: 2025-12-12 03:15:02 +# Version: 2026.02.10 +# Date: 2026-02-10 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -268,15 +268,7 @@ 0e11 409c Smart Array 6400 0e11 409d Smart Array 6400 EM 005a Remote Insight II board - Lights-Out - 007c NC7770 1000BaseTX - 007d NC6770 1000BaseTX - 0085 NC7780 1000BaseTX 00b1 Remote Insight II board - PCI device - 00bb NC7760 - 00ca NC7771 - 00cf NC7772 - 00d1 NC7783 - 00e3 NC7761 0508 Netelligent 4/16 Token Ring 1000 Triflex/Pentium Bridge, Model 1000 2000 Triflex/Pentium Bridge, Model 2000 @@ -324,7 +316,6 @@ b012 Netelligent 10 T/2 PCI UTP/Coax b030 Netelligent 10/100 TX UTP b060 Smart Array 5300 Controller - b0e1 NC3133 Fast Ethernet Module b178 Smart Array 5i/532 0e11 4080 Smart Array 5i 0e11 4082 Smart Array 532 @@ -839,6 +830,7 @@ 15d9 1d08 AOC-S4016L-L16IR Storage Adapter 17aa 7855 ThinkSystem RAID 950W-16i 8GB Flash PCIe Gen4 24Gb Adapter 1d49 020a ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA + 1d49 020c ThinkSystem 450W-16e PCIe Gen4 HBA 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) # 8 Internal and 8 External port channel 9400 HBA 1000 3040 HBA 9400-8i8e @@ -4027,6 +4019,7 @@ 1002 0b36 Reference RX 5700 XT 1458 2313 Radeon RX 5700 XT Gaming OC 1458 231d Radeon RX 5600 XT/REV 2.0 [Windforce 6GB OC] + 1462 381e RX 5600 XT MECH OC 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 1682 5701 RX 5700 XT RAW II 1849 5102 RX5700 CLD 8GO [ASRock Challenger D RX 5700 OC] @@ -4034,8 +4027,9 @@ 1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 1da2 e410 Sapphire NITRO+ RX 5700 XT 1da2 e411 Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] - 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M] + 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5300/5500M] 106b 0210 Radeon Pro 5300M + 106b 0219 iMac (Retina 5K, 27-inch, 2020) [Radeon Pro 5300] 7341 Navi 14 [Radeon Pro W5500] 7347 Navi 14 [Radeon Pro W5500M] 734f Navi 14 [Radeon Pro W5300M] @@ -4130,6 +4124,7 @@ 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] + 1462 7e26 Radeon RX 7800 XT [Nitro+] 148c 2427 RX 7800 XT [Hellhound / Red Devil] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC @@ -4153,6 +4148,7 @@ 1da2 e490 Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT] 7551 Navi 48 [Radeon AI PRO R9700] 7590 Navi 44 [Radeon RX 9060 XT] + 1458 2429 GV-R9060XTGAMING OC-16GD [Radeon RX 9060 XT GAMING OC 16G] 1eae 8601 RX-96TS316W7 [SWIFT RX 9060 XT OC White Triple Fan Gaming Edition 16GB] 75a0 Aqua Vanjaram [Instinct MI350X] 75a3 Aqua Vanjaram [Instinct MI355X] @@ -9547,7 +9543,7 @@ e1c5 0005 TA1-PCI e1c5 0006 TA1-PCI4 9036 9036 - 9050 PCI <-> IOBus Bridge + 9050 PCI9050 32-bit 33MHz PCI <-> IOBus Bridge 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended @@ -9583,6 +9579,8 @@ 15ed 1001 Macrolink MCCS 16-port Serial 15ed 1002 Macrolink MCCS 8-port Serial Hot Swap 15ed 1003 Macrolink MCCS 16-port Serial Hot Swap + 1761 018e 40-199-002 + 1761 025d 40-662-001 5654 2036 OpenSwitch 6 Telephony card 5654 3132 OpenSwitch 12 Telephony card 5654 5634 OpenLine4 Telephony Card @@ -10359,7 +10357,7 @@ 0068 nForce2 USB Controller 1043 0c11 A7N8X Mainboard a0a0 03b4 UK79G-1394 motherboard - 006a nForce2 AC97 Audio Controler (MCP) + 006a nForce2 AC97 Audio Controller (MCP) 1043 8095 nForce2 AC97 Audio Controller (MCP) a0a0 0304 UK79G-1394 motherboard 006b nForce Audio Processing Unit @@ -10962,6 +10960,7 @@ 1043 02fb V9250 Magic 1043 8180 V9520-X/TD/128M 107d 2967 WinFast A340T 128MB + 1462 9073 MS-8907 (FX5200-TDR128) 1462 9110 MS-8911 (FX5200-TD128) 1462 9171 MS-8917 (FX5200-T128) 1462 9360 MS-8936 (FX5200-T128) @@ -14006,6 +14005,7 @@ 1385 4700 MA521 802.11b Wireless PC Card 1737 0019 WPC11v4 802.11b Wireless-B Notebook Adapter 8185 RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller + 187e 8225 ZyAIR G-302 v3 818b RTL8192EE PCIe Wireless Network Adapter 8190 RTL8190 802.11n PCI Wireless Network Adapter 8191 RTL8192CE PCIe Wireless Network Adapter @@ -16955,7 +16955,8 @@ 11c9 Magma 0010 16-line serial port w/- DMA 0011 4-line serial port w/- DMA -11ca LSI Systems, Inc +11ca IBEX Technology Co., Ltd. + 0039 PAC with Altera Agilex 7 FPGA M-Series [IPAC-1000] 11cb Specialix Research Ltd. 2000 PCI_9050 11cb 0200 SX @@ -18686,6 +18687,7 @@ 1028 23a6 MTFDLBQ30T7THL-1BK1JABDA 1028 23a7 MTFDLAL61T4THL-1BK1JABDA 1028 23a8 MTFDLAL30T7THL-1BK1JABDA + 51cd 9650 PRO NVMe SSD 5404 2210 NVMe SSD [Cobain] 5405 2300 NVMe SSD [Santana] 5407 3400 NVMe SSD [Hendrix] @@ -20743,10 +20745,6 @@ f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. [MSI] 3483 MSI USB 3.0 (VIA VL80x-based xHCI USB Controller) -# This is MSI refreshed variant of their MECH series Navi 23 GPU card (73EF) - 5027 RX 6650XT MECH 2X - 7c56 Realtek Ethernet controller RTL8111H - aaf0 Radeon RX 580 Gaming X 8G 1463 Fast Corporation 1464 Interactive Circuits & Systems Ltd 1465 GN NETTEST Telecom DIV. @@ -20795,8 +20793,6 @@ 148a OPTO 148b INNOMEDIALOGIC Inc. 148c Tul Corporation / PowerColor - 2391 Radeon RX 590 [Red Devil] - 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 148d DIGICOM Systems, Inc. 1003 HCF 56k Data/Fax Modem 148e OSI Plus Corporation @@ -20924,8 +20920,9 @@ 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7663 MT7663 802.11ac PCI Express Wireless Network Adapter 7902 MT7902 802.11ax PCIe Wireless Network Adapter [Filogic 310] - 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter - 7916 MT7905D/MT7975 + 7915 MT7915A/MT7915D normal link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] +# MT7905D/MT7975 contain MT7915. If it works at G1 speed this extra device appears for extra bandwidth + 7916 MT7915A/MT7915D hif link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 1a3b 5300 ASUS PCE-AXE59BT @@ -20933,8 +20930,10 @@ 7927 MT7927 802.11be 320MHz 2x2 PCIe Wireless Network Adapter [Filogic 380] 7961 MT7921 802.11ax PCIe Wireless Network Adapter [Filogic 330] 7988 MT7988 PCI Express Host Bridge [Filogic 880] - 7990 MT7996 802.11be PCI Express Wireless Network Adapter (Port 0) - 7991 MT7996 802.11be PCI Express Wireless Network Adapter (Port 1) + 7990 MT7996 primary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7991 MT7996 secondary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7992 MT7992 primary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] + 799a MT7992 secondary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] 8650 MT7650 Bluetooth 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -22025,6 +22024,8 @@ 0e11 0042 Yogi # Integrated in CX86111/CX86113 processors 1830 CX861xx Integrated Host Bridge + 1f86 DBH CX11880 Codec + 1f87 SMIC CX11880 Codec 2003 HSF 56k Data/Fax Modem 2004 HSF 56k Data/Fax/Voice Modem 2005 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem @@ -22632,7 +22633,8 @@ 0224 CX9 Family [ConnectX-9 Flash Recovery] 0225 CX9 Family [ConnectX-9 Secure Flash Recovery-RMA] 0226 CX10 Family [ConnectX-10 Flash Recovery] - 0227 CX10 Family [ConnectX-10 Secure Flash Recovery-RMA] +# Name change request + 0227 CX10 Family [ConnectX-10 RMA] 0228 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Flash Recovery] 0229 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Secure Flash Recovery-RMA] 024e MT53100 [Spectrum-2, Flash recovery mode] @@ -22659,11 +22661,11 @@ 0274 Spectrum-6 in Flash Recovery Mode 0275 Spectrum-6 RMA 0277 Spectrum-6 Tile - 0278 Quantum-4 in Flash Recovery Mode - 0279 Quantum-4 RMA + 0278 NVLink-6 Switch in Flash Recovery Mode + 0279 NVLink-6 Switch RMA 027a Eros Chiplet - 027c Nvlink-7 Switch in Flash Recovery Mode - 027d Nvlink-7 Switch RMA + 027c NVLink-7 Switch in Flash Recovery Mode + 027d NVLink-7 Switch RMA 027e Spectrum-7 Tile 0281 NPS-600 Flash Recovery 0282 ArcusE Flash recovery @@ -22687,8 +22689,8 @@ 029a OPHY3.1 # Sagitta 029c OPHY3.5 - 02a0 Nvlink-8 Switch in Flash Recovery Mode - 02a1 Nvlink-8 RMA + 02a0 NVLink-8 Switch in Flash Recovery Mode + 02a1 NVLink-8 Switch RMA 02a2 Spectrum-7 in Flash Recovery Mode 02a3 Spectrum-7 RMA 1002 MT25400 Family [ConnectX-2 Virtual Function] @@ -22757,6 +22759,8 @@ 117c 00b4 FastFrame N322 Dual-port 25Gb Ethernet Adapter 117c 40b7 ThunderLink TLN3-3252 Dual-port 25Gb Ethernet Adapter 117c 40b8 ThunderLink TLN3-3102 Dual-port 10Gb Ethernet Adapter + 1458 0280 CLN4C44 + 1458 0281 CLN4C44 with NCSI 15b3 0001 ConnectX-4 Lx EN network interface card, 25GbE single-port SFP28, PCIe3.0 x8, tall bracket, ROHS R6 15b3 0003 Stand-up ConnectX-4 Lx EN, 25GbE dual-port SFP28, PCIe3.0 x8, MCX4121A-ACAT 15b3 0004 ConnectX-4 Lx Stand-up dual-port 10GbE MCX4121A-XCAT @@ -22809,6 +22813,7 @@ 1024 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch] 1025 CX9 Family [ConnectX-9] 1027 CX10 Family [ConnectX-10] + 1028 CX10 Family [ConnectX-10 Trusted Network Control Memory] 1974 MT28800 Family [ConnectX-5 PCIe Bridge] 1975 MT416842 Family [BlueField SoC PCIe Bridge] 1976 MT28908 Family [ConnectX-6 PCIe Bridge] @@ -22827,6 +22832,8 @@ 2024 MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge] 2025 ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge] 2100 CX8 Family [CX8 Data Direct Interface] +# Chip to Chip Link + 2101 CX10 Family [ConnectX-10 C2C] 4117 MT27712A0-FDCF-AE 1bd4 0039 SN10XMP2P25 1bd4 003a 25G SFP28 SP EO251FM9 Adapter @@ -22920,9 +22927,9 @@ d2f2 Quantum-2 NDR (400Gbps) switch d2f4 Quantum-3 d2f6 Quantum-3CPO - d2f8 Quantum-4 - d2fa Nvlink-7 Switch - d2fc Nvlink-8 Switch + d2f8 NVLink-6 Switch + d2fa NVLink-7 Switch + d2fc NVLink-8 Switch 15b4 CCI/TRIAD 15b5 Cimetrics Inc 15b6 Texas Memory Systems Inc @@ -23296,8 +23303,6 @@ 167e ONNTO Corp. 1681 Hercules 1682 XFX Pine Group Inc. - 5701 Radeon 5700 XT Thicc III Ultra - c580 Radeon RX 580 1688 CastleNet Technology Inc. 1170 WLAN 802.11b card 168a Utimaco IS GmbH @@ -23310,9 +23315,14 @@ # nee Atheros Communications, Inc. 168c Qualcomm Atheros 0007 AR5210 Wireless Network Adapter [AR5000 802.11a] + 1186 3a00 DWL-A650 5GHz Wireless CardBus Adapter + 1186 3a02 DWL-A520 5GHz Wireless PCI Adapter + 1668 0429 802CA Wireless PC Card 1737 0007 WPC54A Wireless PC Card 1b47 0100 Harmony 8450CN Wireless CardBus Module 1b47 0110 Skyline 4030 / Harmony 8450 802.11a Wireless CardBus Adapter + 1b47 0400 PC50E-8-FC/A Wireless Access Point Radio Card + 8086 2500 PRO/Wireless 5000 LAN CardBus Adapter 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5211 Wireless Network Adapter [AR5001A 802.11a] 0012 AR5211 Wireless Network Adapter [AR5001X 802.11ab] @@ -23807,6 +23817,7 @@ 7174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller 172a Accelerated Encryption 13c8 AEP SureWare Runner 1000V3 +172f Sparkle Computer Co., Ltd. # nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions 1228 iRMC-S5 HTI Device @@ -23877,12 +23888,22 @@ 0843 PCA-8439 General-purpose multifunctional PCIe card with 16 analog inputs ff00 CTU CAN FD PCIe Card 1761 Pickering Interfaces Ltd - 4411 50-297A + 4411 Pickering Devices with FPGA Based Bus Communication + 1761 082f 40-737-901 + 1761 086c 40-576-001 + 1761 0881 40-584-001 + 1761 311a 42-738-001 + 1761 3190 41-765-004 + 1761 31ab 41-670-003 1761 331f 50-297A-014 1761 3320 50-297A-050 1761 3321 50-297A-056 + 1761 3366 41-625-004 1761 3368 50-297A-130 1761 3372 50-297A-122 + 1761 33a1 40-419-004 + 1761 33a3 41-770-002 + 1761 3714 42-297A-050 1771 InnoVISION Multimedia Ltd. 1775 General Electric 177d Cavium, Inc. @@ -24503,6 +24524,7 @@ 08b0 MVC200-DC 1846 Alcatel-Lucent 1849 ASRock Incorporation + 1150 ASPEED AST1150 PCI-to-PCI Bridge 9602 RS780/RS880 PCI to PCI bridge (int gfx) 184a Thales Computers 1100 MAX II cPLD @@ -24537,8 +24559,6 @@ a102 VigraWATCH PMC a103 Vigra I/O 187e ZyXEL Communications Corporation - 3403 ZyAir G-110 802.11g - 340e M-302 802.11g XtremeMIMO 1885 Avvida Systems Inc. 1888 Varisys Ltd 0301 VMFX1 FPGA PMC module @@ -25170,6 +25190,8 @@ 1993 Innominate Security Technologies AG 1998 Toyou Feiji Electronics Co., Ltd. 0001 TOBOLT1 51987 NVMe SSD + 1998 0384 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD + 1998 0768 TOBOLT1 51987 7680G 2.5" U.2 NVMe SSD 1998 2012 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD 1999 A-Logics a900 AM-7209 Video Processor @@ -25325,7 +25347,7 @@ 19e5 0125 HBA SP186-M-40i 19e5 0180 HBA SP186-M-16i 19e5 0188 HBA SP186-M-8i - a120 HiSilicon PCIe Root Port with Gen4 + a120 HiSilicon PCIe Root Port a121 HiSilicon PCI-PCI Bridge a122 HiSilicon Embedded DMA Engine a124 HiSilicon Internal SDI Function Engine @@ -25385,7 +25407,7 @@ 15d9 086b X10DRS (AST2400 BMC) 15d9 1b95 H12SSL-i (AST2500 BMC) 15d9 1d50 X14DBG-AP (AST2600 BMC) - 1849 2000 ROME2D32LM3 (AST2500 BMC) + 1849 2000 Onboard Graphics 1a05 deltaww 1a07 Kvaser AB 0006 CAN interface PC104+ HS/HS @@ -26167,7 +26189,9 @@ # Nytro 5060H (Rocinante High Performance) non-SED 1bb1 0181 Nytro 5060H 1bb1 01a1 Nytro XP7102 + 0153 Nytro 5x50 NVMe SSD 0155 Nytro 5x50 NVMe SSD + 2000 PCIe Gen4 SSD 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD @@ -26277,6 +26301,8 @@ 3252 CH382 PCIe Dual Port Serial Adapter # Device ID reused: CH352 is for PCI bus, CH382 for PCIe. 3253 CH352/CH382 PCI/PCIe Dual Port Serial Adapter + 3470 CH384 Serial Adapter, 4-port mode + 3853 CH384 Serial Adapter, 8-port mode 1c09 CSP, Inc. 4254 10G-PCIE3-8D-2S 4255 10G-PCIE3-8D-Q @@ -26633,7 +26659,7 @@ 1602 LEGEND 900 NVMe SSD (DRAM-less) # SX6000LNP 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) - 2708 Premier Extreme microSDXC SD7.1 Express Card (DRAM-less) + 2708 Premier Extreme SDXC SD 7.0 / microSDXC SD 7.1 Express Card (DRAM-less) 32a8 SM2P32A8 NVMe SSD (DRAM-less) 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f4 IM2P33F4 NVMe SSD (DRAM-less) @@ -26695,6 +26721,12 @@ 5201 AM520 PCIe 3.0 NVMe SSD 128GB 5212 AM521 PCIe 3.0 NVMe SSD 256GB 5414 AM541 PCIe 4.0 NVMe SSD 1024GB + 6020 NVMe SSD Controller UM3X1X series + 1cc4 8320 NVMe SSD UM301a M.2 480GB + 1cc4 8321 NVMe SSD UM301a M.2 960GB + 1cc4 8322 NVMe SSD UM301a M.2 1.92TB + 1ea0 8320 NVMe SSD TM1300 M.2 480GB + 1ea0 8322 NVMe SSD TM1300 M.2 1.92TB 6201 AM620 PCIe 3.0 NVMe SSD 128GB 6202 AM620 PCIe 3.0 NVMe SSD 256GB 6203 AM620 PCIe 3.0 NVMe SSD 512GB @@ -26717,6 +26749,15 @@ 6b14 RPJYJ1T24MLR1HWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 6c13 AM6C1 PCIe 4.0 NVMe SSD 6d03 AM6DX PCIe 5.0 NVMe SSD + 7030 NVMe SSD Controller UH7X3X series + 1cc4 7112 NVMe SSD UH733a U.2 1.6TB + 1cc4 7113 NVMe SSD UH733a U.2 3.2TB + 1cc4 7114 NVMe SSD UH733a U.2 6.4TB + 1cc4 7115 NVMe SSD UH733a U.2 12.8TB + 1cc4 7122 NVMe SSD UH713a U.2 1.92TB + 1cc4 7123 NVMe SSD UH713a U.2 3.84TB + 1cc4 7124 NVMe SSD UH713a U.2 7.68TB + 1cc4 7125 NVMe SSD UH713a U.2 15.36TB 8030 NVMe SSD Controller UH8X2X/UH7X2X series 1cc4 1122 NVMe SSD UH812a U.2 1.92TB 1cc4 1123 NVMe SSD UH812a U.2 3.84TB @@ -26764,6 +26805,8 @@ 1ea0 6125 NVMe SSD TP3510 U.2 15.36TB 1ea0 6224 NVMe SSD TP3510 E3.S 7.68TB 1ea0 6225 NVMe SSD TP3510 E3.S 15.36TB + 1ea0 7124 NVMe SSD TP3512 U.2 7.68TB + 1ea0 7125 NVMe SSD TP3512 U.2 15.36TB 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -27243,6 +27286,7 @@ 1466 Data Fabric: Device 18h; Function 6 1467 Data Fabric: Device 18h; Function 7 1468 NTBCCP + 6211 K100_AI 7901 FCH SATA Controller [AHCI mode] 7904 FCH SATA Controller [AHCI mode] 7906 FCH SD Flash Controller @@ -27664,6 +27708,9 @@ 1de5 Eideticom, Inc 1000 IO Memory Controller 2000 NoLoad Hardware Development Kit + 2100 NoLoad Accelerator Platform + 2200 NoLoad Cryptographic Accelerator + 2300 NoLoad Data Services 3000 eBPF-based PCIe Accelerator 1ded Alibaba (China) Co., Ltd. 107f Elastic RDMA Adapter @@ -27798,6 +27845,7 @@ 05c0 PCIe 6 Fabric Switch PF6xxx [Scorpio] 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter +1e0b Shenzhen Decenta Technology Co.,LTD 1e0d SambaNova Systems, Inc 1e0f KIOXIA Corporation 0001 NVMe SSD Controller BG4 (DRAM-less) @@ -28235,6 +28283,7 @@ 50d0 NVME RAID Card DP800 50d1 Flexraid6 NVMeRAID 1e3d Burlywood, Inc +1e3e Shanghai Iluvatar CoreX Semiconductor Co., Ltd. 1e43 MaxLinear Inc 8904 MxL8904 8906 MxL8906 @@ -28278,12 +28327,12 @@ 1602 NVMe SSD Controller MAP1602 (DRAM-less) 1608 NVMe SSD Controller MAP1608 (DRAM-less) 1e4c GSI Technology - 0010 Associative Processing Unit [Gemini-1] + 0010 Gemini-I 1e4c 0010 Leda-E 1e4c 0120 SE120 - 0020 Associative Processing Unit [Gemini-2] - 1e4c 0010 Leda-E2 + 0020 Gemini-II 1e4c 0011 Leda-E2 rev 1.1 + 1e4c 0020 G2-Edge 1e50 IP3 Tech (HK) Limited 1e52 Tenstorrent Inc 401e Wormhole @@ -28464,6 +28513,7 @@ 1ec8 12a2 Fantasy I Device 8900 GR308 8902 GR3 Audio + 8904 GR308 9800 Fantasy II 1ec8 12a2 Fantasy II Device 9802 Fantasy II @@ -28481,6 +28531,7 @@ 1ed2 FuriosaAI, Inc. 0000 Warboy 0001 RNGD + 0002 RNGD-Plus 2222 RNGD-S 1ed3 Yeston 1ed5 Moore Threads Technology Co.,Ltd @@ -28808,10 +28859,26 @@ 1f0f 0001 D1055AS vDPA Ethernet Controller 1042 D1055AS vDPA Storage Controller 1f0f 0001 D1055AS vDPA Storage Controller + 1045 D1205CQ vPDA Ethernet Controller + 1f0f 0001 D1205CQ vPDA Ethernet Controller + 1046 D1205CQ vPDA Storage Controller + 1f0f 0001 D1205CQ vPDA Storage Controller + 1047 D1205CQ RDMA Ethernet Controller + 1f0f 0001 D1205CQ RDMA Ethernet Controller 1220 D1055AS Ethernet Controller 1221 D1055AS Ethernet Controller 1222 D1055AS Ethernet Controller 1223 D1055AS Ethernet Controller + 1224 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1225 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1226 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1227 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1228 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller 1600 M16104 Family 1f0f 0001 N1045XS, Quad-port 10GbE, PCIe 3.0 x8 1601 M16104 Family Virtual Function @@ -28832,6 +28899,7 @@ 1a02 M16102 Family 1f0f 0001 N1025XT, Dual-port 10GbE, PCIe 3.0 x4, Fan 2022 D1055AS PCI Express Switch Upstream Port + 2023 D1205CQ PCI Express Switch Upstream Port 3403 M18110 Family 3404 M18110 Lx Family 3405 M18110 Family BASE-T @@ -28852,9 +28920,13 @@ 3502 M18305 Family 1f0f 0001 S2055AS, 2x 25GbE, SFP28, PCIe 4.0 x8 1f0f 0002 S2025XS, 2x 10GbE, SFP+, PCIe 4.0 x8 + 3504 M18305 Family BASE-T + 1f0f 0001 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8, Fan + 1f0f 0002 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8 350a M18305 Family Virtual Function 1f0f 0001 M18305 Family Virtual Function 9088 D1055AS PCI Express Switch Downstream Port + 9089 D1205CQ PCI Express Switch Downstream Port 1f16 XConn Technologies c500 XC50256 CXL2.0 Switch c510 XC51256 PCIe 5.0 Switch @@ -28944,7 +29016,7 @@ 5236 NV7000 NVMe SSD 5765 PCIe 3 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited -1f47 YUSUR Technology Co., Ltd. +1f47 YUSUR Technology 1001 K2-Pro Family [FLEXFLOW-2200T] 1f47 0001 FLEXFLOW-2200T 2*10GE Ethernet Adapter 1f47 0002 FLEXFLOW-2200T 2*25GE Ethernet Adapter @@ -28984,6 +29056,10 @@ 1f47 0006 Ethernet 25G 2P FLEXFLOW-2200R 1f47 0007 Ethernet 50G 2P FLEXFLOW-2200R 1f47 0008 Ethernet 100G 2P FLEXFLOW-2200R + 3301 K3 Family [FLEXFLOW-3100R] + 1f47 0001 FLEXFLOW-3100R 1*100GE Ethernet Adapter + 3302 K3 Family [FLEXFLOW-3100R Virtual Function] + 3303 K3 Family [CONFLUX-3100R MGMT Function] 4001 K2-Pro Family [CONFLUX-2200E] 1f47 0001 Ethernet 25G 2P CONFLUX-2200E 1f47 0002 Ethernet 40G 2P CONFLUX-2200E @@ -29042,6 +29118,7 @@ 6002 K2-Pro Family [CONFLUX-2200X Virtual Function] 6003 K2-Pro Family [CONFLUX-2200X MGMT Function] 6004 K2-Pro Family [CONFLUX-2200X DATA Offload Engine] +1f49 NeuReality LTD 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. 1008 Mango GPUBoost - RDMA @@ -29084,6 +29161,13 @@ 1608 PCIe Gen4 x4 M.2 2280 1f88 TE3420 PCIe Gen3 x4 M.2 2280 2269 XE4403 Series NVMe PCIe Gen4x4 SSD + 3101 EP1021 Series M.2 2242 NVMe PCIe Gen3x4 SSD + 3105 EP2021 Series M.2 2242 NVMe PCIe Gen4x4 SSD + 3201 EP1021 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3202 EP1031 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3205 EP2021 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3206 EP2031 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3261 DP1421 Series M.2 2280 NVMe PCIe Gen3x4 SSD 3420 PCIe Gen3 x4 M.2 2280 6100 TE3420 Series NVMe PCIe Gen3x4 SSD 6101 XE3420 Series NVMe PCIe Gen3x4 SSD @@ -29198,6 +29282,12 @@ 0028 IC695RMX228 RX3i 128MB Redundancy Memory Xchange with Single Fiber transceiver 0029 IC695PMM345 PACMotion Digital Motion Control Module (EtherCAT) 002a IC695HSC318 RX3i High Speed Counter (8 counters) + 8003 IC695CPU310/CMU310/NIU001 RX3i Controller 300 MHz Celeron + 8004 IC695CPU315/320/CRU320 RX3i Controller 1.0 GHz Celeron-M + 8005 IC695PNS001/101 RX3i Profinet Scanner + 8006 IC695CPE/CRE330 RX3i Controller 1.0 GHz G-series + 8007 IC695CPE302/305/310/NIU001+ RX3i Controller 1.1 GHz Atom Z510 + 800d IC695CPE302/305/310/NIU001+ RX3i Controller Atom x3930 1fc9 Tehuti Networks Ltd. 3009 10-Giga TOE SmartNIC 3010 10-Giga TOE SmartNIC @@ -29351,6 +29441,7 @@ 2004 Smart Link Ltd. 201f SpacemiT 0001 X60 PCIe 2.0 x2 Root Complex + 0002 X100 PCIe Root Complex 202c CAEN S.p.A. 5818 A5818 2036 Netforward Microelectronics Co., Ltd. @@ -29360,10 +29451,29 @@ 2036 0862 NF1618 Family NX862 (2*50GE) 2036 0863 NF1618 Family NX863 (2*100GE) 2036 0864 NF1618 Family NX864 (1*200GE) + 2036 0865 NF1618 Family NX865 (2*200GE) 1619 NF1618 Family Virtual Function + 8000 NP36xxx PCIe Gen 6 Switch + 2036 0104 NP36104 PCIe Gen 6 26 port/104 lane Switch Upstream/Downstream Port + 2036 0144 NP36144 PCIe Gen 6 36 port/144 lane Switch Upstream/Downstream Port + 2036 1000 NP36000 PCIe Gen 6 Virtual Upstream/Downstream Port + 2036 1001 NP36000 Virtual PCIe MGR 1.x Endpoint + 2036 1002 NP36000 Virtual PCIe DMA 1.x Endpoint + 2036 1003 NP36000 Virtual PCIe NTB 1.x Endpoint + 2036 1004 NP36000 Virtual PCIe Placeholder 1.x Endpoint + 2036 1005 NP36000 Virtual PCIe C2PMem 1.x Endpoint + 2036 1006 NP36000 Virtual PCIe Pktgen 1.x Endpoint 203b XTX Markets Technologies Ltd. +2044 Shenzhen Jiahua Zhongli Technology Co., LTD. + 8200 CeaCent CS211X 12G SAS RAID controller + 2044 2110 CeaCent CS2110-8i + 2044 2111 CeaCent CS2110-16i + 8201 CeaCent CS215X 12G SAS RAID controller + 2044 2150 CeaCent CS2150-8i + 2044 2151 CeaCent CS2150-16i 2046 GXMICRO Technology (Shanghai) Co., Ltd. 2048 Beijing SpaceControl Technology Co.Ltd +2052 Frontgrade Gaisler AB 2058 Lime Microsystems Ltd. 205c Zhejiang VMing Semiconductor Co., Ltd. 1514 EP9410 U.2 1.92TB NVME SSD @@ -29372,6 +29482,21 @@ 1535 EP9430 U.2 3.2TB NVME SSD 1536 EP9430 U.2 6.4TB NVME SSD 205d Shanghai Zijing Xinjie Intelligent Technology Co., Ltd. +205e SDTECH + 0000 SD85xxx PCIe Gen5 Switch + 205e 0048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 205e 0096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 205e 0104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port + 205e 2004 SD85000 PCIe NT Endpoint + 205e 2005 SD85000 PCIe gDMA Endpoint + 205e 2006 SD85000 PCIe Management Endpoint + 5048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 5096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 5104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port 2061 Unis Flash Memory 4000 E4000 controller 4100 E4100 controller @@ -29402,6 +29527,19 @@ 2061 2061 E520Q NVMe SSD 30.72TB PCIe 5.0 U.2 2061 2062 E520Q NVMe SSD 61.44TB PCIe 5.0 U.2 2061 2063 E520Q NVMe SSD 122.88TB PCIe 5.0 U.2 + 5300 E5300 NVMe Controller + 2061 2041 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2042 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2043 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2044 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2045 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 2046 E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 + 2061 2085 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2086 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2087 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2088 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2089 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 208a E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 2063 Hubei Yangtze Mason Semiconductor Technology Co., Ltd. 0bb8 MC3000 0bb9 RC3000 @@ -29444,16 +29582,18 @@ 208a MICIUS Laboratory 2094 Shenzhen Wodposit Electronics Co., Ltd. 1281 WPBSNM8-256GTP - 1282 WPBSNM8-512GTP NVMe SSD (DRAM-less) + 1282 WPBSNM8-512GTP 1283 WPBSNM8-1TTP 1284 WPBSNM8-256GMP - 1285 WPBSNM8-512GMP - 1286 WPBSNM8-2TMP - 1287 WPBSNM8-1TMP - 1661 WPBSN4M8-512GMP - 1662 WPBSN4M8-1TMP - 1663 WPBSN4M8-2TMP - 1664 WPBSN4M8-1TGP NVMe SSD (DRAM-less) + 1285 WPBSN4M8-512GMP + 1286 WPBSN4M8-1TMP + 1287 WPBSN4M8-2TMP + 1661 WPBSNM8-512GMP + 1662 WPBSNM8-1TMP + 1663 WPBSNM8-2TMP + 1664 WPBSN4M8-1TGP + 1665 WPBSN4M8-2TGP + 1666 WPBSN4M8-4TGP 2096 Kaitian Information Technology Co., Ltd. 5401 KCP54(01) 2280 PCIe G4 x4 TLCKCP54(01) 2280 PCIe G4 x4 TLC 5402 KCP54(02) 2280 PCIe G4 x4 TLC @@ -29513,6 +29653,12 @@ 20e3 Elix Systems SA 20e7 TOPSSD 20f4 TRENDnet +20f6 Shenzhen Zhishi Network Technology Co., Ltd. + 0001 MPU H1 +20f9 Shenzhen Silicon Dynamic Networks Co., Ltd. +2106 ZCHL Technology Co., Ltd + 0001 HL100 Accelerator Controller + 2106 0001 HLC100 Accelerator Card 2116 ZyDAS Technology Corp. 21b4 Hunan Goke Microelectronics Co., Ltd 21c3 21st Century Computer Corp. @@ -29755,10 +29901,10 @@ 7173 CH355 PCI Quad Serial Port Controller 434e Cornelis Networks 0001 CN5000 HFI Silicon, Dual Port, BGA [discrete] - 434e 0001 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled - 434e 0002 CN5000 HFI Adapter, Dual Port, QSFP-DD, x16 PCIe Gen 5, Air-Cooled - 434e 0003 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled, Thermally Enhanced - 434e 0004 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Conduction-Cooled + 434e 0001 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5 + 434e 0002 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5 + 434e 0003 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5, II + 434e 0004 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5, II 0002 CN6000 HFI Silicon, Dual Port, BGA [discrete] 8001 CN5000 Switch Silicon, 48 Port, BGA 4444 Internext Compression Inc @@ -31172,6 +31318,8 @@ 0dc5 Ethernet Connection (23) I219-LM 1028 0c06 Precision 3580 0dc6 Ethernet Connection (23) I219-V + 0dc7 Ethernet Connection I219-LM + 0dc8 Ethernet Connection I219-V 0dcd Ethernet Connection C825-X 0dd2 Ethernet Network Adapter I710 1137 0000 I710T4LG 4x1 GbE RJ45 PCIe NIC @@ -32138,11 +32286,13 @@ 8086 0002 Ethernet Network Adapter E835-C-Q2 for OCP 3.0 8086 0003 Ethernet Network Adapter E835-CC-Q1 8086 0004 Ethernet Network Adapter E835-CC-Q1 for OCP 3.0 + 8086 0005 Ethernet Network Adapter E835-C-Q2 124a Ethernet Controller E835-CC for SFP 8086 0001 Ethernet Network Adapter E835-XXV-2 for OCP 3.0 8086 0002 Ethernet Network Adapter E835-XXV-4 8086 0003 Ethernet Network Adapter E835-XXV-2 8086 0004 Ethernet Network Adapter E835-XXV-4 for OCP 3.0 + 8086 0008 Ethernet Network Adapter E835-XXV-2 124b 82380FB (MPCI2) Mobile Docking Controller 124c Ethernet Connection E823-L for backplane 124d Ethernet Connection E823-L for SFP @@ -32856,7 +33006,7 @@ 1603 Broadwell-U Processor Thermal Subsystem 1604 Broadwell-U Host Bridge -OPI 1605 Broadwell-U PCI Express x8 Controller - 1606 HD Graphics + 1606 Broadwell-U GT1 [HD Graphics] 1607 Broadwell-U CHAPS Device 1608 Broadwell-U Host Bridge -OPI 1609 Broadwell-U x4 PCIe @@ -32867,19 +33017,19 @@ 160e Broadwell-U Integrated Graphics 160f Broadwell-U SoftSKU 1610 Broadwell-U Host Bridge - DMI - 1612 HD Graphics 5600 + 1612 Broadwell-H GT2 [HD Graphics 5600] 1614 Broadwell-U Host Bridge - DMI - 1616 HD Graphics 5500 + 1616 Broadwell-U GT2 [HD Graphics 5500] 103c 2216 ZBook 15u G2 Mobile Workstation 1618 Broadwell-U Host Bridge - DMI 161a Broadwell-U Integrated Graphics 161b Broadwell-U Integrated Graphics 161d Broadwell-U Integrated Graphics - 161e HD Graphics 5300 - 1622 Iris Pro Graphics 6200 - 1626 HD Graphics 6000 - 162a Iris Pro Graphics P6300 - 162b Iris Graphics 6100 + 161e Broadwell-Y GT2 [HD Graphics 5300] + 1622 Broadwell-DT/H GT3 [Iris Pro Graphics 6200] + 1626 Broadwell-U GT3 [HD Graphics 6000] + 162a Broadwell-DT GT3 [Iris Pro Graphics P6300] + 162b Broadwell-U GT3 [Iris Graphics 6100] 162d Broadwell-U Integrated Graphics 162e Broadwell-U Integrated Graphics 1632 Broadwell-U Integrated Graphics @@ -32920,7 +33070,7 @@ 18f3 Atom Processor P5xxx Series SATA Controller 1900 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1901 6th-10th Gen Core Processor PCIe Controller (x16) - 1902 HD Graphics 510 + 1902 Skylake-S GT1 [HD Graphics 510] 1903 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem 1028 06d6 Latitude 7275 tablet 1028 06dc Latitude E7470 @@ -32936,7 +33086,7 @@ 17aa 2247 ThinkPad T570 17aa 382a B51-80 Laptop 1905 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x8) - 1906 HD Graphics 510 + 1906 Skylake-U GT1 [HD Graphics 510] 17aa 382a B51-80 Laptop 1908 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1909 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4) @@ -32956,8 +33106,8 @@ 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 17aa 225d ThinkPad T480 - 1912 HD Graphics 530 - 1916 Skylake GT2 [HD Graphics 520] + 1912 Skylake-S GT2 [HD Graphics 530] + 1916 Skylake-U GT2 [HD Graphics 520] 1028 06dc Latitude E7470 1028 06f3 Latitude 3570 103c 8079 EliteBook 840 G3 @@ -32966,24 +33116,24 @@ 1919 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Imaging Unit 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 - 191b HD Graphics 530 + 191b Skylake-H GT2 [HD Graphics 530] 1028 06e4 XPS 15 9550 103c 825b OMEN-17-w001nv - 191d HD Graphics P530 - 191e HD Graphics 515 + 191d Skylake-DT/H GT2 [HD Graphics P530] + 191e Skylake-Y GT2 [HD Graphics 515] 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 191f Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1921 HD Graphics 520 1923 HD Graphics 535 - 1926 Iris Graphics 540 - 1927 Iris Graphics 550 + 1926 Skylake-U GT3 [Iris Graphics 540] + 1927 Skylake-U GT3 [Iris Graphics 550] 192b Iris Graphics 555 - 192d Iris Graphics P555 + 192d Skylake-H GT3 [Iris Graphics P555] 1932 Iris Pro Graphics 580 - 193a Iris Pro Graphics P580 - 193b Iris Pro Graphics 580 - 193d Iris Pro Graphics P580 + 193a Skylake-H GT4 [Iris Pro Graphics P580] + 193b Skylake-H GT4 [Iris Pro Graphics 580] + 193d Skylake-H GT4 [Iris Pro Graphics P580] 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller @@ -36467,6 +36617,7 @@ 2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers 15d9 0821 X10DRW-i 3101 Killer E3100X 2.5 Gigabit Ethernet Controller + 3102 Ethernet Controller I226-K 3140 Easel/Monette Hill Image Processor [Pixel Visual Core] 3165 Wireless 3165 8086 4010 Dual Band Wireless AC 3165 [Stone Peak 1x1] @@ -37831,6 +37982,7 @@ 103c 87b9 Thunderbolt Dock G4 PCIe NIC 17aa 2303 ThinkPad Universal Thunderbolt 4 Dock PCIe NIC 1ab6 0225 TS4 On-Board 2.5GbE Ethernet Adaptor + 5503 Ethernet Controller I226-LMvP 550a Ethernet Connection (18) I219-LM 550b Ethernet Connection (18) I219-LM 550c Ethernet Connection (19) I219-LM @@ -37854,7 +38006,11 @@ 56a3 DG2 [Arc Xe Graphics] 56a4 DG2 [Arc Xe Graphics] 56a5 DG2 [Arc A380] + 172f 3941 A380 ELF + 172f 3943 A380 ELF + 172f 4017 A380 Pioneer 56a6 DG2 [Arc A310] + 172f 4019 A380 ECO 56a7 DG2 [Arc Xe Graphics] 56a8 DG2 [Arc Xe Graphics] 56a9 DG2 [Arc Xe Graphics] @@ -37915,13 +38071,13 @@ 1af4 1100 QEMU Virtual Machine 5900 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5901 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x16) - 5902 HD Graphics 610 + 5902 Kaby Lake-S GT1 [HD Graphics 610] 5904 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 1025 115f Aspire E5-575G 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 5905 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8) - 5906 HD Graphics 610 + 5906 Kaby Lake-U GT1 [HD Graphics 610] 5909 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4) 590b HD Graphics 610 590c Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers @@ -37932,31 +38088,31 @@ 1462 7a72 H270 PC MATE 5910 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5911 Xeon E3-1200 v6/7th Gen Core Processor Gaussian Mixture Model - 5912 HD Graphics 630 + 5912 Kaby Lake-S GT2 [HD Graphics 630] 1043 8694 H110I-PLUS Motherboard 1462 7994 H110M ECO/GAMING 1462 7a72 H270 PC MATE 5914 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 17aa 225d ThinkPad T480 - 5916 HD Graphics 620 + 5916 Kaby Lake-U GT2 [HD Graphics 620] 1025 1094 Aspire E5-575G 17aa 2248 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen - 5917 UHD Graphics 620 + 5917 Kaby Lake-R GT2 [UHD Graphics 620] 17aa 225d ThinkPad T480 (20L5) 17aa 225e ThinkPad T480 5918 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers - 591b HD Graphics 630 + 591b Kaby Lake-H GT2 [HD Graphics 630] 591c UHD Graphics 615 - 591d HD Graphics P630 - 591e HD Graphics 615 + 591d Kaby Lake-DT GT2 [HD Graphics P630] + 591e Kaby Lake-Y GT2 [HD Graphics 615] 591f Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5921 HD Graphics 620 5923 HD Graphics 635 - 5926 Iris Plus Graphics 640 - 5927 Iris Plus Graphics 650 + 5926 Kaby Lake-U GT3 [Iris Plus Graphics 640] + 5927 Kaby Lake-U GT3 [Iris Plus Graphics 650] 5a84 Apollo Lake [HD Graphics 505] - 5a85 HD Graphics 500 + 5a85 Apollo Lake GT1 [HD Graphics 500] 5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit 5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster 5a9a Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine @@ -38019,6 +38175,19 @@ 65fa 5100 Chipset PCI Express x16 Port 4-7 65ff 5100 Chipset DMA Engine 674c CRI + 6e23 Nova Lake PCH-S SMbus Controller + 6e24 Nova Lake PCH-S SPI Controller + 6e28 Nova Lake PCH-S Serial IO UART Controller #0 + 6e29 Nova Lake PCH-S Serial IO UART Controller #1 + 6e2a Nova Lake PCH-S Serial IO SPI Controller #0 + 6e2b Nova Lake PCH-S Serial IO SPI Controller #1 + 6e4c Nova Lake PCH-S Serial IO I2C Controller #0 + 6e4d Nova Lake PCH-S Serial IO I2C Controller #1 + 6e4e Nova Lake PCH-S Serial IO I2C Controller #2 + 6e4f Nova Lake PCH-S Serial IO I2C Controller #3 + 6e5e Nova Lake PCH-S Serial IO SPI Controller #2 + 6e7a Nova Lake PCH-S Serial IO I2C Controller #4 + 6e7b Nova Lake PCH-S Serial IO I2C Controller #5 6f00 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2 *** 204 LINES SKIPPED *** From nobody Thu Feb 19 09:14: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 4fGnlJ303sz6Scd0 for ; Thu, 19 Feb 2026 09:14: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 4fGnlJ1btZz431X for ; Thu, 19 Feb 2026 09:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLoIQzBBSTJG1yAjwu02waUgF83bF4as+lbVJ1Sfnjo=; b=mc3XzuqqFYIPUVdL35K7klgFd6mDzxM7HJkAhdcfdXQ+B7WlSYq2Ivvy4rVZnn4VNaQVTS ++S254HXxtYwlAKP4FbRKSVR39jpm6krTvp1KvV+dNPP/dKNdl5ndQAmkxFdRCY3OgPs6e d1Xir0m4xCAmBKcy9mVwtdQHR8tB0VfsbUmIGbPDyStVRBWgR7xOQJXOFGa1kn8wVUnIAj zaRY4008cdFL2rLzwCovzsbwmYMJZH5adTzL21Myvu9mJWY0K3GCa3FYIu1omk+E0i7h9t BP6daPojvrgXO/8bsWpdRvdqmjiB6C4Hz7dO9gpWl106oTV8OZq7HtuNkgFc+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492492; a=rsa-sha256; cv=none; b=eC+pCMuKzPOe+mA1Mrn6u98HpGvZSdfHfBbI5brB+Rvj6Ivc75xjHk90C/OmQKpQtx0hmC 8AOTKkcLIzF0RI0KMiQaq4rnUcNmsUnkIULBqQoeQL4JIAcwIEQWGseiTfOxFQYVhgREUZ 3Nc0Rh6fhZtU+uDVbdEp2urL32YAao/E8sJ04y0CTvI4pkXH7dLu2ErF4p3ShwZrQGGzyV KUTBpP/JVWgJUTkAHKgsKT4ekdZ8z+7UWmfcV4uWCh34HUzFwJ+FB2GsHbgr3AzMSMAY2p XgBJaDdzMyUfdOzczLN8QyT3yxcG4jBW61HblcmpYQfJKoaRjx2BmYx/b0QihA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLoIQzBBSTJG1yAjwu02waUgF83bF4as+lbVJ1Sfnjo=; b=wyTa2oaNPxjOjKQ2Z3Trkj0LulY/nheR1ot9jAgwzH//eOKgRk2UHClEXkGopiTEyYqnpN ejnjliASw/wn74ETufcztx8dISTh0gKYzbqbub0bNmMG06IfOx2e/qJVDuI3J9v+pGEaYp frePXuMjNQzniRCwS0xwaOgBNr3PkB/0TWDy+Swj1gQ4JjeGcIvX6pvZWqmJJuN7t1gsC4 p9gQC2NuqrcJ4ve+V/oS1IQkC12cGjH40OpoRuZNrLhUqRqVNPCPkX5npI/hbEGllvfgDq EUw1cj0edyhHIg5C5kVbCp6alwxU40u8xM4zAX4B5EEUjoma5mkQZjHCDheB/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 4fGnlJ12fzzcR7 for ; Thu, 19 Feb 2026 09:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:14:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2f866e0547bd - stable/14 - usb_vendors: update to 2025.12.13 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 2f866e0547bd85e4fc66cf5468e8349931e365be Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:14:52 +0000 Message-Id: <6996d48c.1df0a.3b5fa406@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2f866e0547bd85e4fc66cf5468e8349931e365be commit 2f866e0547bd85e4fc66cf5468e8349931e365be Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:38:37 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:14:42 +0000 usb_vendors: update to 2025.12.13 (cherry picked from commit 8d4c1043bb0630710cbea9f744cdaef499c0ed79) --- share/misc/usb_vendors | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index fa798e65ed9a..5832b6f9f660 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.09.15 -# Date: 2025-09-15 20:34:02 +# Version: 2025.12.13 +# Date: 2025-12-13 20:34:01 # # Vendors, devices and interfaces. Please keep sorted. @@ -24056,6 +24056,7 @@ C 08 Mass Storage 00 Control/Bulk/Interrupt 01 Control/Bulk 50 Bulk-Only + 62 USB Attached SCSI C 09 Hub 00 Unused 00 Full speed (or root) hub From nobody Thu Feb 19 09:14: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 4fGnlK4Xjmz6ScZB for ; Thu, 19 Feb 2026 09:14: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 4fGnlK2V8mz43Jq for ; Thu, 19 Feb 2026 09:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWQruX/lzAgOhD6c0P0D473rbYzjW55lH+l2nNScXRc=; b=wkl2OAvUk4OiSTGVGAT9dZ/vNEv09rBkXe0VknA2vSdemQTakfpfFZ7YKz0uLPXVNRrf5y qizmzBNuTnKbvwKvlnm+t55oLgSjN/Ds1VnY3UQruHbEReFkjiJrz8iOu5luyFDEmnO5Pl 8Xu/ZS6tUYKDk56v/hjy8+Vye7rXLaZY0AsO6WX3AWALkLs0/kG/5xbxXp0E0LYAmNoaHq oAQzWOtP2h26piS9PR7HXwYWRFY4cLF0seaC8BKxpjyd5dg/zDf1txQxYHSKZQyqHaLlIb zKWkHuSXY8K8RaA5gdAHB0zMnROVs2ANAMRKIyac9Dg4F5ftPgxNEU9I6xrbKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492493; a=rsa-sha256; cv=none; b=GJ0kkBt3Vxou0zFz0Z7mxJWYrQcpWx7wTeiBdUdViC3X8QE/xXWVm9wXbEoOrzLsm1xu80 UI9ovVcOsM61/TQLLSXaLSks/OXiG8mHGU2aTHtbyWqKVdNEiUPcvpC06h3Xavw9o/JaYZ 7+MhL0rHwzMZRNPZETWEZJI/0ZOTx8j4MYfJFpkSdQEFB27px1RBzORt4lCxIx0ffw6ExS Hn6hO/QaJ151CzdInW5aYBkRMNXxVTCsarLtbmoXgzUDfRjGjZQb1GJ5rVTs3QYfD1MtcM nC/apvoQqBd5AVvVUkL0amCRunkCOP/UpOq7+ZIUwHFpuQLEv3sq44ENT3UfKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWQruX/lzAgOhD6c0P0D473rbYzjW55lH+l2nNScXRc=; b=Fm9Q6dllT8jlos54+9WI4bLajue3a0VOcefa47/ZuBcGmhjlEVHkVP7DORJ9T2r4Eb4Sm3 cnPecbqj+PEuCnVMuOSFc7AOE2UQfN4SjdlR8Ijfl0Dk1O9nvuehGzfGRP0FKb1hWECvOz HcXjRxU2jMPmHjkGyGFezHGOf1XtZIUNxGNtH/XHTOBC6eGEo8tPiYqV7orDZQlhpv7DFs 4+D8XIaMiV2AkUPjeM6b6ps7xvr3ZXnhylyu6pB1+5SHjoAICF1D+C5XChZ9pcIn7lbRvv U3pLNxmvi/MOJuV4E2tZJZpsFzkGFZwdWn/dmmlMs23AiWD9mFcjP0LeU0BB9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnlK1pl1zbyD for ; Thu, 19 Feb 2026 09:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e011 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:14:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 45d84c2f06fa - stable/14 - tr: fix class handling in unicode world List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 45d84c2f06fa72e405f09e2468b10bdf10b806cf Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:14:53 +0000 Message-Id: <6996d48d.1e011.58b40d00@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=45d84c2f06fa72e405f09e2468b10bdf10b806cf commit 45d84c2f06fa72e405f09e2468b10bdf10b806cf Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:14:42 +0000 tr: fix class handling in unicode world toupper/tolower logic was only handled for CCLASS_TOUPPER and CCLASS_TOLOWER, add support for CCLASS ([:alpha:]) PR: 219900 MFC After: 1 week (cherry picked from commit 625dc44832cd760be3d7242d8e21a530c7e32bfc) --- usr.bin/tr/tr.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 75638d6b3bc6..0eb9003ff831 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -253,6 +253,40 @@ main(int argc, char **argv) break; } while (s2.state == CCLASS_LOWER && s2.cnt > 1); goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_UPPER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towupper(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswupper(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip upper set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_UPPER && s2.cnt > 1); + goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_LOWER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towlower(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswlower(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip lower set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_LOWER && s2.cnt > 1); + goto again; } else { cmap_add(map, s1.lastch, s2.lastch); if (sflag) From nobody Thu Feb 19 12:29: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 4fGt3m1zKCz6QRNJ for ; Thu, 19 Feb 2026 12:29: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 4fGt3m1QYFz3SxV for ; Thu, 19 Feb 2026 12:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/XROG3WqYu1IwMZEOU4LaI07W7sSzjC1c23z2BVnX6I=; b=ypMChPyF87tpbA17r04nh6cc0OQImVwpjK54yRphWHy3BOsQau/7EOFzX/MAIsRYxAIZJ7 K9+eoZepI7wfW4a+7FpLLSYZGk3C5C7qdkR0Nx9giEWaiWfApkEGQWJeRJ9BTc2bk9b1lP FofoyF9+Vjgl2EEaE9holF3yA7vBZ8DG0op0LElkLfDAOw+WCbJXaN4VKwRKmHnlfH9QY8 esWQVX5xGdL+j0m/1ubadAjr7SPI1U0PlN7TcvTlfk1VIO4BpF6Glta4MXQC1O1m9BgGW2 4CCNcehhsx6JzHsbaAjI/uhzVRMzLsjL0mhxlm50Aw+H2KiWRSz2LpBixbETSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504164; a=rsa-sha256; cv=none; b=PvIeYYHJgXS3iTYHu1NnccY3HMU/8CiG61v8ofShhmtJnkeVlt/1Bo90ddwLl2oeq45x58 pCAJ9ak3cRdSY9sTk2gactVtLjlRnzjHzKgVlXf7qgiRMy9RGgKTe+uUuuw4n0TY9DZXdM vpJHEKmSjJHJE85+QeN0aAqfoE+YVYGLRd+eEBAokrlcETbrcGSvTG2pHhlYrvNhOkBuAc Y2/fWh2573MoItQlUzEVHuUqkQj4y+5kZX2f8Z7SUwAd3SvB8cERsDQl8D1xQ7yrqO1qkD CBu15EL4flbcoXKvM9m3a8+mfb+GIsUpLbkXEZkJ0FXuMlySULXAcOGosO3sTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/XROG3WqYu1IwMZEOU4LaI07W7sSzjC1c23z2BVnX6I=; b=xHm63VAiKhapWRfVTvzhtQJU6vNAAPkp8j1miRWD9IElmker6PiHyp+W256sICzYuXxfAr LC3vg6GLSPppjrwUjBSF+pr3FTfJLyu1c1t0ceeyTDCqrD7wNwmAXrRXgc+KyEawk0JojJ lrGZR1yd//2cTuP6TNi9ICnUQSAbYJ4YZVuvmfdwkiSy4UChlJUsKfyFf6nwuKgnU9HeSH D9bnSC3TWqkSIgl/c3wb2IBwzx4Vox+vUwYoV78vyi9GgKSkN/KJQt0wUvQcjXgCRZ+haP qNNmTK6fJsSNN8N9hBYPb2eqali5vt9Kem/cMr0qpJaB9WKZObZlPLxFrQymlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3m10h8zjXL for ; Thu, 19 Feb 2026 12:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39817 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: bdf595fcea8e - stable/15 - exterrvar.h: style(9): Fix two small nits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bdf595fcea8e2a6056e5e68a321fb7505659e585 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:24 +0000 Message-Id: <69970224.39817.4daff93b@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bdf595fcea8e2a6056e5e68a321fb7505659e585 commit bdf595fcea8e2a6056e5e68a321fb7505659e585 Author: Olivier Certner AuthorDate: 2025-11-27 09:42:50 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:44 +0000 exterrvar.h: style(9): Fix two small nits - Use tabs before '\'. - Comment for '#else' must be the negation of the initial '#if''s test. No functional change. Sponsored by: The FreeBSD Foundation (cherry picked from commit d9e734d650844f4465a2e064fc9ee0897ed9aa95) --- sys/sys/exterrvar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h index 8e2961356a1e..6c75a2d01174 100644 --- a/sys/sys/exterrvar.h +++ b/sys/sys/exterrvar.h @@ -44,7 +44,7 @@ (kep)->p1 = (pp1); \ (kep)->p2 = (pp2); \ (kep)->src_line = __LINE__; \ - (kep)->error; \ + (kep)->error; \ }) #define _SET_ERROR0_KE(kep, eerror, mmsg) \ _SET_ERROR2_KE(kep, eerror, mmsg, 0, 0) @@ -77,7 +77,7 @@ int exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1, int exterr_to_ue(struct thread *td, struct uexterror *ue); void ktrexterr(struct thread *td); -#else /* _KERNEL */ +#else /* !_KERNEL */ #include From nobody Thu Feb 19 12:29: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 4fGt3n3JS3z6QRXl for ; Thu, 19 Feb 2026 12:29: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 4fGt3n2GgDz3SxX for ; Thu, 19 Feb 2026 12:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZBdAHWZ5Z+fMvTen4L5Hy4EQBodo58Mwdw1VHBF8rWE=; b=Na4NPa8EAARGsN1Ztu2aO8b9BYucpuSK/INgZyt7ses5HrFigMvwrn5I0dCBkGG7GyxopG GhKIY5TlakxX2/ok8cqbOhPr0lDddENFlDB2N94B9IuuPzrCG1vD3KjdWlb7fb+igPUGFI VrNr4GCdyTceDJQoD5AZXhlpNj8wco86ghm4KKYwuigIWZJqD9axuGZEf5eJRnfNPzIW7s 9EbmQM/aThtkCLzcyceCvPOYhg8Dq6XZzyD06PgENjJZoemHL5AgGYB3BmTSZtt5twoc3A IcOoWcrltoecW6hob9esCoU4FhNFtcUmQi12Q6HO6tzdmlHb3Vi9sPImxQQBUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504165; a=rsa-sha256; cv=none; b=A9MUVNZBs7ABCCNg1Y1XrSvOHOKAf+Se0TjhwuCj/UVv6DbS+s0PJvIsnsBGS9luqWDihQ /B4RgKhnyOpRnAJ96IN8lSGU7Bed4RTIq3PyF8sVhqMrEiCapJpZa9ABVp+S3pKr952ePn kg/NRbqKX17StCR0Bum3fVI9zDhnNVdlItJ9LjHate2N9iLhkY2jXDttQVUqf4F+QSKhOc tLttBLKI9kZnIWRYPsCpZR6/AsyN6RQavuFHm371nG0kgjS06m1uvnyeTwPho243lfZ3bI K4/TI7WiwzZ+KOG3i9F7UE5/r5CxYb93e4Ms6wEMU4/SpVlVlPOtJEpuJjgdDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZBdAHWZ5Z+fMvTen4L5Hy4EQBodo58Mwdw1VHBF8rWE=; b=OBQtMccJbCzDydwI/2R6XpYkK7VfXTH0ahvL3hNjwZYHvmJqPbs6Ebsv+F7vcjoQmWWCOC fLPP8pQbcsRZkjmsuUehE7/29afVaN+b9HObehEyVwBILahE9J/jzB0FDAGNGPnvuSCn9m TnReFL/xNNuM1N5muVcsvChq3uDk0PltqrDHv/ayX4kGZJs6D27nrxDr7EtW1JuP6lLvgs hB4d73Hvb/U816H4dpT/iOP0G4ky02sbMbo1wirRRWtGLCfL1Cz9z7lOGC6R+Ud5WXtvFo QDsJCCaux9xHNoj2JfA07qrWGQI074xAYT5bX1Clp56q2eNLonLhVH4KLwhVOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3n1kt1zhqW for ; Thu, 19 Feb 2026 12:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 4ba8eaf2336c - stable/15 - ps(1): Sort headers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4ba8eaf2336cdad542d7081dcf87e4ce8af9d059 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:25 +0000 Message-Id: <69970225.38b2b.36e60781@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4ba8eaf2336cdad542d7081dcf87e4ce8af9d059 commit 4ba8eaf2336cdad542d7081dcf87e4ce8af9d059 Author: Olivier Certner AuthorDate: 2026-01-08 15:20:38 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:49 +0000 ps(1): Sort headers Found these changes by chance in an old patch file. Should have been committed along with the ps(1) modifications done in March 2025. No functional change (intended). MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 730b3e20069b7115d16f02525103c6c05fa04759) --- bin/ps/keyword.c | 4 ++-- bin/ps/ps.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index f05e5245f695..0562fd2e4f9d 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -35,10 +35,10 @@ */ #include -#include -#include #include +#include #include +#include #include #include diff --git a/bin/ps/ps.c b/bin/ps/ps.c index bb5102729957..94218f8cb2aa 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -42,13 +42,13 @@ */ #include +#include #include +#include #include -#include #include -#include #include -#include +#include #include #include From nobody Thu Feb 19 12:29: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 4fGt3p3SsZz6QRR9 for ; Thu, 19 Feb 2026 12:29: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 4fGt3p2ft5z3T0X for ; Thu, 19 Feb 2026 12:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Lhp+1W8Z/wXuMObOrUR0/SH6jyBsI9YdtqsP5tFI0g=; b=cQ2ta6UsaZ9CBN29ezTwrwyxuc1h0c3hXtgSqqOcHxybtneJ+6fvHIRkGgpiTXbjTflR2d Ez6S6SPAP5lggIAM1vOojCUbKLIrrGL5PEWyb7xUmxrkhtX7Azi02PGvl9MPzOrHJTZdTD n0Jd9CacEQ7Dv+mrtwH1azzZvjFxpsYErPjfKf5ZaM3/gJQpHzyXcG5oA/UxhK+bfFbQeH gAo8ug8pPG8uE1Qnzbj77HFSltBarL+Iij//tdIFWCqSdIa1wwB8PzB0/nqzx7c6HZruaY HXUva251g04G8dAynYaQhgSMVdnLGJszvUsczYAsn8hSE4Ig954cmuvuut7ZHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504166; a=rsa-sha256; cv=none; b=K5iFr7w1IzO8xmo9A6QbuiZ1uYS166v/pykPebXYadJNa1Ijb5F0STA3oCK1/OuMkkxYnG fC8nPKeiBZVlxPaowoYSGfeiO/1jExdiaLCVc048LgKH7f9Tf8INyIRjj3NeBVi0ZOgzeZ CsSRGMc2Rluim1hQ/JXSsIquwxcKH7atOUS7OrK+XBes/v1O6PjeqJy4Zpu9GL/jC8Vic2 6Znung5LTwNfeBOhqqsOXpWsT74BUw1nITUIO7/BgaN+pDunBS2Nd/e5u8GM6ue5PwMqUd 3vho3psCbNGGE1iHlCrnEZgtXwa04zZ+8utSwv4K83Fm0v2F82clYIztucaVzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Lhp+1W8Z/wXuMObOrUR0/SH6jyBsI9YdtqsP5tFI0g=; b=s5a6FB411pRXceL26kFSPxVzBVIBklbtGdwK0jTID7U4u9qOptNUwWhvh6BlncJi9BBSqJ 5fgHSFgS8VfTqqTi7X3WGTAgKEXPmVBmoD7MNpzqbJ7QAwKBVPvnCXLdWqt5IufnzFICgt FBFMVLgfe7qmcs0p/5xFgHmcpaEiDgx0ryKPhCD0fLEXBXCo0bcWr6IxcDU32mvwmfRc76 VDL01sJ+ku/ytRHmAogSpKQWFKpGvvx3pVeQQ7oXN3UvITk3jNMrczYdRiOR6HtLFpmn+W +8rdsWtW5S1yN32V6TwqmxJCBdel4hnQg/fN7LhjDaOVDLqE20RDEF/m2cSdJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3p2CH1zj77 for ; Thu, 19 Feb 2026 12:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3815e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 97490a7b32e3 - stable/15 - ahc(4): Fix a warning on 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 97490a7b32e3671328dd06053e752da105919d81 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:26 +0000 Message-Id: <69970226.3815e.22e02b33@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=97490a7b32e3671328dd06053e752da105919d81 commit 97490a7b32e3671328dd06053e752da105919d81 Author: Olivier Certner AuthorDate: 2026-01-28 09:31:21 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:50 +0000 ahc(4): Fix a warning on i386 compilation Fixes: cd036e891a35 ("ahc_pci.c: If bus_dma...") MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit a9f7074e858fd7c8e07c164fc365afc0d0077735) --- sys/dev/aic7xxx/ahc_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c index 8109a6714814..7f8fbe140237 100644 --- a/sys/dev/aic7xxx/ahc_pci.c +++ b/sys/dev/aic7xxx/ahc_pci.c @@ -105,7 +105,7 @@ ahc_pci_attach(device_t dev) error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), /*alignment*/1, /*boundary*/0, (ahc->flags & AHC_39BIT_ADDRESSING) - ? 0x7FFFFFFFFFLL + ? (bus_addr_t)0x7FFFFFFFFFLL : BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, From nobody Thu Feb 19 12:29: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 4fGt3q61pDz6QRNN for ; Thu, 19 Feb 2026 12:29: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 4fGt3q46QGz3T5F for ; Thu, 19 Feb 2026 12:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZcdD9SYLYRNPIZ0Is5TbLExQR3foVw4nB0AM/EHh9c=; b=iHj1L1Xcotchi1A59VvxHErxQi/2hUA5SzYCZnpYTfTNgfZi6Zcbddij4c+hWQioOAf6YK rRt16vNXmvUu1dAQvZN5IoMmPr4KPdyVMxOWAvVg499kmWVkaAtm8zhoJ8YP4d1BuoHgCg QNep7OC+RlF3wCISdtmuBoZD4uUJsEuy9RaKcRUu7CcolFhArHFNbJBea3h2rFReNP+1GA a3vVScW+VwoYQHxwX41veIAmW7CWpltq3tsUXxne88A9B9HbXXalaKnVochxQC6fG2ITqG k4byOhapQRligdodhbtszZXr4zdzkiEo2Rc6pgewvyvrK9YwVrviZo9+gE8pjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504167; a=rsa-sha256; cv=none; b=opzzj6wS4bDVmU9JeeMocK8hsjQvfgFsRft7AyF6RrwJ3EAU5gsWofBByN+EwWZnXpXFYT jB1/Fn8nlyI1C/pNhC5yHI+GIrdExxbFzdDzZ+Q0rgH/DX+RBV1S+uGGNIKYXzzmQzQm0u 9hceT0sqbbGpnB+w3E8cq1b2iSvfn7VdsgrwgmSPSebP3udKiTH+LusxfqmmgSMVk4tfmZ g5rx98GVqT4+bgXIijbT7fpjIJ91xP25QfpmzXDomtcpmvagE/NHObu0EqcFRHxbO31ze4 JRTKhAMbBXy8ONjm+eKWJZ10/eNKRNvzE2f1g4oyy2+QxdsEKkgjozk4wGp2dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZcdD9SYLYRNPIZ0Is5TbLExQR3foVw4nB0AM/EHh9c=; b=ahpgy6iLG3a3NvNcTAWTpxruytUfl4Nwyy2NVYVsvJA9/2VWSXIUOYFbc/74lyLhRr1hJg zob9DUTG2M2xFiQG6baUBEYJ2ZYztFlkCQjWYF2YcznUi2tboiRhA59z+ZMeI5E+fipnOM aINvHaBpCCdvp+nHMUBcN+74Sga0od9ldq7bevWBL+K8rOJ9l/ABBVNSzvZvJqkSwqGasR QDGnQT7s5LNDHGxtHOT7wUuh9fBmUbr7cWLwx7PUuBF8hofi9myc+7a/rO4ASwvVFvGqaj Mnb1AeBzzGhd1DC0nYf0UYZ6GX4EkSrMTdL26bJj/yPkaBxHfjvqVXVwS/AY4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3q352yzhXc for ; Thu, 19 Feb 2026 12:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 390c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 6d6eca79f0d0 - stable/15 - acpi: Use only AcpiGetSleepTypeData() to determine Sx 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6d6eca79f0d03468e4e91e9c5d014624f0dd7fbd Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:27 +0000 Message-Id: <69970227.390c2.56a8702e@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6d6eca79f0d03468e4e91e9c5d014624f0dd7fbd commit 6d6eca79f0d03468e4e91e9c5d014624f0dd7fbd Author: Olivier Certner AuthorDate: 2026-01-07 13:34:44 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:50 +0000 acpi: Use only AcpiGetSleepTypeData() to determine Sx support Previously, we would first call AcpiEvaluateObject() to execute \_Sx before calling AcpiGetSleepTypeData(). This was unnecessary, as AcpiGetSleepTypeData() performs the same call itself. While doing so, the latter function logs any other error than AE_NOT_FOUND (which indicates that a particular sleep state is not supported), which most probably is an added benefit of this change. Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54624 (cherry picked from commit 526c09a489295c96662d6c3d428f69672968ab80) --- sys/dev/acpica/acpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index a2159b12876f..7d067c880846 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -470,7 +470,6 @@ acpi_attach(device_t dev) ACPI_STATUS status; int error, state; UINT32 flags; - UINT8 TypeA, TypeB; char *env; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -656,11 +655,12 @@ acpi_attach(device_t dev) /* Probe all supported sleep states. */ acpi_sleep_states[ACPI_STATE_S0] = TRUE; - for (state = ACPI_STATE_S1; state < ACPI_S_STATE_COUNT; state++) - if (ACPI_SUCCESS(AcpiEvaluateObject(ACPI_ROOT_OBJECT, - __DECONST(char *, AcpiGbl_SleepStateNames[state]), NULL, NULL)) && - ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S5; state++) { + UINT8 TypeA, TypeB; + + if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) acpi_sleep_states[state] = TRUE; + } /* * Dispatch the default sleep state to devices. The lid switch is set From nobody Thu Feb 19 12:29: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 4fGt3r5q18z6QRNR for ; Thu, 19 Feb 2026 12:29: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 4fGt3r46RYz3Smn for ; Thu, 19 Feb 2026 12:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=43p8zwPnND/vyycXMIEik3SUJigS7Uhp9FI8aXl/FoA=; b=cTDAplapatnVqdDhyYVKoMhdUY5DMWVWv/eRBLvOE0RIlUWFddgTEaRnYRMaVoCchBzJbz 3v2LaDxTxWNGQKinldKUShq+I7u5BCe6Xhyg9Vm1EHKeuDZAdAoT8XDgAQgKLFDaBh4ylv urby/+HYQg8HOYhbvMm/voldlpWdrOwse8o0k67MASGFkcEYpJ3yDKbBiATjbIZDg1l0lm wfHfJCrLSrQYC9gAbaW9bqHYsC2hUN9XZJGk6XBZZaie0RRBzBu7ENrE1TdjYLwHADApDX lgEnJSs8vRuLUIfliURqY55I4+2Y7H1iz/UnHAIZzVPLqGMBCESrQMnqtzQ2Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504168; a=rsa-sha256; cv=none; b=Qw/nGhSRp6Q03G2p3+stcgZBDOOjyfntWlDzSdcI4/OhRM5tXGL7unPqmEVo5BsJGQVzNM bIr1Qw9D/IUPSY6FFFZM9/Hsc9FZZEiIlIXbjDGyGo7LYYSrAn5zL9s5z4GufhqOcmKNxH iThsniNVB1khlf5/QZIBzZ/C+9nr0gPgUulnkRK2cMgENeBhQi6faFxyylJITDEBopI2vP DRi8sKKkbyFU/SyQQf+1Pvxw7eBtDlsQzj/OwyCt05n6R51wfZ8qca/4zFLRwQ1x6bZvq+ IYIDGmBNXjQ5oOwHUy0TJTfPH6f7NxHOTYsFbJM6nfCDzpTAEBDwf/V5ds2SBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=43p8zwPnND/vyycXMIEik3SUJigS7Uhp9FI8aXl/FoA=; b=MyTojZ1knxWm5IZ7z4IVcwuxg8UOuGtPYX2tG/WlawZeMr0FoNwFdAt1MeGVG9vdUU2qeu EtozaFeyCTY6bFDJcB7uHXKw6r5pVvw7dOAriiramozvbQJdzfeWXavD7gaSxNUcWqQ/I3 C0/JP9McYRpLWScQghboPzvtuXpMbO4NPRoTAUDccuHv/lsx3DC9JarxJ9sVKCZwF+pP1k 35HlI5DGgTCCoyAjPC+aZlD5i2O5PYyOOEXbhDyasYHmM3UKH2LvXwZ7d931mRb9zex6Tl I0mYLZyvp6jApbx9SO73e/IDIO4LSjfSTGFAigJ51p/qDJkWbTeCrSjipC4/Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3r3gW8zjXM for ; Thu, 19 Feb 2026 12:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a0fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 1d9cd7040833 - stable/15 - acpi: Use AcpiGbl_FACS even on ACPI_REDUCED_HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d9cd704083329a9b01d7ccb73999cc9b82ce3a2 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:28 +0000 Message-Id: <69970228.3a0fc.1e8c6e4e@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1d9cd704083329a9b01d7ccb73999cc9b82ce3a2 commit 1d9cd704083329a9b01d7ccb73999cc9b82ce3a2 Author: Olivier Certner AuthorDate: 2026-01-09 09:28:18 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:50 +0000 acpi: Use AcpiGbl_FACS even on ACPI_REDUCED_HARDWARE This has been possible since ACPICA 20240827, and is actually a requirement to get out of S3 on ACPI_REDUCED_HARDWARE (that said, we don't implement S3 on arm64 yet). Relevant ACPICA commit: https://github.com/acpica/acpica/commit/79cd933e7b370e8d3fb490bf36ca5d111a12f96a. Reviewed by: obiwac MFC after: 2 weeks MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54625 (cherry picked from commit 0cca6277499febef57149e8999ecd1a42ef1dfd3) --- sys/dev/acpica/acpi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 7d067c880846..04fc8d708a7d 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -647,11 +647,9 @@ acpi_attach(device_t dev) if (AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER) sc->acpi_handle_reboot = 1; -#if !ACPI_REDUCED_HARDWARE /* Only enable S4BIOS by default if the FACS says it is available. */ if (AcpiGbl_FACS != NULL && AcpiGbl_FACS->Flags & ACPI_FACS_S4_BIOS_PRESENT) sc->acpi_s4bios = 1; -#endif /* Probe all supported sleep states. */ acpi_sleep_states[ACPI_STATE_S0] = TRUE; From nobody Thu Feb 19 12:29: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 4fGt3t1Dwvz6QRWF for ; Thu, 19 Feb 2026 12:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGt3s52Nfz3Sy4 for ; Thu, 19 Feb 2026 12:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AvKSP5RT8DWlD/j8cIV7pFI00nZm5KRl9P5SpaP5aW0=; b=If6x3x1aee/4E7CWeIyxC1neM/gjBhNf6lKSIZJjhZF0yLZ29UnDrkkkKcrwHZkfmgdFrJ NbXwUpPyFWkgRMuOTs0VOjLocmElibRafPXESR70i4IK8V+cgNv4GWuu0D+qQTW7ihMvi6 UFYZo+k5RYNqYeQZjAuvb8koxr9dre9mNcDAjRAme13gOIh+5dmffKcMB29I2Z3Di3UWHG k76SjTUBxl+vmf4XipatFkprIFmFDzvXlwwZXdV2Xa/NZg0jxMoUufKd6C2oi0gDhyZsXw DbpZEIQY5ARd42NFXmGeM2+nvI5IvLpsf1tfdMkCfeJ2XEU5Yga4W1ThBPbrpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504169; a=rsa-sha256; cv=none; b=aWhuN7tdth1ZXLp1nz/jLi4nc/p62m12/9CbaR+IsxZPXY5OQyb2LxocovRWLzzPCeH/Fr bTSwKOBAMhpbq04YsNZwWk/vu+LvonpugfYw+3o+EHsVVoPl+uI4QHhrZqmmOTU47w3WYR u9Ao17vMW5dII9p0BE2TH//ZU0c1uYfMAelREpLeTvxEZewCaaEI2eA0YAC2kOtNsGBV+z STp+xl1ntfF5KDM1pUL79ZSwa7pc4FS8tnTrbPD5JOt+Kzmbj79Wqre+dqzn8YNaEj0h/j tsfGsP9/6a0gB/0p9PLFFSbaEvn2juc9ad8QgzYo9EPFbpe9coi258vbN7ukog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AvKSP5RT8DWlD/j8cIV7pFI00nZm5KRl9P5SpaP5aW0=; b=AAA3121pTI7lZjwo8F1D63vgjUW+9qjugilBpwwm0KGQO0N9SZ2cSzl6mM8XMB8hxmucAi JpQmk6rqBixudrXrdzg+PZ+rP/T0RyISr0X+pHG58+Hc6W+sPQCLrzyKTSkcrA3wFxbqLF x0JAiCmfhek3uh+L4ZklJsFLg7xofsSh0hPPhHs1bw/Xsddr4WFZyERnWX8DHOa1kw3nsy sMmZEckBF57aq8qamVOdXRraz2/1TXdub+VrJwjg6MWSDU+CTg3Be7TKvgVR3xKjHBJ0OQ iWOWHv0bejMzaFd2ytxySuZAUMpURpfuBeSM6d96zTmExePgKMXotcYycVjDSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3s4T0XzjXN for ; Thu, 19 Feb 2026 12:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37975 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 30f803f2898b - stable/15 - x86: x86_msr_op(): Move setting mode up, delineate logical blocks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 30f803f2898b019569cae617116f1d9d910446df Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:29 +0000 Message-Id: <69970229.37975.1a263376@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=30f803f2898b019569cae617116f1d9d910446df commit 30f803f2898b019569cae617116f1d9d910446df Author: Olivier Certner AuthorDate: 2026-01-22 14:22:01 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +0000 x86: x86_msr_op(): Move setting mode up, delineate logical blocks No functional changes (intended). Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 (cherry picked from commit 7acd7ac6385c783699a64216198d7f2e244cc3b4) --- sys/x86/x86/cpu_machdep.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 067374be4941..b0763d7bd98e 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -161,16 +161,18 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) u_int exmode; int bound_cpu, cpu, i, is_bound; - a.op = op & MSR_OP_OP_MASK; - MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || - a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); exmode = op & MSR_OP_EXMODE_MASK; MPASS(exmode == MSR_OP_LOCAL || exmode == MSR_OP_SCHED_ALL || exmode == MSR_OP_SCHED_ONE || exmode == MSR_OP_RENDEZVOUS_ALL || exmode == MSR_OP_RENDEZVOUS_ONE); + + a.op = op & MSR_OP_OP_MASK; + MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || + a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); a.msr = msr; a.arg1 = arg1; a.res = res; + switch (exmode) { case MSR_OP_LOCAL: x86_msr_op_one(&a); From nobody Thu Feb 19 12:29: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 4fGt3v1RjLz6QRNT for ; Thu, 19 Feb 2026 12:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGt3t5dq2z3Sw3 for ; Thu, 19 Feb 2026 12:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8p+Bc80p33gpaOWmUa9Lw5IzvO4G+GKhGScdfHUEeVU=; b=lgoslwRtIyOh/UAQF6XsFp1B+1RSACEj1UXFzrx+lSU7m0dFs15ZQPFLoEUIA5AT62dYhu cVoX1vsHHCskF7k2dd5sKs79vf5nVerouSOvf4nAJS1P4fgRP3LmEwBWoe5NM+su8wylwQ jyFWePlcU9WAqnurYJmF0li+xLAoJqO1uM1mq5SUjgTEvM6qeWpsa6P66on4E85pCN5DMV d+OU7dAD2TBxYjLx1PkuvYvOL1sLUs7bmWPMpQaU3nUUrBhMS+IHBp/UBBkwN5KbpO0Lwa C/jbzGlIliZssEF820reIwdpcuowRjKdtJ9kQETSn8KNfuWfqWynSuV32EMM+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504170; a=rsa-sha256; cv=none; b=Wgw1DLkXdeSQWZ8gUNfygS2UtJEFEusyY+kqKOhr/XDCaklBD4dbRmKaoRWTrtNCtdUubl LQC+Ax26kJN4gR155rue4/6GPP6hi2WRZFWXoE/G6VY6cErui+r/jvf/H7w77xS59Zr6k6 azb+ldeEuzqKoTW20Sh6+SlSAwIMjLBa/ParsS70m180NZHZTF8AAEDAv/W0lqwgxt9Q5g XSYxCKNYM2ur3NJJxgjFH/9WtgLiFy1J2UjMlgqRCF0BchmqlLAc6KaoONCQSa8LVDdfAQ kDWh/8jZ0pahrBMlzw6r/6mg3//bhhRVge8EukedSM7FchtodCP7aJeC9QeT1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8p+Bc80p33gpaOWmUa9Lw5IzvO4G+GKhGScdfHUEeVU=; b=jp8jfy70jBsUXjhAK7a7+ZqvIO7ueZnHcp4gtRYPgQafE1odFCRzDILn5J3/g4PtkqsJR7 KuEEFgmymCRCe0hR/Vfw5WXlrfXSRg4RcDLJIWx74JxG9AnVtgOs9pIfDECVhuOjWz9MdR u8MGQLYOkvcIkVO6JsvUWZkWrqkV1fMk9xy8z4KghnhNGUlJC7nnoVP5+MfNvHks6Yy6PD onDsHOPKygvQZWc0viCFZBjH95vhuWirSMDAKcfDtJCGrXYDrDkCagylUjE+VTK5tKXCBL O0VZMrORU4Hpv+n3/FmSuOjZ+gosewFl+vgrcaoyZWeDU05TwGpVt4SS7jTgPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3t5DCvzhqZ for ; Thu, 19 Feb 2026 12:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 314aeea9f688 - stable/15 - x86: x86_msr_op(): Simplify assertions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 314aeea9f688865d4852efbe938c4ecfb04ea338 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:30 +0000 Message-Id: <6997022a.3a4c0.7a501f2b@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=314aeea9f688865d4852efbe938c4ecfb04ea338 commit 314aeea9f688865d4852efbe938c4ecfb04ea338 Author: Olivier Certner AuthorDate: 2026-01-22 14:37:00 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +0000 x86: x86_msr_op(): Simplify assertions Simplify them by moving them into more natural places, i.e., default cases of 'switch' statements. No functional change (intended). Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 (cherry picked from commit a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9) --- sys/x86/x86/cpu_machdep.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index b0763d7bd98e..5cbcb40540bb 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -145,6 +145,8 @@ x86_msr_op_one(void *argp) v = rdmsr(a->msr); *a->res = v; break; + default: + __assert_unreachable(); } } @@ -162,13 +164,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) int bound_cpu, cpu, i, is_bound; exmode = op & MSR_OP_EXMODE_MASK; - MPASS(exmode == MSR_OP_LOCAL || exmode == MSR_OP_SCHED_ALL || - exmode == MSR_OP_SCHED_ONE || exmode == MSR_OP_RENDEZVOUS_ALL || - exmode == MSR_OP_RENDEZVOUS_ONE); - a.op = op & MSR_OP_OP_MASK; - MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || - a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); a.msr = msr; a.arg1 = arg1; a.res = res; @@ -219,6 +215,8 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) smp_rendezvous_cpus(set, smp_no_rendezvous_barrier, x86_msr_op_one, smp_no_rendezvous_barrier, &a); break; + default: + __assert_unreachable(); } } From nobody Thu Feb 19 12:29: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 4fGt3w3pzdz6QRRQ for ; Thu, 19 Feb 2026 12:29: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 4fGt3v6cXjz3TDd for ; Thu, 19 Feb 2026 12:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=de+tmP6NdzfLniAx9D+k8iM7HM8uWb7KhjJUj2bn4UQ=; b=CZ0N8mQgYiyc1rW2mTE/5gdEW3P3Clai0L0Q/E7yFgmrvCbK7cwFcvf41Dtyeg37gS0GIg wNqpvw1g59myvl0dIssDc5XgAy5Moj2ZyQziA5ohTHTOcKlcJZHeXvdd9vmNAgIrM0LcTX sFIMauXm5+j8dC/w3lPWLWAg9fHae2/629pwuTdLVvVkKQEHXl020QOhkbRRTAYJHpVaJg WAW9/1UNZ+epoF6jX2ndr/dv5XzBLRmKLJefCFcF4eywjqIFC0zvGBXLhyW1s5LO/aDs// XXXJCnYSebB4xRkC6Fv0SPGMEM7msJOsJe8CQWCBnqCW4ijNfdvJEJ0oS9tr+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504171; a=rsa-sha256; cv=none; b=XOsgGDRcpc4lfwaJ/Uu2ks9TTlLcnZAMPIt8KeZsYNCIplPQuRDp4s+u/JsIk7cipyPAJ8 Up4o8O9VqCtPEFIy9XfzAwcZcSef+lo6+Oxm4IDEZXlA6XPATGT/vh0YH8p32XPy+DH08M 7yBZdOUKw7qeXbFhOzdF2fqA1WrCOHEC9lz7jSwwRvEVqIS/AS6RrJgLYxmkZONlYIiEYt +s0J7V1dryqENAMvBkvBK035p2BDDLrgWZVohly63z5zxbNbdq3HN1w0I8MRrUvgRsw6WZ YW0CWdYQ9M2LM/YE7oOxBULBWeJtjHiCEz30LApWLTqj6tmuV6bofYX4Zm9SEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=de+tmP6NdzfLniAx9D+k8iM7HM8uWb7KhjJUj2bn4UQ=; b=a66kosQ7XR7KOuEUScNrAS6SH2Nwwphlq0V2pz+iFjh9KxMQEV5DHRX0B05MixC3grXGP2 3jd37ngsJCm5EoKgRpcYrUm1gejWp4CIEeR8VJnU5mdZruYiPIqW7BG20MeM3i/oW/BzTc huIr9+wO3/nsTtzxRhl5bbjakDbFQ6W8MOX28rGuavfq3oX5mlSvxTHhh/ypY34kzPnmRv 6j0xqRHim743yGcu1eA6CTAV+sZ6oqXNuTveRCvf9n6FAyKqm56csVpCzh2FnNM9awBfuD fVTIWWlN2dOUYetOBW7GtcijDUv7t/hekDtCZDabw6dAGFpcRbSl6jE76nEeQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3v64qvzj22 for ; Thu, 19 Feb 2026 12:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9f48e72c350c - stable/15 - x86: x86_msr_op(): MSR_OP_LOCAL: Disable interrupts on atomic ops List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9f48e72c350c941052a3dc8d09bc4be3704a5d44 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:31 +0000 Message-Id: <6997022b.399ba.689988bf@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9f48e72c350c941052a3dc8d09bc4be3704a5d44 commit 9f48e72c350c941052a3dc8d09bc4be3704a5d44 Author: Olivier Certner AuthorDate: 2026-01-23 20:52:46 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +0000 x86: x86_msr_op(): MSR_OP_LOCAL: Disable interrupts on atomic ops On MSR_OP_LOCAL and non-naturally-atomic operations (MSR_OP_ANDNOT and MSR_OP_OR), there is no guarantee that we are not interrupted between reading and writing the MSR, and that interruption could actually perform some operation on that MSR, which would be lost. Prevent that problem by temporarily disabling interrupts around MSR manipulation. Reviewed by: kib Discussed with: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 (cherry picked from commit e5f8cbb86d58f25b5ff168506b78d09dca266fb6) --- sys/x86/include/x86_var.h | 2 ++ sys/x86/x86/cpu_machdep.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index 701b982e6afb..215fe0562465 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -171,6 +171,8 @@ uint64_t rdtsc_ordered(void); /* * Where and which execution mode + * + * All modes cause execution on the target CPU(s) with interrupts disabled. */ #define MSR_OP_LOCAL 0x10000000 #define MSR_OP_SCHED_ALL 0x20000000 diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5cbcb40540bb..5f8965bd5614 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -160,6 +160,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) struct thread *td; struct msr_op_arg a; cpuset_t set; + register_t flags; u_int exmode; int bound_cpu, cpu, i, is_bound; @@ -171,7 +172,9 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) switch (exmode) { case MSR_OP_LOCAL: + flags = intr_disable(); x86_msr_op_one(&a); + intr_restore(flags); break; case MSR_OP_SCHED_ALL: td = curthread; From nobody Thu Feb 19 12:29: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 4fGt3x1b8xz6QRWM for ; Thu, 19 Feb 2026 12:29: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 4fGt3x0BRrz3TDt for ; Thu, 19 Feb 2026 12:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCXPf/1RneENWhOClMjuUr6HJl3rhbmC/naZroUBrkE=; b=vnPsctFn2HUbzlNnmXtbXSpvgIAKgPg/xDnpf0YmU4JoIsMhYp+h5t+Vaqld1avktOODnV hQ1CPODf1SrwkPVnHMxadxMQiFCiEWGWk8QI7bW3BpUH1Z4bOLnqroKfHKDKyTCCHnLIoF gEodtHQTrzj42Cac26NnhhkvG2P78k89jReVAoHsZIR3ThcaajZKA783CgjG86O6ZHLcwf etintPB/QIxAy+Ta06SZXScyHoT7j0he66JNLnjJRCunu6D4D2tH56DaXNdUu/n8Mp+c2Q v0v3gQB0bNuGWZHAm/wn3hcZ2dTIpUETRNiSm9lRG1b8OlAMpy4M6wQIEMG7Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504173; a=rsa-sha256; cv=none; b=kHpohtr8WntCx4F8UYVGRB9IBrz6JEAE5u9jNgnmAI956k04DsOX5+JsQCx4UXIWtHrHP2 Grccoq0CzYxuZUvAdpnaOshlymgvN7btCbO5u66xO41wuyqaZmT6wXdzSwVWiOHAFKleh1 g8ub9j/TNEYbmwF/ju0DwHC7+MgSxxAXlBLjB6JSAb4kb78du+ZTSsFhyuvga1S9Buy+b1 YVk3E0ZvQIz+bHsqOG0ihX689yTzH84m8laveKcfzZG71RQQ3lhPA9luJbKISTRId2YOOd toh+1wsQ3QZ05BZDHUAcSzx41hDHBmQuyp4OlVI6MyxHNv7DEPG8s1bjqI2fIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCXPf/1RneENWhOClMjuUr6HJl3rhbmC/naZroUBrkE=; b=tqJbxk3pldK0g2epNYdzvr3CaX+GD3h6KlxMkzQezaVMunls3HwOqeNVJKylVIt/IHEUdV bqXgXAQdR1RQyPqszip+4g7o3nZcHWixTnysmcHT95Z+XjTTgfV0YxvvOcvyd9FQBc3Dfk lhWIrA7yAEWzHMgC8FdZggVczbatcVdn4WTKqGbR5s7d7gmniPjOf8fGcBt4wAONFTzJkh r4JSdWWtaBZ77g8SwemoxsTvfVFyEUgYceiFOFZFkaPtO5g0guqPmCf3+6FPejZqYi80tf o4ct4izc+fue3EoSR4Vnb4auTrr+X/M1gzf1Q4apSQQzfuAyGi5v6UQQbfrPlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3w6ry4zj23 for ; Thu, 19 Feb 2026 12:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a600 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 6bc5a7cd9c4e - stable/15 - amd64: parse_memmap(): Move comment about size at proper place List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6bc5a7cd9c4e6b54c6329b9358874d5276cadf41 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:32 +0000 Message-Id: <6997022c.3a600.ab726be@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6bc5a7cd9c4e6b54c6329b9358874d5276cadf41 commit 6bc5a7cd9c4e6b54c6329b9358874d5276cadf41 Author: Olivier Certner AuthorDate: 2026-01-30 17:33:12 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +0000 amd64: parse_memmap(): Move comment about size at proper place While here, declare 'size' only in the relevant block. No functional change (intended). MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 53bb02015fce72c79498842b898faefc2da3b0fb) --- sys/amd64/amd64/machdep.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 20d221279bd3..2af7f1151208 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -828,15 +828,6 @@ native_parse_memmap(vm_paddr_t *physmap, int *physmap_idx) { struct bios_smap *smap; struct efi_map_header *efihdr; - u_int32_t size; - - /* - * Memory map from INT 15:E820. - * - * subr_module.c says: - * "Consumer may safely assume that size value precedes data." - * ie: an int32_t immediately precedes smap. - */ efihdr = (struct efi_map_header *)preload_search_info(preload_kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); @@ -849,7 +840,15 @@ native_parse_memmap(vm_paddr_t *physmap, int *physmap_idx) add_efi_map_entries(efihdr, physmap, physmap_idx); strlcpy(bootmethod, "UEFI", sizeof(bootmethod)); } else { - size = *((u_int32_t *)smap - 1); + /* + * Memory map from INT 15:E820. + * + * subr_module.c says: + * "Consumer may safely assume that size value precedes data." + * ie: an int32_t immediately precedes smap. + */ + u_int32_t size = *((u_int32_t *)smap - 1); + bios_add_smap_entries(smap, size, physmap, physmap_idx); strlcpy(bootmethod, "BIOS", sizeof(bootmethod)); } From nobody Thu Feb 19 12:29: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 4fGt3y2Y9zz6QRRS for ; Thu, 19 Feb 2026 12:29: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 4fGt3y1SrRz3TBN for ; Thu, 19 Feb 2026 12:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lkzTNudMAqnF/C4UJn4lWWpQ7IoJlXhgxbQ7/GSGnvY=; b=xABAZ35TI88GZqMPdyC9eA1fsT7LTValbPBqQv1P3bpGqDeUJODaKdy+nxI8Y20rGgWglM KqemlGGRBrjABaXmqYQ+2xyyPtAwkGoavLP4+6XJVt9F67UNFXgqNME9Nu5ReW18crCd81 fQ0EYuiARibZFLuqON8mOApfJc6CytKWb7a5oNkcCAMbweFggLeFoWja3a/nheptTttR5X ezvbyjxPJdhO3GNZSIPm3wpm/yewvBNvNKOjp90utvDvQO5NKZWi3ebVD+NfXwZxv3XivK B2v+l8U6HIxDgcswusbuKkKI2/fZCNEWk4gtn29x8BVAJhoRajrbUbYltrtLyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504174; a=rsa-sha256; cv=none; b=Lw5h7WiqKazWiFjEFauc9ALu14maruqzmSsVkoEfUrLI8WFq2hFqdS+6FlUSvuddZk7G/8 4v93VIfB5ZFfDB0fCRb0MG4gA+BZjIFZDqR98m5RyJ5/0JP72cPG1rQFAmrLjGJr1Xyj70 KDRveo2af8B6Hdgd8UISIryWi7C3i3iAbe+qq68lh/K3+pgYWOphigCUzF6VFYmKypfWoc b7HFXVfphKydWXf27RO5IFomKqcViI5mJKwxTcpcHPB1q6p9cnFIJkS8G1RCpPxokC8d/a 3fF4kuRnYjadlDZMaEayQr+lH5WXlctwxQGJn284BYhwRjltNhnMYqMiKv+2OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lkzTNudMAqnF/C4UJn4lWWpQ7IoJlXhgxbQ7/GSGnvY=; b=iiR0yzVxFU1QUSUoqJ7DAOMZzhBRrxQ5wS6rjdg1s71QoecPpPV3q66QhrUHySPzX5cI9V M/fb6ZMfn1rTVJd/Tnxh6rKMGfETQXB3reoP3IIouPItYsKeZs2XxSB+0fCvdwWCgjr9UN hDbPpUJPQS5BIf1GskLPKKqU96HHpWg9tiAQVMhsBRv3BuMvEHVldYgxOfxfnCeVfsVJou AuVmMSwOb7fgvo6oSwyXv55E6PZky2Tu2Y4/UAlXPpXtVDmEMrgXQvkQO0gVqZAyqQBQeV oCjqDhNC/pRLrV2ZBKJSaj27kGPvHk1zBSUzWOS6TAP9GMaJ3pX1dwzfpS7yIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3y0YkVzj24 for ; Thu, 19 Feb 2026 12:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37b7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 13f0aa2ad825 - stable/15 - sysctl(9): Booleans: Accept integers to ease knob conversion List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 13f0aa2ad8254c8b0c5f3e9f3c1a8a98d5aae071 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:34 +0000 Message-Id: <6997022e.37b7c.363a4d05@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=13f0aa2ad8254c8b0c5f3e9f3c1a8a98d5aae071 commit 13f0aa2ad8254c8b0c5f3e9f3c1a8a98d5aae071 Author: Olivier Certner AuthorDate: 2026-01-27 09:45:03 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:52 +0000 sysctl(9): Booleans: Accept integers to ease knob conversion In sysctl_handle_bool(), if the output buffer (for the old value) has room for exactly 4 bytes (sizeof(int)), then output the current boolean value as an integer rather than a 'uint8_t'. Conversely, if 4 bytes exactly remain in the input buffer (for the new value), treat them as an integer and derive the new boolean value from it. Doing so allows to convert existing integer syscstl knobs that are interpreted as a boolean into true boolean ones while staying backwards-compatible. That brings no drawback as no code currently uses sysctl_handle_bool() as part of a series of calls to sysctl_handle_*() functions for (de)serialization of some compound structure. If that case ever materializes, it can be easily solved, e.g., by creating a sysctl_handle_bool_strict() variant. In the future, we might want to go further and generally be more liberal in the external type of integers we accept and output, by tolerating any kind of supported integers (8-bit to 64-bit), enabling integer type changes of knob's internal representations without breaking the ABI for consumers hardcoding the passed integers (instead of relying on sysctl knob type information). Reviewed by: jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54925 (cherry picked from commit 406da392ef8d77b39fe9bfd36bdb440eb3e5ae0a) --- sys/kern/kern_sysctl.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 25da134661e9..dbe509b3e8e2 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1619,8 +1619,8 @@ static SYSCTL_NODE(_sysctl, CTL_SYSCTL_OIDLABEL, oidlabel, CTLFLAG_RD | int sysctl_handle_bool(SYSCTL_HANDLER_ARGS) { - uint8_t temp; int error; + uint8_t temp; /* * Attempt to get a coherent snapshot by making a copy of the data. @@ -1630,16 +1630,44 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) else temp = arg2 ? 1 : 0; - error = SYSCTL_OUT(req, &temp, sizeof(temp)); + /* + * In order to support backwards-compatible conversion of integer knobs + * that are used as booleans to true boolean knobs, whose internal state + * is stored as a 'bool' and not an 'int', if exactly 4 bytes remain in + * the output buffer, we assume that the caller expected an 'int' + * instead of a 'uint8_t'. + */ + if (req->oldidx >= req->oldlen) + return (ENOMEM); + if (req->oldlen - req->oldidx == sizeof(int)) { + int temp_int = temp; + + error = SYSCTL_OUT(req, &temp_int, sizeof(temp_int)); + } else + error = SYSCTL_OUT(req, &temp, sizeof(temp)); if (error || !req->newptr) return (error); if (!arg1) error = EPERM; else { - error = SYSCTL_IN(req, &temp, sizeof(temp)); - if (!error) - *(bool *)arg1 = temp ? 1 : 0; + /* + * Conversely, if the input buffer has exactly 4 bytes to read, + * use them all to produce a bool. + */ + if (req->newidx >= req->newlen) + return (ENOMEM); + if (req->newlen - req->newidx == sizeof(int)) { + int temp_int; + + error = SYSCTL_IN(req, &temp_int, sizeof(temp_int)); + if (error == 0) + *(bool *)arg1 = temp_int != 0 ? 1 : 0; + } else { + error = SYSCTL_IN(req, &temp, sizeof(temp)); + if (error == 0) + *(bool *)arg1 = temp != 0 ? 1 : 0; + } } return (error); } From nobody Thu Feb 19 12:29: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 4fGt404wQ0z6QRbp for ; Thu, 19 Feb 2026 12:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGt402nzBz3T2R for ; Thu, 19 Feb 2026 12:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QaDPp5bySigr2ivzfkI3RdR0u9koS1CCdXs/C/Yw1Q=; b=ujGNPa98oq3Sy46mIvypCAsZJvajsMxA3y/E7t9GB/EcnFog2lxUmJ12LxCTDwbsyZMela exGNbtKdyDuCIMfIEbcRIBDzbh4rWs6qU4LvnpNFGAhSddo007uZ/5z1YGgljN7AyuzizR X4dkQk6C9OOOE6Qo7+kPhFXNUHasQ5lvZnb5gGdsPhW5cW/aw7PZCSfyUnQBbDpliNwMBc +L91gwpwLIPOshkTxMi3qxh9Mh79VoWVK/yAO4FbyJ9kdPgHqtxWJWf3A+U+hzf62Hh69u XTo0lnDnxll3koUsRVA35CG7BMdU/juiK85VHBA9tkc2JSkkyagxqvQoOI+vKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504176; a=rsa-sha256; cv=none; b=SZxa0DHukLyc68hdNahTqcjTVE86mEnGWlSBCO0NjJgwAUQiA/5G+oxugH0n6ZxwX4GBbj +LFczOhiZYm5hLi08VFl8phbPW81+oRUv45DeK96F7UlsD2hra/mWiaVQBOBIZVc4Az9BE 8NRGVdNsjt7W50jbvqDm8ZB+h7dCqDu/mjRD0ShcwzAjXf6ey8NjhBkNp6wwdgOfNI8pMA HxznncPCCDqY1RiOtBaRo2p+aiTzq8InK2KBTAi+/aP5puAo3POrorlK4Thxc8hTD44HXq bls9mcN43yXJsA27AJANdrE05YtsqARsCveGJZG25ugoj/KEAsA2HgYMONeERg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QaDPp5bySigr2ivzfkI3RdR0u9koS1CCdXs/C/Yw1Q=; b=ZV3S4Qmux0ZGV9UgZolrdVU4AVepK/SZKGoS/2C3fHMcvSGAqqJbVsQS0ohQnRaO9/D60w ztIfSG3Bp+liCsde18cNF6jSalBs4fwSJf5uDJLe/kcPhdR4MR1xEXPGGXcDDxT0/jrGbd i3CyWZ3u13obLKzccPxIki3A27wb3UeQnoQsl+ZZR7av/bc/7m9lTqfIoHw/EOCmqmimsg Mw+hD1gNbTz84z30pIQaP3xBtdozpJvogec7U6CFAIdE3EKl1pIsMUeZCkT8Ebay4ajIgw FLpUGIplLzt5tUd/wZRylB++qGeOsRRc5QbhMeNaUaQhy0qFekifbX1Wwz6ezw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt402CJCzj7G for ; Thu, 19 Feb 2026 12:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a1c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 0db846a9697e - stable/15 - asmc(4): Stop building it on i386, as it supports only 64-bit chipsets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0db846a9697e09c8eb102f2b2331f4b2ddeaba93 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:36 +0000 Message-Id: <69970230.3a1c1.5684c867@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0db846a9697e09c8eb102f2b2331f4b2ddeaba93 commit 0db846a9697e09c8eb102f2b2331f4b2ddeaba93 Author: Olivier Certner AuthorDate: 2026-01-12 09:37:24 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:53 +0000 asmc(4): Stop building it on i386, as it supports only 64-bit chipsets Reported by: ngie Fixes: fde9fe18219f ("i386: Fix kernel compilation after introduction of ASMC_DEBUG option") Sponsored by: The FreeBSD Foundation (cherry picked from commit 8342d9f7b5f13d0623861cb8b88caf10a15571f6) --- sys/conf/files.amd64 | 1 + sys/conf/files.x86 | 1 - sys/modules/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index a342242ac66e..ace100a1de31 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -110,6 +110,7 @@ crypto/openssl/amd64/sha512-x86_64.S optional ossl crypto/openssl/amd64/ossl_aes_gcm_avx512.c optional ossl crypto/openssl/ossl_aes_gcm.c optional ossl dev/amdgpio/amdgpio.c optional amdgpio +dev/asmc/asmc.c optional asmc isa dev/axgbe/if_axgbe_pci.c optional axp dev/axgbe/xgbe-desc.c optional axp dev/axgbe/xgbe-dev.c optional axp diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 31b8e88a6951..b1bd6f7291ca 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -67,7 +67,6 @@ dev/amdsbwd/amdsbwd.c optional amdsbwd dev/amdsmn/amdsmn.c optional amdsmn | amdtemp dev/amdtemp/amdtemp.c optional amdtemp dev/arcmsr/arcmsr.c optional arcmsr pci -dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 27b96d68a94c..204f604166e0 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -786,7 +786,6 @@ _amdsbwd= amdsbwd _amdsmn= amdsmn _amdtemp= amdtemp _arcmsr= arcmsr -_asmc= asmc .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _blake2= blake2 .endif @@ -845,6 +844,7 @@ _x86bios= x86bios .if ${MACHINE_CPUARCH} == "amd64" _amdgpio= amdgpio +_asmc= asmc _ccp= ccp _enic= enic _iavf= iavf From nobody Thu Feb 19 12:29: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 4fGt3z5TRWz6QRT0 for ; Thu, 19 Feb 2026 12:29: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 4fGt3z2BBmz3TKZ for ; Thu, 19 Feb 2026 12:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vTrk3mqiAynG828UsaOdEatVdSB7f8iy01Ijl1Iwgw=; b=xdNAljMfLqb8objXvExb9o+5Nz+JwhRrJgnWSwFwV+/eVXOC+K4gmOSgW72pWm2Np/fqdj H17FH6xiB9NoQb0QjLVaA3KMIxPMlkcbx7g0f23NtKwC/dztMcaU5Sr9PyWHswcFxGLUmm ZWCO1QcAa2nkdQcD4j9+r0Z6If+8WWTz/bakSnmcKDTTAGtVdv4AiCE1qLgdQQSGWlMGFW 0HkbUERpHHeBuxJSgCIyyOg6hH5IM0JFZN71xuWHdpKRWla1IUMCWXr2fvcMmcXzSCovVy mj9o8KWy+Fw9OQyhOPbE5QfAlk2fgnBBenwm1vBbmr1Z4F/aRIVhtrCyQ8qg3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504175; a=rsa-sha256; cv=none; b=p0UbPDqAs4aKOgd+c18d8nWW0W+3RCCrNTBR8DpmGC7sDIO7NoVQONd9VRQd/4GkJfyN0x adg225hcoV/V9TwfoMNmJ9K726ud5iXzinOErfwUSOhrcZ7KhzQgajfJrqPgFpS6Jc1ZUV kYjT+XDFzlFm4LfZalT5RQqXTMolsozJzxIh2ry1xbBrAC9RPAa/bUJ3jkaECjh9IsAI5u crYN+nsDTs71qyrRXcYDKy+cymq+H5pmfgSfXZUdH8hITXcWpZSzrdp/GpaDrpptcQ466q AAZsC/y5MmBEZQG9wqbHUUOHZasa8Vi7T8a20u2GoSSDHZhjGY65y4b1yBhsbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vTrk3mqiAynG828UsaOdEatVdSB7f8iy01Ijl1Iwgw=; b=YNF0edh9bxUHzjoxDxbPwqnYnQGezpyHi1ZNYWcMg2svCTUipMsq4+9b68BT6eGwzw6dyf XLVmi0HoZmo2dGB3a7JC3/nniW1bZbAglVqzUhSnWiDhitVCddxCEGQeoNh6xt2wgyIGvb IZBSK0nfTtVoF/D52DGQbeJIAFB8SuNq15Io4+kQVeMr2irTyALsaNdVUO03LSarXzH8Nl OOcZAKMqWlLR2Aj+DQCHI6R7vV820pUeovS0WrXMrNCDSvh7Q3L/GdhEKnShzwqER9bTNj Q6v0pRddzSsTYbn4MQzlyZIIkwcpv4hKg8avtvFdIySTW2djfOOQ+irYG43U4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3z1NzMzjW7 for ; Thu, 19 Feb 2026 12:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 27b76413615a - stable/15 - sysctl(9): Booleans: Fix old value length discovery List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 27b76413615a298d4aa2ae71bd98fbe116116db2 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:35 +0000 Message-Id: <6997022f.399be.36dd29c5@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=27b76413615a298d4aa2ae71bd98fbe116116db2 commit 27b76413615a298d4aa2ae71bd98fbe116116db2 Author: Olivier Certner AuthorDate: 2026-02-03 22:25:46 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:52 +0000 sysctl(9): Booleans: Fix old value length discovery When calling sysctl(3) with a null 'oldp', i.e., length discovery mode, 'oldix' can be equal to 'oldlen', and we should not fail. More generally, let SYSCTL_OUT() and SYSCTL_IN() handle corner cases, simply removing the comparisons between 'oldidx' and 'oldlen' and 'newidx' and 'newlen' done by hand as the test just after is an equality that does not require to know if 'idx' is smaller than 'len'. PR: 292917 Reported by: cy Fixes: 406da392ef8d ("sysctl(9): Booleans: Accept integers to ease knob conversion") Sponsored by: The FreeBSD Foundation (cherry picked from commit 895e1c6567d9561c86f8d20b47e924911bce989e) --- sys/kern/kern_sysctl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index dbe509b3e8e2..be0acb0a4a55 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1637,8 +1637,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) * the output buffer, we assume that the caller expected an 'int' * instead of a 'uint8_t'. */ - if (req->oldidx >= req->oldlen) - return (ENOMEM); if (req->oldlen - req->oldidx == sizeof(int)) { int temp_int = temp; @@ -1655,8 +1653,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) * Conversely, if the input buffer has exactly 4 bytes to read, * use them all to produce a bool. */ - if (req->newidx >= req->newlen) - return (ENOMEM); if (req->newlen - req->newidx == sizeof(int)) { int temp_int; From nobody Thu Feb 19 13:45: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 4fGvm56dpvz6RJXx for ; Thu, 19 Feb 2026 13:45: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 4fGvm53nbmz3htZ for ; Thu, 19 Feb 2026 13:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvub3BWvRZzAlKNISWbxVCdVPPZIbMGLGFiLfrr3Ffk=; b=xrnePAYC1t2jACGC1jv38sdi5KLeLH5rQZiL+TD0WjighImSHEYPnAL3XqnoGV9hqLoTk4 DcJVdLCzCD8yZWQqhje0WJgwKeMpVhlO8r6dEOJ0J7yHHv5N698ZpuE7fTV8N6oOHdGQu0 GtSZNZwGOjeVSHeH5jiDIX07/YJzwRO084t/1iVzFIGHk8WUTBu2Ushm/ebXDord5WZpWe LU4mwvlRj3ehdOb0sgOoPFBRLUYSfQZQ1CA+BfN7BMTnB1VCgvF5tN7JPjCBk6DexynU6u Etun63Odpm2nlmgZUqaydKr+WmbZo2kCjv8a3cfk6Y3aMcu/4/l5LTTERqqpZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771508757; a=rsa-sha256; cv=none; b=rxOeeCKSec9BvDwLQ5wSDPL1m+RZipMye4gWPTKV9u14fUjHYwgYceUKL4S0MUsKm3yOjH e049ORa7uCCQmyTEFEY+kFmtxyPzAG78xg53K0fQheEfjjqu31GrV2+zbaexqeDqlFGC46 eXcA9DP7W4asU1JXUZ6yOsOetIkeLc2l7m00U6PY+zD7QlNKuYvTWdf9Ur5SLALpraA6cG Zoki6McyDYeOWXSgSml0+WqMWT8MwX7hnXgCZeCb93tCP2efSOhJINuwAUHhenuPogBbY1 PVI9lnsKEZMQu+Ze4Ulsr51sXuZZQYJITQTNpGXsY+ItI+YJWIjlGTiGR/nF1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvub3BWvRZzAlKNISWbxVCdVPPZIbMGLGFiLfrr3Ffk=; b=lz1sBsilY3mz8hnxb6S9t5tSQFfVpmg4T/buwci8id8P8oCs3+galC07quNiBITgG0pY8c f3vi2HIfoMDiHb8HFXCqgpa2ApBqqBxUZNE/Lrv2Et2ZqDsXnmiRz7HhUjK1zmK3ZcCE7q eo8B6QW6fZNyJQd9tHO6gg5hPthFUm/MTekfNP8nJ50JJ0LSX6u0JR0ZGsf/Ts6LFvlVoj KeL1I5HKsK7D2mzLYBfg2GS6mAGavSmL6SBCooRvgb3J+ZWhjh+HNKp47XXzynz5Qg3hmm JxH1Vt7UKvm9i6iAosv5vOIjJ66OtDDGgJiWLUtyEzb7cjxqwFryqUgkABWKLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvm536Y5zlf6 for ; Thu, 19 Feb 2026 13:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f67e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:45:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3522eaca6366 - stable/15 - ObsoleteFiles: Deduplicate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3522eaca63667c20af5da3ea626be11b717a3ebb Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:45:57 +0000 Message-Id: <69971415.3f67e.3685d3a6@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3522eaca63667c20af5da3ea626be11b717a3ebb commit 3522eaca63667c20af5da3ea626be11b717a3ebb Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 22:58:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-19 13:45:19 +0000 ObsoleteFiles: Deduplicate Since we dropped support for profile libraries, all optional entries for them are now non-optional. Most of them were already duplicated there, a few were not. MFC after: 3 days Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55329 (cherry picked from commit f9f4a022a8583763903771915eafcd064184766a) --- ObsoleteFiles.inc | 3 +++ tools/build/mk/OptionalObsoleteFiles.inc | 41 -------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 7067dab2ad03..e3bc68bdb541 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -346,6 +346,8 @@ OLD_FILES+=usr/lib/libalias_skinny_p.a OLD_FILES+=usr/lib/libalias_smedia_p.a OLD_FILES+=usr/lib/libarchive_p.a OLD_FILES+=usr/lib/libasn1_p.a +OLD_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c_p.a OLD_FILES+=usr/lib/libavl_p.a OLD_FILES+=usr/lib/libbe_p.a OLD_FILES+=usr/lib/libbegemot_p.a @@ -354,6 +356,7 @@ OLD_FILES+=usr/lib/libbluetooth_p.a OLD_FILES+=usr/lib/libbsdxml_p.a OLD_FILES+=usr/lib/libbsm_p.a OLD_FILES+=usr/lib/libbsnmp_p.a +OLD_FILES+=usr/lib/libbsnmptools_p.a OLD_FILES+=usr/lib/libbz2_p.a OLD_FILES+=usr/lib/libc++_p.a OLD_FILES+=usr/lib/libc_p.a diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1cf8b44eaca3..f0d276b45adb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -166,7 +166,6 @@ OLD_FILES+=etc/blocklistd.conf OLD_FILES+=etc/rc.d/blocklistd OLD_FILES+=usr/include/blocklist.h OLD_FILES+=usr/lib/libblocklist.a -OLD_FILES+=usr/lib/libblocklist_p.a OLD_FILES+=usr/lib/libblocklist.so OLD_LIBS+=usr/lib/libblocklist.so.0 OLD_FILES+=usr/libexec/blocklistd-helper @@ -185,7 +184,6 @@ OLD_FILES+=etc/blacklistd.conf OLD_FILES+=etc/rc.d/blacklistd OLD_FILES+=usr/include/blacklist.h OLD_FILES+=usr/lib/libblacklist.a -OLD_FILES+=usr/lib/libblacklist_p.a OLD_FILES+=usr/lib/libblacklist.so OLD_LIBS+=usr/lib/libblacklist.so.0 OLD_FILES+=usr/libexec/blacklistd-helper @@ -237,11 +235,9 @@ OLD_FILES+=usr/include/sdp.h OLD_FILES+=usr/lib/libbluetooth.a OLD_FILES+=usr/lib/libbluetooth.so OLD_LIBS+=usr/lib/libbluetooth.so.4 -OLD_FILES+=usr/lib/libbluetooth_p.a OLD_FILES+=usr/lib/libsdp.a OLD_FILES+=usr/lib/libsdp.so OLD_LIBS+=usr/lib/libsdp.so.4 -OLD_FILES+=usr/lib/libsdp_p.a OLD_FILES+=usr/sbin/ath3kfw OLD_FILES+=usr/sbin/bcmfw OLD_FILES+=usr/sbin/bluetooth-config @@ -480,11 +476,9 @@ OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a OLD_FILES+=usr/lib/libbsnmp.so OLD_LIBS+=usr/lib/libbsnmp.so.7 -OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools.so OLD_LIBS+=usr/lib/libbsnmptools.so.0 -OLD_FILES+=usr/lib/libbsnmptools_p.a OLD_FILES+=usr/lib/snmp_bridge.so OLD_LIBS+=usr/lib/snmp_bridge.so.6 OLD_FILES+=usr/lib/snmp_hast.so @@ -1414,7 +1408,6 @@ OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h OLD_FILES+=usr/include/cuse.h OLD_FILES+=usr/lib/libcuse.a OLD_LIBS+=usr/lib/libcuse.so.1 -OLD_FILES+=usr/lib/libcuse_p.a OLD_FILES+=usr/share/man/man3/cuse.3.gz OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz @@ -1471,11 +1464,9 @@ OLD_FILES+=usr/bin/dpv OLD_FILES+=usr/lib/libdialog.a OLD_FILES+=usr/lib/libdialog.so OLD_LIBS+=usr/lib/libdialog.so.10 -OLD_FILES+=usr/lib/libdialog_p.a OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_LIBS+=usr/lib/libdpv.so.3 -OLD_FILES+=usr/lib/libdpv_p.a OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz @@ -1529,10 +1520,8 @@ OLD_FILES+=usr/lib/dtrace/udplite.d OLD_FILES+=usr/lib/dtrace/unistd.d OLD_FILES+=usr/lib/libctf.a OLD_FILES+=usr/lib/libctf.so -OLD_FILES+=usr/lib/libctf_p.a OLD_FILES+=usr/lib/libdtrace.a OLD_FILES+=usr/lib/libdtrace.so -OLD_FILES+=usr/lib/libdtrace_p.a OLD_LIBS+=lib/libdtrace.so.2 OLD_FILES+=usr/libexec/dwatch/chmod OLD_FILES+=usr/libexec/dwatch/errno @@ -2162,19 +2151,15 @@ OLD_FILES+=usr/include/private/gtest/internal/gtest-port.h OLD_FILES+=usr/include/private/gtest/internal/gtest-string.h OLD_FILES+=usr/include/private/gtest/internal/gtest-type-util.h OLD_FILES+=usr/lib/libprivategmock.a -OLD_FILES+=usr/lib/libprivategmock_p.a OLD_LIBS+=usr/lib/libprivategmock.so OLD_LIBS+=usr/lib/libprivategmock.so.0 OLD_FILES+=usr/lib/libprivategmock_main.a -OLD_FILES+=usr/lib/libprivategmock_main_p.a OLD_LIBS+=usr/lib/libprivategmock_main.so OLD_LIBS+=usr/lib/libprivategmock_main.so.0 OLD_FILES+=usr/lib/libprivategtest.a -OLD_FILES+=usr/lib/libprivategtest_p.a OLD_LIBS+=usr/lib/libprivategtest.so OLD_LIBS+=usr/lib/libprivategtest.so.0 OLD_FILES+=usr/lib/libprivategtest_main.a -OLD_FILES+=usr/lib/libprivategtest_main_p.a OLD_LIBS+=usr/lib/libprivategtest_main.so OLD_LIBS+=usr/lib/libprivategtest_main.so.0 OLD_FILES+=usr/tests/lib/googletest/Kyuafile @@ -2251,7 +2236,6 @@ OLD_FILES+=usr/include/libgpio.h OLD_FILES+=usr/lib/libgpio.a OLD_FILES+=usr/lib/libgpio.so OLD_LIBS+=usr/lib/libgpio.so.0 -OLD_FILES+=usr/lib/libgpio_p.a OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man3/gpio.3.gz OLD_FILES+=usr/share/man/man3/gpio_close.3.gz @@ -3796,7 +3780,6 @@ OLD_LIBS+=usr/lib/libverto.so.122 OLD_FILES+=usr/lib/libprivateldns.a OLD_FILES+=usr/lib/libprivateldns.so OLD_LIBS+=usr/lib/libprivateldns.so.5 -OLD_FILES+=usr/lib/libprivateldns_p.a .endif .if ${MK_LDNS_UTILS} == no @@ -5714,7 +5697,6 @@ OLD_FILES+=usr/include/netgraph.h OLD_FILES+=usr/lib/libnetgraph.a OLD_FILES+=usr/lib/libnetgraph.so OLD_LIBS+=usr/lib/libnetgraph.so.4 -OLD_FILES+=usr/lib/libnetgraph_p.a OLD_FILES+=usr/libexec/pppoed OLD_FILES+=usr/sbin/flowctl OLD_FILES+=usr/sbin/lmcconfig @@ -5780,7 +5762,6 @@ OLD_FILES+=usr/include/ypclnt.h OLD_FILES+=usr/lib/libypclnt.a OLD_FILES+=usr/lib/libypclnt.so OLD_LIBS+=usr/lib/libypclnt.so.4 -OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/libexec/mknetid OLD_FILES+=usr/libexec/yppwupdate OLD_FILES+=usr/libexec/ypxfr @@ -6807,7 +6788,6 @@ OLD_LIBS+=usr/lib/pam_ssh.so.6 OLD_FILES+=usr/lib/libprivatessh.a OLD_FILES+=usr/lib/libprivatessh.so OLD_LIBS+=usr/lib/libprivatessh.so.5 -OLD_FILES+=usr/lib/libprivatessh_p.a OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign OLD_FILES+=usr/libexec/ssh-pkcs11-helper @@ -6947,18 +6927,15 @@ OLD_FILES+=usr/include/libpmcstat.h OLD_FILES+=usr/lib/libipt.a OLD_FILES+=usr/lib/libipt.so OLD_LIBS+=lib/libipt.so.0 -OLD_FILES+=usr/lib/libipt_p.a .endif .if ${TARGET_ARCH} == "aarch64" OLD_FILES+=usr/lib/libopencsd.a OLD_FILES+=usr/lib/libopencsd.so OLD_LIBS+=lib/libopencsd.so.0 -OLD_FILES+=usr/lib/libopencsd_p.a .endif OLD_FILES+=usr/lib/libpmc.a OLD_FILES+=usr/lib/libpmc.so OLD_LIBS+=usr/lib/libpmc.so.5 -OLD_FILES+=usr/lib/libpmc_p.a OLD_FILES+=usr/sbin/pmc OLD_FILES+=usr/sbin/pmcannotate OLD_FILES+=usr/sbin/pmccontrol @@ -7061,7 +7038,6 @@ OLD_FILES+=usr/share/man/man8/repquota.8.gz OLD_FILES+=usr/lib/libradius.a OLD_FILES+=usr/lib/libradius.so OLD_LIBS+=usr/lib/libradius.so.4 -OLD_FILES+=usr/lib/libradius_p.a OLD_FILES+=usr/lib/pam_radius.so OLD_LIBS+=usr/lib/pam_radius.so.6 OLD_FILES+=usr/include/radlib.h @@ -7147,7 +7123,6 @@ OLD_DIRS+=usr/include/libmilter OLD_FILES+=usr/lib/libmilter.a OLD_FILES+=usr/lib/libmilter.so OLD_LIBS+=usr/lib/libmilter.so.5 -OLD_FILES+=usr/lib/libmilter_p.a OLD_FILES+=usr/libexec/mail.local OLD_FILES+=usr/libexec/sendmail/sendmail OLD_FILES+=usr/libexec/smrsh @@ -7699,11 +7674,9 @@ OLD_FILES+=usr/lib/libatf-c++.a OLD_FILES+=usr/lib/libatf-c++.so OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_LIBS+=usr/lib/libatf-c++.so.2 -OLD_FILES+=usr/lib/libatf-c++_p.a OLD_FILES+=usr/lib/libatf-c.a OLD_FILES+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 -OLD_FILES+=usr/lib/libatf-c_p.a OLD_LIBS+=usr/lib/libprivateatf-c.so.0 OLD_LIBS+=usr/lib/libprivateatf-c++.so.1 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc @@ -8173,11 +8146,9 @@ OLD_FILES+=usr/include/atf-c++/macros.hpp OLD_FILES+=usr/include/atf-c++/tests.hpp OLD_FILES+=usr/include/atf-c++/utils.hpp OLD_FILES+=usr/include/atf-c++.hpp -OLD_FILES+=usr/lib/libatf-c_p.a OLD_FILES+=usr/lib/libatf-c.so.1 OLD_FILES+=usr/lib/libatf-c.so OLD_FILES+=usr/lib/libatf-c++.a -OLD_FILES+=usr/lib/libatf-c++_p.a OLD_FILES+=usr/lib/libatf-c++.so.1 OLD_FILES+=usr/lib/libatf-c++.so OLD_FILES+=usr/lib/libatf-c.a @@ -8741,7 +8712,6 @@ OLD_FILES+=etc/unbound OLD_FILES+=usr/lib/libprivateunbound.a OLD_FILES+=usr/lib/libprivateunbound.so OLD_LIBS+=usr/lib/libprivateunbound.so.5 -OLD_FILES+=usr/lib/libprivateunbound_p.a OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz @@ -8769,11 +8739,9 @@ OLD_FILES+=usr/include/usbhid.h OLD_FILES+=usr/lib/libusb.a OLD_FILES+=usr/lib/libusb.so OLD_LIBS+=usr/lib/libusb.so.3 -OLD_FILES+=usr/lib/libusb_p.a OLD_FILES+=usr/lib/libusbhid.a OLD_FILES+=usr/lib/libusbhid.so OLD_LIBS+=usr/lib/libusbhid.so.4 -OLD_FILES+=usr/lib/libusbhid_p.a OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc @@ -9232,27 +9200,18 @@ OLD_FILES+=usr/bin/zinject OLD_FILES+=usr/bin/zstreamdump OLD_FILES+=usr/bin/ztest OLD_FILES+=usr/lib/libbe.a -OLD_FILES+=usr/lib/libbe_p.a OLD_FILES+=usr/lib/libbe.so OLD_LIBS+=lib/libbe.so.1 OLD_FILES+=usr/lib/libavl.a OLD_FILES+=usr/lib/libavl.so -OLD_FILES+=usr/lib/libavl_p.a OLD_FILES+=usr/lib/libnvpair.a OLD_FILES+=usr/lib/libnvpair.so -OLD_FILES+=usr/lib/libnvpair_p.a OLD_FILES+=usr/lib/libumem.a OLD_FILES+=usr/lib/libumem.so -OLD_FILES+=usr/lib/libumem_p.a -OLD_FILES+=usr/lib/libuutil.a -OLD_FILES+=usr/lib/libuutil.so -OLD_FILES+=usr/lib/libuutil_p.a OLD_FILES+=usr/lib/libzfs.a OLD_FILES+=usr/lib/libzfs.so OLD_FILES+=usr/lib/libzfs_core.a OLD_FILES+=usr/lib/libzfs_core.so -OLD_FILES+=usr/lib/libzfs_core_p.a -OLD_FILES+=usr/lib/libzfs_p.a OLD_FILES+=usr/lib/libzpool.a OLD_FILES+=usr/lib/libzpool.so OLD_LIBS+=usr/lib/libzpool.so.2 From nobody Thu Feb 19 13:45: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 4fGvm66Swwz6RJQf for ; Thu, 19 Feb 2026 13:45: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 4fGvm6553Vz3hr0 for ; Thu, 19 Feb 2026 13:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oit4WQgOkp4GltomNNZLTUYqmJsMpWTu2/cjkqifiw8=; b=OD3rVB6ffcIwx0PWQquYa22MygXiAs/gnRXO3J6tleZhQwC059bJzZQr3b9b4H0OdvMTtK +2UnH4HBXiGYHT8F8IQRWL32HDQLsSH/dIn3MFlsJsI8Mfj+jNwcDYpXih8ur5pguo8PvV vgzedncG9/uX4pmvAt+qOrOqKKw5iuPKSi88PpyxRqPYHIXpV/5dFbG5IJThRKGhYfqUgY bovnPtuESHlIG9c2o1QJKX8DfWyeblG9a4gZofapHPFKWb6M6JHGCD2Gpm0UZEiUZZiKSh o0Qoaol8dg6e5rmpl1hxsLIZ6GXtsVoSC6uk5SYl/SvczL4dWjznCgshyzSZew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771508758; a=rsa-sha256; cv=none; b=nT2sFuG6UFedS+0aviu7SFmcbROp1dNAUKDBkSZqVlPpNmdiM8lT+Iz6X+ZkhBIiOhOMxP vphVk2EM3dDXxsU2u0bXnOFwY6s3LpjekAvewLQnVWDma/hv22/MenTbUStQGqbNEBHPZj AFb+oZDwj9EcqrxaAaiKZ+qHl6NsP0xZXE4kgpRiFZPXlkma2mNjHk4+qOhsgtf7/n0YUZ Smi4wVLVDdR7HNAC3H4Ozvt/yOIudVlLMcBiwW/hd6JjrJggy8Hj05m/pz9AarnWAifGk1 NdAOmThIspHtQKGFpTM1gf7ZDRap4eHhXqlTylKXjj3DrdIePfx2QYA9cJq19A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oit4WQgOkp4GltomNNZLTUYqmJsMpWTu2/cjkqifiw8=; b=gesoZPGq7zlRTfF+Fu0dq5707Tq1rCESz1Y9QLNsjbc5r6AgkosgKTl0+7mGZLTJVqfycT 1oIMzZjG3LyWMkeltRYcINA3OQA4bWh3aS6tk1KFlDxAJwvKt6FEuQh/Da6epshr+bQBmT ZziAm3gHcJ7BZdQHtfBN9DRnEf0bL1Y8fdvt+gmy5mW5wAbbqoBqVpQ+Rxz62XybChewa+ pxuHmtJBoPJitUhaphU2m3nsnKFKgPfeSpBM0DFzyvmiyGrleH+l6GTT82i5jP+UHgrI01 LUhQaR0/7a9IEBserD9SqFMktSeZx+FuXBCqo/irJWprOIXa5OTS4Y6g+q+Bpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvm64Jh1zlRc for ; Thu, 19 Feb 2026 13:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18af1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:45:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a160622686f1 - stable/15 - OptionalObsoleteFiles: Add figpar to dialog section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a160622686f16432175484afd375cfc45bc1d573 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:45:58 +0000 Message-Id: <69971416.18af1.6c980ea2@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a160622686f16432175484afd375cfc45bc1d573 commit a160622686f16432175484afd375cfc45bc1d573 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 22:58:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-19 13:45:20 +0000 OptionalObsoleteFiles: Add figpar to dialog section MFC after: 3 days Fixes: 15d781b53233 ("lib: Gate libfigpar under MK_DIALOG") Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55330 (cherry picked from commit bc6c827078b7ab62271ce7ac1c4439b82fd2f98c) OptionalObsoleteFiles: Add missing figpar MLINKS MFC after: 3 days Fixes: bc6c827078b7 ("OptionalObsoleteFiles: Add figpar to dialog section") (cherry picked from commit efcfba9b31ad11ec901085c38b79e40289b9e7bc) OptionalObsoleteFiles: Add missing dpv MLINK MFC after: 3 days (cherry picked from commit 32ec8e29a6c3025a864f85678db63a8568c8fc86) --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f0d276b45adb..a29b709e8a9d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1467,10 +1467,22 @@ OLD_LIBS+=usr/lib/libdialog.so.10 OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_LIBS+=usr/lib/libdpv.so.3 +OLD_FILES+=usr/lib/libfigpar.a +OLD_FILES+=usr/lib/libfigpar.so +OLD_LIBS+=usr/lib/libfigpar.so.0 OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/dpv_free.3.gz +OLD_FILES+=usr/share/man/man3/figpar.3.gz +OLD_FILES+=usr/share/man/man3/get_config_option.3.gz +OLD_FILES+=usr/share/man/man3/parse_config.3.gz +OLD_FILES+=usr/share/man/man3/replaceall.3.gz +OLD_FILES+=usr/share/man/man3/strcount.3.gz +OLD_FILES+=usr/share/man/man3/strexpand.3.gz +OLD_FILES+=usr/share/man/man3/strexpandnl.3.gz +OLD_FILES+=usr/share/man/man3/strtolower.3.gz .endif .if ${MK_DICT} == no From nobody Thu Feb 19 13:46: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 4fGvmT0THtz6RJY6 for ; Thu, 19 Feb 2026 13:46: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 4fGvmS6tM6z3kFQ for ; Thu, 19 Feb 2026 13:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttWJB8fKo4M7wQQlV1dzZkcHdkYP/qsZHjUQtfRuGug=; b=TUtSuy33OA/6dlD14UzDH/aTd345XEaHyz+ERBl7icXc/B6iOELDm02UvWzAUtsF6xMqrR E1VmdODlEei6w0heDc9e9YJ4O3zf3NKsilLDcATg0sf4PGrxR9Cl/tMBygitmu7hMv/J/z 8rK6NK8czMQiUrYBjxp+toomNANEYrTKRi31uTJhYrds9dfW1IxUe++ytHAbs5oc76a1hX xBQNqSSfFwa2C9b2G3PpCc6LowtAAsuHolvf5aUF7aFSTjd9DkdX2+BVHeaRs+8tqWF1+M xMk+NKSG1NV3XnRElbb+X+QT+ePY7QXpwnm4bCkAOYzdTIAV6/2YPH9Ifqm95g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771508777; a=rsa-sha256; cv=none; b=r7ukH0gkiobizN4hEpJgEKebCNpBynEXubw7mskpdfCrOD3Z8t47VTRIIxgMQugGPcMdGg y7rGl29EBoMmJr8KEItmanar/bNtX+xpEGqZV4S2E5ZB+W2zW41glTV2fxvQp0w0MlzyJU cZu5n0MI30YyBfHCQHHMweTmIgom7ZMMYbHg/WE+AG+DayArB2KSBfcb0VNGNxntAW5Zyc h7wlYJxCfsZYIHVLnhfogy8J7Inr1EmpvXyiEsxExhH6K8YpQH2MVi2rHIblHpcLxIfrui W41vf9HQQjhRVNQX0MCY48q2XYuAnZ6TOTdD3h0bxOPmjjr9KNGdYvscHlUfgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttWJB8fKo4M7wQQlV1dzZkcHdkYP/qsZHjUQtfRuGug=; b=pUIR8496BA34gj/6SFDi/L+xns1yz5zWv1tRauJMO5RafJxg5O6hY+at5UcOTKPHAID5pM J0GyNJmV+7tBWs95Be8iStY5TigAEeNGpytwjoL+OkMiFE03wk2HyazNA8rscGq4qsdHuM yqmYh+niA65x1or0gEsaGnaXDEHHwM7Uf3eTLttuEAtc4G+SUp9CN4LZxYRnJlHnP4/llF eaNYlwB1D5EvJAlnyFl9zl2rbc5FZi07jRg794dIYrOr/KKCSv82F4Y7AnhuRZA3gYLjAm BRmiVxJLX110gqNyNF2+ZlOBfemG/TewwKF/2v0HnouDwqDgjp4dsns1zmdYtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvmS61WzzlRd for ; Thu, 19 Feb 2026 13:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e677 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:46:16 +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: 2c9398c5a976 - stable/14 - OptionalObsoleteFiles: Add figpar to dialog section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c9398c5a976a4a5bfd32aeea39d589f809033e4 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:46:16 +0000 Message-Id: <69971428.3e677.25777581@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2c9398c5a976a4a5bfd32aeea39d589f809033e4 commit 2c9398c5a976a4a5bfd32aeea39d589f809033e4 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 22:58:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-19 13:46:03 +0000 OptionalObsoleteFiles: Add figpar to dialog section MFC after: 3 days Fixes: 15d781b53233 ("lib: Gate libfigpar under MK_DIALOG") Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55330 (cherry picked from commit bc6c827078b7ab62271ce7ac1c4439b82fd2f98c) OptionalObsoleteFiles: Add missing figpar MLINKS MFC after: 3 days Fixes: bc6c827078b7 ("OptionalObsoleteFiles: Add figpar to dialog section") (cherry picked from commit efcfba9b31ad11ec901085c38b79e40289b9e7bc) OptionalObsoleteFiles: Add missing dpv MLINK MFC after: 3 days (cherry picked from commit 32ec8e29a6c3025a864f85678db63a8568c8fc86) --- tools/build/mk/OptionalObsoleteFiles.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d47ee87a625f..918a459f3171 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1457,11 +1457,24 @@ OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_FILES+=usr/lib/libdpv.so.3 OLD_FILES+=usr/lib/libdpv_p.a +OLD_FILES+=usr/lib/libfigpar.a +OLD_FILES+=usr/lib/libfigpar.so +OLD_LIBS+=usr/lib/libfigpar.so.0 +OLD_FILES+=usr/lib/libfigpar_p.a OLD_FILES+=usr/sbin/bsdconfig OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/dpv_free.3.gz +OLD_FILES+=usr/share/man/man3/figpar.3.gz +OLD_FILES+=usr/share/man/man3/get_config_option.3.gz +OLD_FILES+=usr/share/man/man3/parse_config.3.gz +OLD_FILES+=usr/share/man/man3/replaceall.3.gz +OLD_FILES+=usr/share/man/man3/strcount.3.gz +OLD_FILES+=usr/share/man/man3/strexpand.3.gz +OLD_FILES+=usr/share/man/man3/strexpandnl.3.gz +OLD_FILES+=usr/share/man/man3/strtolower.3.gz OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz OLD_DIRS+=usr/share/bsdconfig OLD_DIRS+=usr/share/bsdconfig/media From nobody Thu Feb 19 13:46: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 4fGvmn6rT1z6RJYC for ; Thu, 19 Feb 2026 13:46: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 4fGvmn61Cvz3kR2 for ; Thu, 19 Feb 2026 13:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u/H+beU3aJgnAJ0Oal0mHMUB7WSzB/yY0FH/3oJRstw=; b=b8M9LCL2FoB856gsboCVmgvjdf4r67FYxHwk04zc7xUme0ovn4NaSJGfMT/CNspbmugIy4 ov/5AN823t2wn9wrPttDMS97I4OO8vaHj9FyI0gyRVl7qhjt9gE1YRt+f9a7poPi5uBkXJ LPnrCPsrcFAT7W+xNThJzWp4OiB8KzIO5K7sNlXrbKTE450eRSlAJzNO3coIDmV5SREPB+ F2eOISTbkNVgld0fY4MbMYwks+hTVSwYsrBe3xgUUvmdn4Iuz+LLH6FNWQb4ASOXatIaMx 99xDN/ERvIJUSFFxDWYowOyxfUvOtG2mv/VFDKhDGX3QzalsObMvfdmJYCbpBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771508793; a=rsa-sha256; cv=none; b=ocZq4FN9DfRd+alt/Jrb5SFYreGiUVb+eHvbJS/9REuMt9kYUcykmhKWpSPNX14cR+GF5/ SDjlaLZSjcqVC0FqpmqH2PIibrNYmA9gF6pck6Ga3fGQfoWnazwtrRxiYFICuCbW//gQDD 9LsNYc1/H5EWwg8HVoxSkgSFIq3Ii/6sW0BIB5lV/NK3f0PkoVmP3kgzU3eczXiIUoY+J/ p+bDY+4L+3wJ6pX2oGnrLRc4A+K04E62MVQRpmrCWo0tI14OOyJ0AAZRa3Ap5ZmZ/xa/jh YRFk/VX0PL1nJUX8O1EpIOy/16j+c2ct4oRicOLX4zScwVp9T2yrRUbwoRXEfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771508793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u/H+beU3aJgnAJ0Oal0mHMUB7WSzB/yY0FH/3oJRstw=; b=D8L3mNlcCGzbETxzbtqPlLL3tVqJ9B3kS8hrkx/p/DN2Hv9ivNb/hidC0ylN6yEaVt9hZh YFyyjcVLbyvILu1nMrw7dcDLncUE82lO0oyJYDGXo8d/kssZZs5Z1X7Vrk00ga4UNwn3Na kp1SV7fhaK6nsJLk1AiIj+ZBdVq2wHUt8fGXQgLm7zGu5mxRZm22spbURjpu31keSTSKf0 LSzJCiotMHrub7xw0aC/mUNqw3S27XGDy12fq1yzrq+lkx7jMa4tnMvF5OqnAlUIXcx8Nq x+AbkrPwehD+hQ340Zb7B/I3nRaNWw1mNh5Mihu1vtwh8r3novXDHe+z6mCrxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvmn4zfJzlf9 for ; Thu, 19 Feb 2026 13:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19397 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:46:33 +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: 0e093f57dc98 - stable/13 - OptionalObsoleteFiles: Add figpar to dialog section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e093f57dc9859d93c3fb8884723d348a71375f7 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:46:33 +0000 Message-Id: <69971439.19397.79c53261@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0e093f57dc9859d93c3fb8884723d348a71375f7 commit 0e093f57dc9859d93c3fb8884723d348a71375f7 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 22:58:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-19 13:46:21 +0000 OptionalObsoleteFiles: Add figpar to dialog section MFC after: 3 days Fixes: 15d781b53233 ("lib: Gate libfigpar under MK_DIALOG") Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55330 (cherry picked from commit bc6c827078b7ab62271ce7ac1c4439b82fd2f98c) OptionalObsoleteFiles: Add missing figpar MLINKS MFC after: 3 days Fixes: bc6c827078b7 ("OptionalObsoleteFiles: Add figpar to dialog section") (cherry picked from commit efcfba9b31ad11ec901085c38b79e40289b9e7bc) OptionalObsoleteFiles: Add missing dpv MLINK MFC after: 3 days (cherry picked from commit 32ec8e29a6c3025a864f85678db63a8568c8fc86) --- tools/build/mk/OptionalObsoleteFiles.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 9bf054570106..381f2b6f2682 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1735,13 +1735,26 @@ OLD_FILES+=usr/lib/libdialog.so.8 OLD_FILES+=usr/lib/libdialog_p.a OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so -OLD_FILES+=usr/lib/libdpv.so.1 +OLD_FILES+=usr/lib/libdpv.so.2 OLD_FILES+=usr/lib/libdpv_p.a +OLD_FILES+=usr/lib/libfigpar.a +OLD_FILES+=usr/lib/libfigpar.so +OLD_LIBS+=usr/lib/libfigpar.so.0 +OLD_FILES+=usr/lib/libfigpar_p.a OLD_FILES+=usr/sbin/bsdconfig OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/dpv_free.3.gz +OLD_FILES+=usr/share/man/man3/figpar.3.gz +OLD_FILES+=usr/share/man/man3/get_config_option.3.gz +OLD_FILES+=usr/share/man/man3/parse_config.3.gz +OLD_FILES+=usr/share/man/man3/replaceall.3.gz +OLD_FILES+=usr/share/man/man3/strcount.3.gz +OLD_FILES+=usr/share/man/man3/strexpand.3.gz +OLD_FILES+=usr/share/man/man3/strexpandnl.3.gz +OLD_FILES+=usr/share/man/man3/strtolower.3.gz OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz OLD_DIRS+=usr/share/bsdconfig OLD_DIRS+=usr/share/bsdconfig/media From nobody Thu Feb 19 16:00: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 4fGyld08dZz6RVWl for ; Thu, 19 Feb 2026 16:00: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 4fGylc4MhJz42FZ for ; Thu, 19 Feb 2026 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771516844; 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=Zkqe1bWjitlwq/tMi7byNCuWSnCi12aHXzlc61Wynyo=; b=HmwSLTQ1m4ll/I1XC7OX+oVeRmscJF9DtwXaiLhCGgKr/noN/zpu892C5nbEOrDE0pH9fu fPETflwcu1dm2p3LkTlALOMVPW+r1V+QtcqAu8ZhTO5a3evUfBz4x90dpqJCGPPLfiKe0N YoiTgR/NsPZUvQrIUcPQfX8/BpB8s4sw0A8m5iSrWB/9itCo+YOYxoHm0Y74UBhe6HYK1F kioK3yZCD4LI/rcxWjanZNLpMuOMRdzODlZcpbAMtiJngkCb5mxTTUEJQsc5GIeKB1YCep sMDLhLHGcPJj+iSek+m7nqCJ8mQHY1ZfZLUknyDeu91slfzS3syEs+patklHAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771516844; a=rsa-sha256; cv=none; b=gaPYKf608d9zbD7pxyggD6Lqk91SjifrwqXEpMuMRDoS3QCNgr0sIj5wmmZAWdN0yFnNV4 ES/HVMpjyEdi2d02hrKxC934gQ/s1KQms1kz6CSKZP6OX2uaGYHzmyFprRNmMonwxQyJon 2xnXY1WhmX8nL7ZMicnmPYdgPzPueHPP2/1ORPqALMENKOzY/CqY+WgJ6l7oolwBGdIyFc inEo9vmESCiV5LZM0G6Q/CKkVgl8nOQktok6Oln1lA8U98wDi5/Jg1ejqMYwPgVSQzsA75 QL+evwla4ITZVIDxRU4PO4p3sUY9qGMFZu7JL+AmVhtOp/9H/frY67pEIMfN+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=1771516844; 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=Zkqe1bWjitlwq/tMi7byNCuWSnCi12aHXzlc61Wynyo=; b=AB44/CczuE3KSvMHDoqSZyxlz0miZ5zDs7jogPYRdghtNZDY8L7uUG2VuPE7JSot7ubLQ5 njgxd4KPQl7LRCV5EESXcR95MoIH/dw+P28oY/e1TQ9Fiu7+jWZOTG4hatLcUbRUhejfRX C8aPsCWKfrCYAmEdgfoDRfkiMmQdrQalZVRCHwucaj0m57DpQ8MHMXmOLREj7L9ukd+ODT iCGlQ5QEi8xJoGJAFUlYrYNVm4cYeu63DXTUsMGDCn3q2aqg3ccBuf/DRqYz242BT56QO8 Ttlgr4uE1y9qviQ5sNfioKWKvsK3RDf7QsXOa0txqPaEM9b37UUNEC+1XyIUQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGylc2sG4zq3K for ; Thu, 19 Feb 2026 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31223 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 16:00:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Eric A. Borisch From: Kristof Provost Subject: git: 4d0186cd12a7 - stable/15 - libpfctl: Sort order of snl attribute 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d0186cd12a79269d5ddb607eff8deebe4667f67 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 16:00:44 +0000 Message-Id: <699733ac.31223.1fdb63d@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d0186cd12a79269d5ddb607eff8deebe4667f67 commit 4d0186cd12a79269d5ddb607eff8deebe4667f67 Author: Eric A. Borisch AuthorDate: 2026-02-12 00:26:26 +0000 Commit: Kristof Provost CommitDate: 2026-02-19 16:00:19 +0000 libpfctl: Sort order of snl attribute parser snl atttribute parsers must be sorted by type, so PF_GS_BCOUNTERS (16) must follow PF_GF_PCOUNTERS (15). Fix ordering and add a call to SNL_VERIFY_PARSERS. Without this fix, byte counters reported by 'pfctl -s info' with a loginterface are always zero. PR: 291763 MFC after: 1 week Reviewed by: kp Signed-off-by: eborisch@gmail.com (cherry picked from commit 363b57d579bafa8a52cfb5a1dcb98af821b1ecb6) --- lib/libpfctl/libpfctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 0b3bb25163b8..74d319cd2ad1 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -389,12 +389,16 @@ static const struct snl_attr_parser ap_getstatus[] = { { .type = PF_GS_FCOUNTERS, .off = _OUT(fcounters), .cb = snl_attr_get_counters }, { .type = PF_GS_SCOUNTERS, .off = _OUT(scounters), .cb = snl_attr_get_counters }, { .type = PF_GS_CHKSUM, .off = _OUT(pf_chksum), .arg_u32 = PF_MD5_DIGEST_LENGTH, .cb = snl_attr_get_bytes }, - { .type = PF_GS_BCOUNTERS, .off = _OUT(bcounters), .arg_u32 = 2 * 2, .cb = snl_attr_get_uint64_array }, { .type = PF_GS_PCOUNTERS, .off = _OUT(pcounters), .arg_u32 = 2 * 2 * 2, .cb = snl_attr_get_uint64_array }, + { .type = PF_GS_BCOUNTERS, .off = _OUT(bcounters), .arg_u32 = 2 * 2, .cb = snl_attr_get_uint64_array }, }; SNL_DECLARE_PARSER(getstatus_parser, struct genlmsghdr, snl_f_p_empty, ap_getstatus); #undef _OUT +static const struct snl_hdr_parser *stat_parser[] = { + &getstatus_parser, +}; + struct pfctl_status * pfctl_get_status_h(struct pfctl_handle *h) { @@ -405,6 +409,8 @@ pfctl_get_status_h(struct pfctl_handle *h) uint32_t seq_id; int family_id; + SNL_VERIFY_PARSERS(stat_parser); + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); if (family_id == 0) return (NULL); From nobody Thu Feb 19 16:00: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 4fGylf04kCz6RVj9 for ; Thu, 19 Feb 2026 16:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGyld3lbtz42Fc for ; Thu, 19 Feb 2026 16:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771516845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPcu5dHS68/NxiukPnQxj8+jv982ndrmjb1MC0+oRRQ=; b=m1Nu5NPmzGQ1kqYyl+4Pgtqq2kTP9Mw44NOWbfpT8XJV3sDf+sD5XTfuPdhU+B9RvI42MU 75vRogDTwEYGjUJDJ9rPJaFjrbxx+dhKOxi8pLKRneTk00nAZYIiq7+UuefzwwL0//CRfA QCmkMMd/OoYPmWiPbIFpc6Qr8qnmFu3Z/+XT1O0uqzEXMZQSNluMtAVpWAJDneGL/Fy64y 4d1J8uADJ9i/2PSwqq0nLnfETeMcU6rlemf0Iiuih8ejlU3wuHi3LMOO2IR+HCpVlZryfj j0/zhvifnFZK8XonG0gRuJokEvIRywoi8uK0Lf1VPRh654F3ztdAo4bvRFjWvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771516845; a=rsa-sha256; cv=none; b=cRdTjexE1EH45bMb+H964DsgYRm2p73gSQCzdUejuP1eo23SVdle417Xk8G2v3NBu31ifp xqJwbGLgJ6R4hV1W4uR3yqQiTT+1phzxiV7DICJFDRbh78qUxsGuqSHvERAZDeYKt6Dkfx bnh8qVb+ds+0Bd50zsUCSc7SXV29v52FY8Mm13yRsOh20SNZDaoSzN2P0Du4eCRrbP4ezE L2WpsWbC/iAkt482JRAHyqZI+QPtZzdi7GW3+DWlHAaPf/a5F1gYCkw5Vzwe0frAPXneUd XTQSmYnSBI6dgSmPxnAl0tKrQV+Pjh4nfhlIe2h8aObvufPxpLxiMikFR9XOgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771516845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPcu5dHS68/NxiukPnQxj8+jv982ndrmjb1MC0+oRRQ=; b=pJGCC2u1XTnhVLxck1mC44hcsOHEtAEJuy/i+es+i7ak8Lrk0sLTup1NW4bALmLJOWasSN Mo62vaXait+ExLi66RetfjbMkuF31hzEQ+N51/cOvR4msG8Mj76mFrORvG5PIY23XWg9gu grZTbJYsQUj4JEQ9f14olBgZVug6Q32cut6yV+fXo1akHKpvm3ta3L51Os/3zQkSS6egLv 9mADDjmqxbbUlw3v21tDsfGgrK4h8dK3Qt2SnQh13ji1NLwMMs/Ripr3lGkeUYPweOZZ5S fgPtDpAgA2yiF/Z76QKuclZlLIZhb8oUxCxzdqPqWdgkIbke4m71hAwzk2lbGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGyld3MHNzpy1 for ; Thu, 19 Feb 2026 16:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31686 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 16:00:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: dc7eb96ba945 - stable/15 - pf tests: verify blocked count on log interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dc7eb96ba94580548937632d3a035574fc4feedf Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 16:00:45 +0000 Message-Id: <699733ad.31686.284033f9@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dc7eb96ba94580548937632d3a035574fc4feedf commit dc7eb96ba94580548937632d3a035574fc4feedf Author: Kristof Provost AuthorDate: 2026-02-12 13:06:34 +0000 Commit: Kristof Provost CommitDate: 2026-02-19 16:00:19 +0000 pf tests: verify blocked count on log interface Also check the IPv6 pass/block numbers. PR: 291763 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit d03b6bb766f8c816547f9c39e05af8238242251e) --- tests/sys/netpfil/pf/loginterface.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/loginterface.sh b/tests/sys/netpfil/pf/loginterface.sh index 6decb69fe63d..c192d8e4e4a4 100644 --- a/tests/sys/netpfil/pf/loginterface.sh +++ b/tests/sys/netpfil/pf/loginterface.sh @@ -41,9 +41,11 @@ basic_body() epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.2/24 up + ifconfig ${epair}a inet6 2001:db8::2/64 no_dad vnet_mkjail alcatraz ${epair}b jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b inet6 2001:db8::1/64 no_dad # Sanity check atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 @@ -63,10 +65,11 @@ basic_body() # And after we've sent traffic there's non-zero counters atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore ping -c 1 2001:db8::1 atf_check -o match:"Interface Stats for ${epair}b" \ jexec alcatraz pfctl -s info - atf_check -o match:"Passed 1" \ + atf_check -o match:"Passed 1 [1-9]" \ jexec alcatraz pfctl -s info # And no interface stats once we remove the loginterface @@ -74,6 +77,15 @@ basic_body() "pass" atf_check -o not-match:"Interface Stats for ${epair}b" \ jexec alcatraz pfctl -s info + + # Check blocked count + pft_set_rules alcatraz \ + "set loginterface ${epair}b" \ + "block" + atf_check -s exit:2 -o ignore ping -c 1 2001:db8::1 + atf_check -s exit:2 -o ignore ping -c 1 192.0.2.1 + atf_check -o match:"Blocked 1 [1-9]" \ + jexec alcatraz pfctl -s info } basic_cleanup() From nobody Thu Feb 19 18:57: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 4fH2gt6ZPzz6SGVp for ; Thu, 19 Feb 2026 18:57: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 4fH2gt5y7wz3TFb for ; Thu, 19 Feb 2026 18:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771527466; 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=FatRK5MKGIUWDVF3QCGGSiCYhjo82rWGTt25jTw/QC4=; b=N2eDlDkucWcPb7ASuyTteONEYOOluhv45rYEXm4d5VGZ64cBXEqfKnO38tgunPene+bOkp PGlYa1g1rXM0n3CrrEqk53fDyYhjL3FKUZ31mnWtak57MIPj5wqlC7um5+o9zmsAP+luUz PQAJOVbK9VZxGlJ0Gqf0Yx/mvlspeTn5I2Z1IpkfaPo0pJ/UjVVcKAJxXZj8W92rnQuR+Z GoRxJNGHbvZyoW0CiWR5WZIIcyRuaO/iAQ4vDnx4vaT4FT1vgBDzjiMOuVoxMigmzwfcW8 fDYDE6J7EZoMuHgaVA0gSQMah6xeab3G8FBGcIIw0t+SQfxGlssM1VKQiy7Vcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771527466; a=rsa-sha256; cv=none; b=qafz3qJR2Yf3UsgMB+iRzpk7aT9e1N+thxn+YEySNWr2iQkWUf4/l2a0K9hS/dBw1OyfPT UlisdSnxbjpjCkVCcJyxi7AmYRr6RFC+s81Gvjx3XfUbrs1rtio14fDjNaU06GCB+dzPKs hrG13/Dxuzt39diNdsZ+eiJPX/IzqWIpMLU5xhfKaPn17doGDZTe+kpAm8YMQTj/j96raj kn6bObKy3963HpohDLhK0VslRIU7BtyaEI0cWlzJPgo+nHVH9l+jNWdeK/l3MD3N4dN1Q0 PmS7z3CQu4joS9aT7tIJywG/JgYTW8++YDDvoFKS/GdmxjlM6Rw3eJjgQGpibQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771527466; 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=FatRK5MKGIUWDVF3QCGGSiCYhjo82rWGTt25jTw/QC4=; b=MVYBH9b4i3peZrd/9TDjXbRsgYTydlFu9IYzl1YDNSv2z30sQ/5FeOTpYD724EgfBWhBLl LiRue5oFWPue3HCTjxiNUjGE3fLNPpohFN+DIdEp20ueI4TAS//LBXqF/5L5pCvrncuQjo BT57+VEzXKFr9GsIL7vClVW8f1fK9rkdRNteXv9smLVm2X4nG1jCBJ0zEKPvrZC839QKCQ xO4HYYN+4vj5ntXZgkZWgTUXeZ2qpeBRO8cSzMx2cC6w2xYCB0ASgCle5aXjePmrxmNmo+ PdokyREfroSSYIsywE6VVgF8XTHYjztt/8Tx5Wfq32PQEt3xjvXwjzX9aLBtZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH2gt4xPXztv5 for ; Thu, 19 Feb 2026 18:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4086c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 18:57:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: 0a87ae18331d - stable/14 - icmp6: clear csum_flags on mbuf reuse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a87ae18331d5c52dde1e5a4f13ee577e8e5e188 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 18:57:46 +0000 Message-Id: <69975d2a.4086c.66e9b9dc@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0a87ae18331d5c52dde1e5a4f13ee577e8e5e188 commit 0a87ae18331d5c52dde1e5a4f13ee577e8e5e188 Author: Timo Völker AuthorDate: 2026-02-19 14:15:10 +0000 Commit: Michael Tuexen CommitDate: 2026-02-19 17:42:05 +0000 icmp6: clear csum_flags on mbuf reuse When icmp6 sends an ICMPv6 message, it reuses the mbuf of the packet that triggered the ICMPv6 message and prepends an IPv6 and ICMPv6 header. For a locally generated packet with checksum offloading, the mbuf still has csum_flags set indicating that a SCTP/TCP/UDP checksum has to be computed and inserted. Since this not the case anymore, csum_flags need to be cleared. PR: 293227 Reviewed by: kp, zlei, tuexen MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55367 (cherry picked from commit ada4dc77577f7162353e8c2916ba5c258b6210f0) --- sys/netinet6/icmp6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 8d6e04c926c7..3fe0bec536e8 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2163,6 +2163,7 @@ icmp6_reflect(struct mbuf *m, size_t off) m->m_flags &= ~(M_BCAST|M_MCAST); m->m_pkthdr.rcvif = NULL; + m->m_pkthdr.csum_flags = 0; ip6_output(m, NULL, NULL, 0, NULL, &outif, NULL); if (outif) icmp6_ifoutstat_inc(outif, type, code); From nobody Thu Feb 19 19:28:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MF3X6Wz6SJyT for ; Thu, 19 Feb 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH3MF2fVnz3ZRb for ; Thu, 19 Feb 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529305; 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=mhpD20u0WtUZAUiB/WS+yqrs8ygJ4DZvr2TssR7FFbM=; b=aCFoEOeKXCvmbEx8detBg7MHMnX2wafS30P/Apz2TOpg7OLzmtEUvgyjz+eOCQLAUxuEUO VvkjeZVikCUIujCawpp56qwnCJ6ODAzajq7Iq8GLH3IQO2Cb9d9wccOGpp5V2Fnu9Hq0c3 rEjEhcDgtNg1RXvFCmhHsIrZb76dGcTN0CsBb/VBA1HrjLWuXKUBTLivujPyeURRVWACCV jFSHMbv9BBNQ4Ze0kCvK/h2tBj0jN70rsYih3MypJ3TlxGDXGZ/+sA4GRgah5Lo6W6IwAQ Nr2vKaJAr2Z0d7n1ygPdzd+4Z6+r0oIIBLGy9UTkENY3+pskXyLHQv0pALA17Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529305; a=rsa-sha256; cv=none; b=q9MnnaMFk73vvtAP5Xr6Tg/n8TVs//ZBRTixY56Ayf9Jpwltjm08zEd7cTk5N/FjFx8Ww3 sh23w4oyIsVz698T7Z+ZLh9/loXBaA/eBHtf409lioOFv3x+ZPuiN1/4UAQufV+C3InVqh lLKu8JgFnJlnrKQyiyOrllfZm0NwjCt1rmem/UkpTZYtVze2i/Zfs4nJ8Ka3mjGzfp3WzA xhP5J11HmQY7VEfMGPabTAJFx/nAK66obD1s8tpiQhcCplZsDZFDQ/HMXqq2Vz5ontbNr/ wthfhS/EZuQq6mZ/VFNUa5xHOqdU+kH9dg9rx6CDZk5+d+Gr9uinEKljQfopow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529305; 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=mhpD20u0WtUZAUiB/WS+yqrs8ygJ4DZvr2TssR7FFbM=; b=XE+pAG/Sq3Vz9C/Q1g8Z0is2KulLx+ZkA8tyzM4Umdj4z6EyYehxGOGzG2hwN6hcioqws2 pIw1FzRWOrAcam3iDt1D/kHRiwAmfa1CM5ejZIR8lTyL702YayevDalJaqqMeqqBFkc8ok OLpEhtbnvPiuX32zBnZIO4FkO8mrkGufs6kLI+KsuofCdrQFNG9m4d8T2g6VNHTJBKlLzr 3KZgIeplCGpJsG3l21E9nxTMde9Xug1MBoTjncMrFA9MOX1XcqnvMyGTjf1w61imja/rpy iIJakD+96tEcQFCGvBygCtzGJgMzFh+xPgTBYSl7E0bccUw/bIx7/L3Vd4pd1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MF29qTzw3Z for ; Thu, 19 Feb 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43737 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 8755b5f3a590 - releng/14.4 - libfetch: Restore timeout functionality List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 8755b5f3a590560996fb122abe22644d3be3836a Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:25 +0000 Message-Id: <69976459.43737.27f512c1@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8755b5f3a590560996fb122abe22644d3be3836a commit 8755b5f3a590560996fb122abe22644d3be3836a Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:21:21 +0000 libfetch: Restore timeout functionality PR: 293124 MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 (cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207) (insta-mfc requested by re@) (cherry picked from commit d97c824f5b4c9e7e3a1400699022cba146e450fa) --- lib/libfetch/common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index d5423d8eb5d1..bdc72f67c9a0 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -287,6 +287,9 @@ fetch_reopen(int sd) flags = fcntl(sd, F_GETFD); if (flags != -1 && (flags & FD_CLOEXEC) == 0) (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + flags = fcntl(sd, F_GETFL); + if (flags != -1 && (flags & O_NONBLOCK) == 0) + (void)fcntl(sd, F_SETFL, flags | O_NONBLOCK); (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; @@ -1272,14 +1275,6 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; - struct timeval tv; - - if (fetchTimeout > 0) { - tv.tv_sec = fetchTimeout; - tv.tv_usec = 0; - setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, - &tv, sizeof(tv)); - } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Thu Feb 19 19:28:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MG4cGHz6SJlK for ; Thu, 19 Feb 2026 19:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH3MG3WdXz3Z27 for ; Thu, 19 Feb 2026 19:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529306; 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=aBMDX7rucI5YbcE5StJDHcCl0gpw54om/txKfXTuZZE=; b=IIU8idWsIvOsZ97gHEYrN+jnUqObDJ0VtpgDIphbooxcWSbqJe3fSZl6GdhrVVOUtYkM31 nVHoPrVNYKgvYBYmbbNrE7JhFBgUzlx+pkOjGQycvJpIMa1XxCrNvAtuTpWHY3PXMpSf7P /p+zYuPTnDeJiDan1gHzOYjxQkqU3IPxUEVw8b9He1eI/g8i1iff2SKVWtifZhXwVrExS9 snZjRIJ2QUbDBz5a3WiNIKfCXBaEqcco4RV1NNTwvHoDm0NrfokdQzfMuJtmcDc0F56cOT Nt1FLO7fU82if3W1sxkxHQc6Ygr45GTABi+vwUxAyes/7KzhxtRYkCIGaBgwQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529306; a=rsa-sha256; cv=none; b=XxASv6jgqEr2PQ/ZiBxYOGjHoMmKC1aAsQfRN3BT8cba8EsbExEl5a3lYRZ2yYuDZIGQM/ Ii2BuEuHozC6dWwbL7f4ptB/LcZI5djSonhd0V6Hq1CUyT9uZGFYk9YL2pcgKdaEu8zzR1 Oz/5BNsMIoG0K1U7erPqrpZc4VkEe1+mBQefSwqVF3kdepHBVaHEbbBhm1qWj6hnln1DTj 8WBBJaNtkIFdCIwf9VOw0lZI2cwWJLjkgZOXYER+1n/S645nAti7vpf0+fA+5aKSiJOr9r Jm6KLLvQaDx2q0Lx9TN6gVUlX8uaaBD1Brph2qQ+YcTfk8z/Qj7rSViaI7W2dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529306; 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=aBMDX7rucI5YbcE5StJDHcCl0gpw54om/txKfXTuZZE=; b=i/dxJfx6ddC7sJWhbqfGPKID2SaSlcDTjCPNZ1dCi7DN/VyWEePLgBZ3THEw08UV1ERir8 WS+5HcLFxjIjGhaw8qnPvyYC+xoVboaRzjVPC62mpXuGGQ5olLMT+9TxgOhARcg11fGOoj nEXzawsHL1IUclZnYI2Lqw9nUlriRxxXbR2cNG4JzUWZUEhZpP7Zy9LNhGE25PRmxNAgmn feTIZQfBPxszmBn9wpdYtnRy/FqAG6dx7cd4mLBpt2YefPevqYI1ndFuapGprRanuY6uG7 36ET38BMz4TFywA/z6RkOFEptDEUFFN6w1PF9ZkNDcOO0Gxw9omRnSkRKEEUYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MG312dzw3b for ; Thu, 19 Feb 2026 19:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46480 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Colin Percival Subject: git: 0d08a243f21f - releng/14.4 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 0d08a243f21fcdd6d1ed9cc198d887722910180c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:26 +0000 Message-Id: <6997645a.46480.5a5ad34f@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0d08a243f21fcdd6d1ed9cc198d887722910180c commit 0d08a243f21fcdd6d1ed9cc198d887722910180c Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:21:28 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) (cherry picked from commit 354cc5e142634afbc967ede56572b939fbdb5d38) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index fbc679aacf93..396bdd6ce8c6 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -52,7 +52,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else From nobody Thu Feb 19 19:28:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MJ31hVz6SJff for ; Thu, 19 Feb 2026 19:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH3MH5SWgz3ZRh for ; Thu, 19 Feb 2026 19:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529307; 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=iERlUjjHuqFD9XP/vC8q13gOd9mckQCs01HDUdml6Mc=; b=qy+1Jf6uwvKX/GjKwlfOI8OFHXgBL9e/4+hX99HsCeTPS4gfoKR5ehWGYYdW8bkJJwWj5O DwolHEtPGTHjJCPTHUkhU5YrvBiIDw12nLNGtGj5iyQ7PmNR2BOsNB7AyR2zixUbIRivMY c5qrLVDdZBv04F/MGAQQ+M6tbKxmx+O1CHmGFtWGI3YG9w4JAhoJOX1ZEWeROYHewRa+jB AQ6MS9pkKtcl6rlfjBbqpzHbHyoKmzHpHSJKJQnaykHa1a9+WKRzK2MAtVu7byI17okxYJ ireH3Z2TmMFA0UOI1Y+27R7lWsX249pHOkFQtifvobnyGinoDxjGmUZIgu0oGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529307; a=rsa-sha256; cv=none; b=hFcBHMer+M83nQZ0KWpYVmechirSTv5EG9wT1sUjFelfxN3MW3Mi/1xioU7wCLPd17094d SXJZz0e99TXKd6OTO8aRGz76QTzQXMaAYWKI3AFof4It4QGvKIHwVeEFT4bJxBaKQrG/9l /bF/4axMqRDp3LqFcEu/sgPWNGl5Jl1PgYNSw2fPMfdG2m0bshPSyZGrx/+UR/tUki+AqW pgvQhZW6BLWwzK28wCKozgxiqRBTlUGqnf+8Umv1StgWK7q65jb/kFNXX6kLw3lJYuS4he d8K1BEY4IHWMh5H1sP/2bhUe8N0jGRWYSeBVSHzdTp7Xu4dBDiDux85OSjpA2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529307; 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=iERlUjjHuqFD9XP/vC8q13gOd9mckQCs01HDUdml6Mc=; b=PWwCWbxTxMxPiEMT+G+wNIpPcoJSVejtq8EWFf9hDz7NcY0weQIyuP3BQUEvQCBHEU3s/G jbl1Y7Q0b3RpKHYfgItfZF+P9uwOCQGj9p2+hXqZp8pC7hprpMdEz8SczxyVy5cb1tTDzA vg8ILxHLstF8pD1ifeLqRmF2h+pBeWqGMcBBfkFLdnNm5jorbV/FUAV9AVRajuRttQrHDd tIQiT35J/yKIU7QxQJC/MROlum1LKqy87OWcOD7FlPVzZzStjFT3E8OUoOfhwr2SzBN/5j TpkMIDvkbHUJlthGuXXRuUUvlbQam9vhjaXQWKkQSOkhOSAZnoQcHkYeGUYj/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 4fH3MH4CR8zwK8 for ; Thu, 19 Feb 2026 19:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44735 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Colin Percival Subject: git: 28b5b653a567 - releng/14.4 - icmp6: clear csum_flags on mbuf reuse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 28b5b653a5672104d5c376a2d36fc4282e6bc062 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:27 +0000 Message-Id: <6997645b.44735.4dcd799c@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=28b5b653a5672104d5c376a2d36fc4282e6bc062 commit 28b5b653a5672104d5c376a2d36fc4282e6bc062 Author: Timo Völker AuthorDate: 2026-02-19 14:15:10 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:21:55 +0000 icmp6: clear csum_flags on mbuf reuse When icmp6 sends an ICMPv6 message, it reuses the mbuf of the packet that triggered the ICMPv6 message and prepends an IPv6 and ICMPv6 header. For a locally generated packet with checksum offloading, the mbuf still has csum_flags set indicating that a SCTP/TCP/UDP checksum has to be computed and inserted. Since this not the case anymore, csum_flags need to be cleared. PR: 293227 Reviewed by: kp, zlei, tuexen MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55367 (cherry picked from commit ada4dc77577f7162353e8c2916ba5c258b6210f0) (cherry picked from commit 0a87ae18331d5c52dde1e5a4f13ee577e8e5e188) --- sys/netinet6/icmp6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 8d6e04c926c7..3fe0bec536e8 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2163,6 +2163,7 @@ icmp6_reflect(struct mbuf *m, size_t off) m->m_flags &= ~(M_BCAST|M_MCAST); m->m_pkthdr.rcvif = NULL; + m->m_pkthdr.csum_flags = 0; ip6_output(m, NULL, NULL, 0, NULL, &outif, NULL); if (outif) icmp6_ifoutstat_inc(outif, type, code); From nobody Thu Feb 19 19:28: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 4fH3MJ6jgxz6SJyd for ; Thu, 19 Feb 2026 19:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH3MJ597Qz3ZPY for ; Thu, 19 Feb 2026 19:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529308; 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=baQ14CR9fSHtDfUQ1GatN5XXPB8PYrF7ryBVHoZhE9I=; b=yYKS3iRtEk+YTnDYCuahwUsO0TRc/C2muFUSqpha53XYzXx7ETngg56aDi09C4OCqnXo7V YwF/ry+9UahwpbvkzoCKBS86FueMiuN6yHJZwMj4kSXeGKGbf3hOXwCBou/Zb8QveTZxbT Y6vj9mj8XfjVgnnIAhrzM1zonfGzloVmPwbwaxZXKGrnMy/tzZxbzj9nd4xOuU1PxiZIxG BSQg5dHTtygil30oMj1bOJxwQNfH1oV2WfLeBAvQLJRCupD3OCqfdA17Dn+07MDg742lH9 T5atUjyr42sRmzgyWYg1eEt5VXgTPZMX37dLmChZ6eDUZ+Ctaq2rwaQMDE2Kwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529308; a=rsa-sha256; cv=none; b=O1Lm4NDu8ixCA4EkLtP0ZVLLwaUznsdItCG4G0DdDzMIo4mN2iaqq0MZJAaWp12x8+m+rC 4eBHAT6E4x9E7QdVSlhq2deFmVSPxTwZtHwtymofmqkVT8DWjOoGzcJL6jLtVE7P8ehhzy 1jogUa9GqyuP+G8g4oK5ySw8kl3VMaihXHCGD7UNKxF+m9HGWOnqr4EW/u3XO/J51Fi6IQ umKRfCK8Uxvol4EqEGFPn2Nwagt2u55CJbGteFpeq9s1ZHcLQ2l2ai2w+i6daTpA4Ah9xP o/DbB1P8V8RjANlY8arSWTqdEbzGi29bDE6qUinDOe9PNcDxLitUy8gjkzmWIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529308; 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=baQ14CR9fSHtDfUQ1GatN5XXPB8PYrF7ryBVHoZhE9I=; b=Qrx68763xjmtLec/Jst4ulYhTJQAdfDP1+bbJmHvU1LaMfnEa6atHqi9DyTB57dlE1Ur6T wHiLS0xcDl+6t3ZP9LDrylI31n0rEgBU5aWmszARf99c0uUkznlKYSaNq8U3n2v//flWxs utTUHrBJZuvBncrDirfUbZsKSirU3TZEC3HBHk2tg5HMpXj33Uwxp9R5+qUmH8KCDD3lRe ZFd4Ns80Y6vQuaXwPKRjvq1WG2J2KV3FjqZ29p0YCbpHaAl2GOWaP89tUjDeAgO8bjMW1R to5je/lBe6Fc85ktoroTgBKlHXrwHDEJhnfzkB5L3Vw4O1DgVS1dNWyBV+lIMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MJ4c1xzvtl for ; Thu, 19 Feb 2026 19:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46362 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 65338ff41fcd - releng/14.4 - tr: fix class handling in unicode world List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 65338ff41fcd0deb125767f550961418ab03cd82 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:28 +0000 Message-Id: <6997645c.46362.7e99686@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=65338ff41fcd0deb125767f550961418ab03cd82 commit 65338ff41fcd0deb125767f550961418ab03cd82 Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:22:24 +0000 tr: fix class handling in unicode world toupper/tolower logic was only handled for CCLASS_TOUPPER and CCLASS_TOLOWER, add support for CCLASS ([:alpha:]) PR: 219900 MFC After: 1 week (cherry picked from commit 625dc44832cd760be3d7242d8e21a530c7e32bfc) (cherry picked from commit 45d84c2f06fa72e405f09e2468b10bdf10b806cf) --- usr.bin/tr/tr.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 75638d6b3bc6..0eb9003ff831 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -253,6 +253,40 @@ main(int argc, char **argv) break; } while (s2.state == CCLASS_LOWER && s2.cnt > 1); goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_UPPER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towupper(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswupper(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip upper set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_UPPER && s2.cnt > 1); + goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_LOWER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towlower(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswlower(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip lower set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_LOWER && s2.cnt > 1); + goto again; } else { cmap_add(map, s1.lastch, s2.lastch); if (sflag) From nobody Thu Feb 19 19:28:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH3ML0VnPz6SK1k for ; Thu, 19 Feb 2026 19:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH3MK64rNz3ZF4 for ; Thu, 19 Feb 2026 19:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529309; 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=UmQoFnXWFPnUcJ3ZU0B3fahBtZRxaVJ60NJAafEkVBI=; b=GRFd9d+cNF2QcLabtceDdzlcA5GdaUj1rQpEUYbg5SWPJYRgUmf0vQQd2G8YPakS3auU+x rWlYHFC4Ehux9UtVbvvJBHiOoF7lq4fHqCvt27Q30yjB5PpXt67jYlGz20cupkHp7mswic n7scIuQB44bDoFBEFVLN3yKBfvMfzD8lBUzkacobZZukl9jbYvtCkZK8fAUbWRa7AZr30X 3nPs/vbEwrf6LagzLqWC5nQaMVJ+Z2ymaOKq+AWA82A4lG3pvoNYS9Is0tQ7g0DmpSpQfg 2++ja7w/wgNxmgcSUyTvnegMYMpCW5C4zueUpQbQjyx+iSmKUCuwy70Yqx8yBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529309; a=rsa-sha256; cv=none; b=QGMCgKMHcKGyFwn5HXC7uWRWp1fMDopw8fWf0NlEN337JC+ljkUDVvwSv2uOiUjUk8PkxV ycdXhmGZXdbRbZhx/HdYka+MexFxxL/2tDZmZ6fuRhCkOpYdJ3VUUtqY0C8baUWc/toLHo Q+1kuooZJsesGnmgm1HlQEsa8+oeI8bGSSKp3+UHT2EL4QmdGw7OkwNpbY1pV45fRxF/+k VdcpD4l4zkitkEmBnO6RcbepAKy/tZ/tNDwSwBgIYI4e7N42M80PDb69f7mStf68bEhbgL gRWcZeJTjVNr6ov0Em1U8sRlwAAt4zXUcWhmI5WcxxBMhbk0Qu7ihlvVjOJbqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529309; 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=UmQoFnXWFPnUcJ3ZU0B3fahBtZRxaVJ60NJAafEkVBI=; b=qZ+ZHYel81T8oQj4rjkHLgpGdnazXX5jBRtEw/4MAttvPz3QKQHyyj4hj0eJH+fktb0pLa R778AAS8k0zzo47EfN0+L/tOZEHdJfMSBzh0P4mL/ns7cTkDY6GT3zTowMQblFrqi+DQeN kVMUq9klpQTwi6T949ogWGjFaUNMV8rRlX1mSLHm0A0s6qUQnB/DUDGqEqavh32vGsPmmt /k7Voh+czVuDJNGuSdnHskLym8jjhR+ctK3zL30NDBSanzE8EGqgGcY49lSSOwv+kSSsi+ QHKCDsZIr/l4P+V3zm3m6MHhLNrkX6ziiUL0M4rF7k2snM4igmF8MB7+MmUglQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MK5QznzvhD for ; Thu, 19 Feb 2026 19:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45925 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 7805899ed791 - releng/14.4 - pci_vendors: update to 2026-02-10 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 7805899ed7913abba68668aae4df9290f91cc72c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:29 +0000 Message-Id: <6997645d.45925.7875b1c6@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7805899ed7913abba68668aae4df9290f91cc72c commit 7805899ed7913abba68668aae4df9290f91cc72c Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:33:11 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:22:24 +0000 pci_vendors: update to 2026-02-10 (cherry picked from commit 1acfc913e6b936dec3effc7d1e902a50e5432406) (cherry picked from commit b28b6c6d33ac7a015c55184b162e060cedeed4f6) --- share/misc/pci_vendors | 466 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 358 insertions(+), 108 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index bcb3d2f9e030..12ba7ca86ea5 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # -# List of PCI ID's +# List of PCI IDs # -# Version: 2025.12.12 -# Date: 2025-12-12 03:15:02 +# Version: 2026.02.10 +# Date: 2026-02-10 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -268,15 +268,7 @@ 0e11 409c Smart Array 6400 0e11 409d Smart Array 6400 EM 005a Remote Insight II board - Lights-Out - 007c NC7770 1000BaseTX - 007d NC6770 1000BaseTX - 0085 NC7780 1000BaseTX 00b1 Remote Insight II board - PCI device - 00bb NC7760 - 00ca NC7771 - 00cf NC7772 - 00d1 NC7783 - 00e3 NC7761 0508 Netelligent 4/16 Token Ring 1000 Triflex/Pentium Bridge, Model 1000 2000 Triflex/Pentium Bridge, Model 2000 @@ -324,7 +316,6 @@ b012 Netelligent 10 T/2 PCI UTP/Coax b030 Netelligent 10/100 TX UTP b060 Smart Array 5300 Controller - b0e1 NC3133 Fast Ethernet Module b178 Smart Array 5i/532 0e11 4080 Smart Array 5i 0e11 4082 Smart Array 532 @@ -839,6 +830,7 @@ 15d9 1d08 AOC-S4016L-L16IR Storage Adapter 17aa 7855 ThinkSystem RAID 950W-16i 8GB Flash PCIe Gen4 24Gb Adapter 1d49 020a ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA + 1d49 020c ThinkSystem 450W-16e PCIe Gen4 HBA 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) # 8 Internal and 8 External port channel 9400 HBA 1000 3040 HBA 9400-8i8e @@ -4027,6 +4019,7 @@ 1002 0b36 Reference RX 5700 XT 1458 2313 Radeon RX 5700 XT Gaming OC 1458 231d Radeon RX 5600 XT/REV 2.0 [Windforce 6GB OC] + 1462 381e RX 5600 XT MECH OC 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 1682 5701 RX 5700 XT RAW II 1849 5102 RX5700 CLD 8GO [ASRock Challenger D RX 5700 OC] @@ -4034,8 +4027,9 @@ 1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 1da2 e410 Sapphire NITRO+ RX 5700 XT 1da2 e411 Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] - 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M] + 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5300/5500M] 106b 0210 Radeon Pro 5300M + 106b 0219 iMac (Retina 5K, 27-inch, 2020) [Radeon Pro 5300] 7341 Navi 14 [Radeon Pro W5500] 7347 Navi 14 [Radeon Pro W5500M] 734f Navi 14 [Radeon Pro W5300M] @@ -4130,6 +4124,7 @@ 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] + 1462 7e26 Radeon RX 7800 XT [Nitro+] 148c 2427 RX 7800 XT [Hellhound / Red Devil] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC @@ -4153,6 +4148,7 @@ 1da2 e490 Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT] 7551 Navi 48 [Radeon AI PRO R9700] 7590 Navi 44 [Radeon RX 9060 XT] + 1458 2429 GV-R9060XTGAMING OC-16GD [Radeon RX 9060 XT GAMING OC 16G] 1eae 8601 RX-96TS316W7 [SWIFT RX 9060 XT OC White Triple Fan Gaming Edition 16GB] 75a0 Aqua Vanjaram [Instinct MI350X] 75a3 Aqua Vanjaram [Instinct MI355X] @@ -9547,7 +9543,7 @@ e1c5 0005 TA1-PCI e1c5 0006 TA1-PCI4 9036 9036 - 9050 PCI <-> IOBus Bridge + 9050 PCI9050 32-bit 33MHz PCI <-> IOBus Bridge 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended @@ -9583,6 +9579,8 @@ 15ed 1001 Macrolink MCCS 16-port Serial 15ed 1002 Macrolink MCCS 8-port Serial Hot Swap 15ed 1003 Macrolink MCCS 16-port Serial Hot Swap + 1761 018e 40-199-002 + 1761 025d 40-662-001 5654 2036 OpenSwitch 6 Telephony card 5654 3132 OpenSwitch 12 Telephony card 5654 5634 OpenLine4 Telephony Card @@ -10359,7 +10357,7 @@ 0068 nForce2 USB Controller 1043 0c11 A7N8X Mainboard a0a0 03b4 UK79G-1394 motherboard - 006a nForce2 AC97 Audio Controler (MCP) + 006a nForce2 AC97 Audio Controller (MCP) 1043 8095 nForce2 AC97 Audio Controller (MCP) a0a0 0304 UK79G-1394 motherboard 006b nForce Audio Processing Unit @@ -10962,6 +10960,7 @@ 1043 02fb V9250 Magic 1043 8180 V9520-X/TD/128M 107d 2967 WinFast A340T 128MB + 1462 9073 MS-8907 (FX5200-TDR128) 1462 9110 MS-8911 (FX5200-TD128) 1462 9171 MS-8917 (FX5200-T128) 1462 9360 MS-8936 (FX5200-T128) @@ -14006,6 +14005,7 @@ 1385 4700 MA521 802.11b Wireless PC Card 1737 0019 WPC11v4 802.11b Wireless-B Notebook Adapter 8185 RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller + 187e 8225 ZyAIR G-302 v3 818b RTL8192EE PCIe Wireless Network Adapter 8190 RTL8190 802.11n PCI Wireless Network Adapter 8191 RTL8192CE PCIe Wireless Network Adapter @@ -16955,7 +16955,8 @@ 11c9 Magma 0010 16-line serial port w/- DMA 0011 4-line serial port w/- DMA -11ca LSI Systems, Inc +11ca IBEX Technology Co., Ltd. + 0039 PAC with Altera Agilex 7 FPGA M-Series [IPAC-1000] 11cb Specialix Research Ltd. 2000 PCI_9050 11cb 0200 SX @@ -18686,6 +18687,7 @@ 1028 23a6 MTFDLBQ30T7THL-1BK1JABDA 1028 23a7 MTFDLAL61T4THL-1BK1JABDA 1028 23a8 MTFDLAL30T7THL-1BK1JABDA + 51cd 9650 PRO NVMe SSD 5404 2210 NVMe SSD [Cobain] 5405 2300 NVMe SSD [Santana] 5407 3400 NVMe SSD [Hendrix] @@ -20743,10 +20745,6 @@ f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. [MSI] 3483 MSI USB 3.0 (VIA VL80x-based xHCI USB Controller) -# This is MSI refreshed variant of their MECH series Navi 23 GPU card (73EF) - 5027 RX 6650XT MECH 2X - 7c56 Realtek Ethernet controller RTL8111H - aaf0 Radeon RX 580 Gaming X 8G 1463 Fast Corporation 1464 Interactive Circuits & Systems Ltd 1465 GN NETTEST Telecom DIV. @@ -20795,8 +20793,6 @@ 148a OPTO 148b INNOMEDIALOGIC Inc. 148c Tul Corporation / PowerColor - 2391 Radeon RX 590 [Red Devil] - 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 148d DIGICOM Systems, Inc. 1003 HCF 56k Data/Fax Modem 148e OSI Plus Corporation @@ -20924,8 +20920,9 @@ 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7663 MT7663 802.11ac PCI Express Wireless Network Adapter 7902 MT7902 802.11ax PCIe Wireless Network Adapter [Filogic 310] - 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter - 7916 MT7905D/MT7975 + 7915 MT7915A/MT7915D normal link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] +# MT7905D/MT7975 contain MT7915. If it works at G1 speed this extra device appears for extra bandwidth + 7916 MT7915A/MT7915D hif link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 1a3b 5300 ASUS PCE-AXE59BT @@ -20933,8 +20930,10 @@ 7927 MT7927 802.11be 320MHz 2x2 PCIe Wireless Network Adapter [Filogic 380] 7961 MT7921 802.11ax PCIe Wireless Network Adapter [Filogic 330] 7988 MT7988 PCI Express Host Bridge [Filogic 880] - 7990 MT7996 802.11be PCI Express Wireless Network Adapter (Port 0) - 7991 MT7996 802.11be PCI Express Wireless Network Adapter (Port 1) + 7990 MT7996 primary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7991 MT7996 secondary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7992 MT7992 primary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] + 799a MT7992 secondary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] 8650 MT7650 Bluetooth 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -22025,6 +22024,8 @@ 0e11 0042 Yogi # Integrated in CX86111/CX86113 processors 1830 CX861xx Integrated Host Bridge + 1f86 DBH CX11880 Codec + 1f87 SMIC CX11880 Codec 2003 HSF 56k Data/Fax Modem 2004 HSF 56k Data/Fax/Voice Modem 2005 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem @@ -22632,7 +22633,8 @@ 0224 CX9 Family [ConnectX-9 Flash Recovery] 0225 CX9 Family [ConnectX-9 Secure Flash Recovery-RMA] 0226 CX10 Family [ConnectX-10 Flash Recovery] - 0227 CX10 Family [ConnectX-10 Secure Flash Recovery-RMA] +# Name change request + 0227 CX10 Family [ConnectX-10 RMA] 0228 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Flash Recovery] 0229 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Secure Flash Recovery-RMA] 024e MT53100 [Spectrum-2, Flash recovery mode] @@ -22659,11 +22661,11 @@ 0274 Spectrum-6 in Flash Recovery Mode 0275 Spectrum-6 RMA 0277 Spectrum-6 Tile - 0278 Quantum-4 in Flash Recovery Mode - 0279 Quantum-4 RMA + 0278 NVLink-6 Switch in Flash Recovery Mode + 0279 NVLink-6 Switch RMA 027a Eros Chiplet - 027c Nvlink-7 Switch in Flash Recovery Mode - 027d Nvlink-7 Switch RMA + 027c NVLink-7 Switch in Flash Recovery Mode + 027d NVLink-7 Switch RMA 027e Spectrum-7 Tile 0281 NPS-600 Flash Recovery 0282 ArcusE Flash recovery @@ -22687,8 +22689,8 @@ 029a OPHY3.1 # Sagitta 029c OPHY3.5 - 02a0 Nvlink-8 Switch in Flash Recovery Mode - 02a1 Nvlink-8 RMA + 02a0 NVLink-8 Switch in Flash Recovery Mode + 02a1 NVLink-8 Switch RMA 02a2 Spectrum-7 in Flash Recovery Mode 02a3 Spectrum-7 RMA 1002 MT25400 Family [ConnectX-2 Virtual Function] @@ -22757,6 +22759,8 @@ 117c 00b4 FastFrame N322 Dual-port 25Gb Ethernet Adapter 117c 40b7 ThunderLink TLN3-3252 Dual-port 25Gb Ethernet Adapter 117c 40b8 ThunderLink TLN3-3102 Dual-port 10Gb Ethernet Adapter + 1458 0280 CLN4C44 + 1458 0281 CLN4C44 with NCSI 15b3 0001 ConnectX-4 Lx EN network interface card, 25GbE single-port SFP28, PCIe3.0 x8, tall bracket, ROHS R6 15b3 0003 Stand-up ConnectX-4 Lx EN, 25GbE dual-port SFP28, PCIe3.0 x8, MCX4121A-ACAT 15b3 0004 ConnectX-4 Lx Stand-up dual-port 10GbE MCX4121A-XCAT @@ -22809,6 +22813,7 @@ 1024 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch] 1025 CX9 Family [ConnectX-9] 1027 CX10 Family [ConnectX-10] + 1028 CX10 Family [ConnectX-10 Trusted Network Control Memory] 1974 MT28800 Family [ConnectX-5 PCIe Bridge] 1975 MT416842 Family [BlueField SoC PCIe Bridge] 1976 MT28908 Family [ConnectX-6 PCIe Bridge] @@ -22827,6 +22832,8 @@ 2024 MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge] 2025 ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge] 2100 CX8 Family [CX8 Data Direct Interface] +# Chip to Chip Link + 2101 CX10 Family [ConnectX-10 C2C] 4117 MT27712A0-FDCF-AE 1bd4 0039 SN10XMP2P25 1bd4 003a 25G SFP28 SP EO251FM9 Adapter @@ -22920,9 +22927,9 @@ d2f2 Quantum-2 NDR (400Gbps) switch d2f4 Quantum-3 d2f6 Quantum-3CPO - d2f8 Quantum-4 - d2fa Nvlink-7 Switch - d2fc Nvlink-8 Switch + d2f8 NVLink-6 Switch + d2fa NVLink-7 Switch + d2fc NVLink-8 Switch 15b4 CCI/TRIAD 15b5 Cimetrics Inc 15b6 Texas Memory Systems Inc @@ -23296,8 +23303,6 @@ 167e ONNTO Corp. 1681 Hercules 1682 XFX Pine Group Inc. - 5701 Radeon 5700 XT Thicc III Ultra - c580 Radeon RX 580 1688 CastleNet Technology Inc. 1170 WLAN 802.11b card 168a Utimaco IS GmbH @@ -23310,9 +23315,14 @@ # nee Atheros Communications, Inc. 168c Qualcomm Atheros 0007 AR5210 Wireless Network Adapter [AR5000 802.11a] + 1186 3a00 DWL-A650 5GHz Wireless CardBus Adapter + 1186 3a02 DWL-A520 5GHz Wireless PCI Adapter + 1668 0429 802CA Wireless PC Card 1737 0007 WPC54A Wireless PC Card 1b47 0100 Harmony 8450CN Wireless CardBus Module 1b47 0110 Skyline 4030 / Harmony 8450 802.11a Wireless CardBus Adapter + 1b47 0400 PC50E-8-FC/A Wireless Access Point Radio Card + 8086 2500 PRO/Wireless 5000 LAN CardBus Adapter 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5211 Wireless Network Adapter [AR5001A 802.11a] 0012 AR5211 Wireless Network Adapter [AR5001X 802.11ab] @@ -23807,6 +23817,7 @@ 7174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller 172a Accelerated Encryption 13c8 AEP SureWare Runner 1000V3 +172f Sparkle Computer Co., Ltd. # nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions 1228 iRMC-S5 HTI Device @@ -23877,12 +23888,22 @@ 0843 PCA-8439 General-purpose multifunctional PCIe card with 16 analog inputs ff00 CTU CAN FD PCIe Card 1761 Pickering Interfaces Ltd - 4411 50-297A + 4411 Pickering Devices with FPGA Based Bus Communication + 1761 082f 40-737-901 + 1761 086c 40-576-001 + 1761 0881 40-584-001 + 1761 311a 42-738-001 + 1761 3190 41-765-004 + 1761 31ab 41-670-003 1761 331f 50-297A-014 1761 3320 50-297A-050 1761 3321 50-297A-056 + 1761 3366 41-625-004 1761 3368 50-297A-130 1761 3372 50-297A-122 + 1761 33a1 40-419-004 + 1761 33a3 41-770-002 + 1761 3714 42-297A-050 1771 InnoVISION Multimedia Ltd. 1775 General Electric 177d Cavium, Inc. @@ -24503,6 +24524,7 @@ 08b0 MVC200-DC 1846 Alcatel-Lucent 1849 ASRock Incorporation + 1150 ASPEED AST1150 PCI-to-PCI Bridge 9602 RS780/RS880 PCI to PCI bridge (int gfx) 184a Thales Computers 1100 MAX II cPLD @@ -24537,8 +24559,6 @@ a102 VigraWATCH PMC a103 Vigra I/O 187e ZyXEL Communications Corporation - 3403 ZyAir G-110 802.11g - 340e M-302 802.11g XtremeMIMO 1885 Avvida Systems Inc. 1888 Varisys Ltd 0301 VMFX1 FPGA PMC module @@ -25170,6 +25190,8 @@ 1993 Innominate Security Technologies AG 1998 Toyou Feiji Electronics Co., Ltd. 0001 TOBOLT1 51987 NVMe SSD + 1998 0384 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD + 1998 0768 TOBOLT1 51987 7680G 2.5" U.2 NVMe SSD 1998 2012 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD 1999 A-Logics a900 AM-7209 Video Processor @@ -25325,7 +25347,7 @@ 19e5 0125 HBA SP186-M-40i 19e5 0180 HBA SP186-M-16i 19e5 0188 HBA SP186-M-8i - a120 HiSilicon PCIe Root Port with Gen4 + a120 HiSilicon PCIe Root Port a121 HiSilicon PCI-PCI Bridge a122 HiSilicon Embedded DMA Engine a124 HiSilicon Internal SDI Function Engine @@ -25385,7 +25407,7 @@ 15d9 086b X10DRS (AST2400 BMC) 15d9 1b95 H12SSL-i (AST2500 BMC) 15d9 1d50 X14DBG-AP (AST2600 BMC) - 1849 2000 ROME2D32LM3 (AST2500 BMC) + 1849 2000 Onboard Graphics 1a05 deltaww 1a07 Kvaser AB 0006 CAN interface PC104+ HS/HS @@ -26167,7 +26189,9 @@ # Nytro 5060H (Rocinante High Performance) non-SED 1bb1 0181 Nytro 5060H 1bb1 01a1 Nytro XP7102 + 0153 Nytro 5x50 NVMe SSD 0155 Nytro 5x50 NVMe SSD + 2000 PCIe Gen4 SSD 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD @@ -26277,6 +26301,8 @@ 3252 CH382 PCIe Dual Port Serial Adapter # Device ID reused: CH352 is for PCI bus, CH382 for PCIe. 3253 CH352/CH382 PCI/PCIe Dual Port Serial Adapter + 3470 CH384 Serial Adapter, 4-port mode + 3853 CH384 Serial Adapter, 8-port mode 1c09 CSP, Inc. 4254 10G-PCIE3-8D-2S 4255 10G-PCIE3-8D-Q @@ -26633,7 +26659,7 @@ 1602 LEGEND 900 NVMe SSD (DRAM-less) # SX6000LNP 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) - 2708 Premier Extreme microSDXC SD7.1 Express Card (DRAM-less) + 2708 Premier Extreme SDXC SD 7.0 / microSDXC SD 7.1 Express Card (DRAM-less) 32a8 SM2P32A8 NVMe SSD (DRAM-less) 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f4 IM2P33F4 NVMe SSD (DRAM-less) @@ -26695,6 +26721,12 @@ 5201 AM520 PCIe 3.0 NVMe SSD 128GB 5212 AM521 PCIe 3.0 NVMe SSD 256GB 5414 AM541 PCIe 4.0 NVMe SSD 1024GB + 6020 NVMe SSD Controller UM3X1X series + 1cc4 8320 NVMe SSD UM301a M.2 480GB + 1cc4 8321 NVMe SSD UM301a M.2 960GB + 1cc4 8322 NVMe SSD UM301a M.2 1.92TB + 1ea0 8320 NVMe SSD TM1300 M.2 480GB + 1ea0 8322 NVMe SSD TM1300 M.2 1.92TB 6201 AM620 PCIe 3.0 NVMe SSD 128GB 6202 AM620 PCIe 3.0 NVMe SSD 256GB 6203 AM620 PCIe 3.0 NVMe SSD 512GB @@ -26717,6 +26749,15 @@ 6b14 RPJYJ1T24MLR1HWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 6c13 AM6C1 PCIe 4.0 NVMe SSD 6d03 AM6DX PCIe 5.0 NVMe SSD + 7030 NVMe SSD Controller UH7X3X series + 1cc4 7112 NVMe SSD UH733a U.2 1.6TB + 1cc4 7113 NVMe SSD UH733a U.2 3.2TB + 1cc4 7114 NVMe SSD UH733a U.2 6.4TB + 1cc4 7115 NVMe SSD UH733a U.2 12.8TB + 1cc4 7122 NVMe SSD UH713a U.2 1.92TB + 1cc4 7123 NVMe SSD UH713a U.2 3.84TB + 1cc4 7124 NVMe SSD UH713a U.2 7.68TB + 1cc4 7125 NVMe SSD UH713a U.2 15.36TB 8030 NVMe SSD Controller UH8X2X/UH7X2X series 1cc4 1122 NVMe SSD UH812a U.2 1.92TB 1cc4 1123 NVMe SSD UH812a U.2 3.84TB @@ -26764,6 +26805,8 @@ 1ea0 6125 NVMe SSD TP3510 U.2 15.36TB 1ea0 6224 NVMe SSD TP3510 E3.S 7.68TB 1ea0 6225 NVMe SSD TP3510 E3.S 15.36TB + 1ea0 7124 NVMe SSD TP3512 U.2 7.68TB + 1ea0 7125 NVMe SSD TP3512 U.2 15.36TB 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -27243,6 +27286,7 @@ 1466 Data Fabric: Device 18h; Function 6 1467 Data Fabric: Device 18h; Function 7 1468 NTBCCP + 6211 K100_AI 7901 FCH SATA Controller [AHCI mode] 7904 FCH SATA Controller [AHCI mode] 7906 FCH SD Flash Controller @@ -27664,6 +27708,9 @@ 1de5 Eideticom, Inc 1000 IO Memory Controller 2000 NoLoad Hardware Development Kit + 2100 NoLoad Accelerator Platform + 2200 NoLoad Cryptographic Accelerator + 2300 NoLoad Data Services 3000 eBPF-based PCIe Accelerator 1ded Alibaba (China) Co., Ltd. 107f Elastic RDMA Adapter @@ -27798,6 +27845,7 @@ 05c0 PCIe 6 Fabric Switch PF6xxx [Scorpio] 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter +1e0b Shenzhen Decenta Technology Co.,LTD 1e0d SambaNova Systems, Inc 1e0f KIOXIA Corporation 0001 NVMe SSD Controller BG4 (DRAM-less) @@ -28235,6 +28283,7 @@ 50d0 NVME RAID Card DP800 50d1 Flexraid6 NVMeRAID 1e3d Burlywood, Inc +1e3e Shanghai Iluvatar CoreX Semiconductor Co., Ltd. 1e43 MaxLinear Inc 8904 MxL8904 8906 MxL8906 @@ -28278,12 +28327,12 @@ 1602 NVMe SSD Controller MAP1602 (DRAM-less) 1608 NVMe SSD Controller MAP1608 (DRAM-less) 1e4c GSI Technology - 0010 Associative Processing Unit [Gemini-1] + 0010 Gemini-I 1e4c 0010 Leda-E 1e4c 0120 SE120 - 0020 Associative Processing Unit [Gemini-2] - 1e4c 0010 Leda-E2 + 0020 Gemini-II 1e4c 0011 Leda-E2 rev 1.1 + 1e4c 0020 G2-Edge 1e50 IP3 Tech (HK) Limited 1e52 Tenstorrent Inc 401e Wormhole @@ -28464,6 +28513,7 @@ 1ec8 12a2 Fantasy I Device 8900 GR308 8902 GR3 Audio + 8904 GR308 9800 Fantasy II 1ec8 12a2 Fantasy II Device 9802 Fantasy II @@ -28481,6 +28531,7 @@ 1ed2 FuriosaAI, Inc. 0000 Warboy 0001 RNGD + 0002 RNGD-Plus 2222 RNGD-S 1ed3 Yeston 1ed5 Moore Threads Technology Co.,Ltd @@ -28808,10 +28859,26 @@ 1f0f 0001 D1055AS vDPA Ethernet Controller 1042 D1055AS vDPA Storage Controller 1f0f 0001 D1055AS vDPA Storage Controller + 1045 D1205CQ vPDA Ethernet Controller + 1f0f 0001 D1205CQ vPDA Ethernet Controller + 1046 D1205CQ vPDA Storage Controller + 1f0f 0001 D1205CQ vPDA Storage Controller + 1047 D1205CQ RDMA Ethernet Controller + 1f0f 0001 D1205CQ RDMA Ethernet Controller 1220 D1055AS Ethernet Controller 1221 D1055AS Ethernet Controller 1222 D1055AS Ethernet Controller 1223 D1055AS Ethernet Controller + 1224 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1225 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1226 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1227 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1228 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller 1600 M16104 Family 1f0f 0001 N1045XS, Quad-port 10GbE, PCIe 3.0 x8 1601 M16104 Family Virtual Function @@ -28832,6 +28899,7 @@ 1a02 M16102 Family 1f0f 0001 N1025XT, Dual-port 10GbE, PCIe 3.0 x4, Fan 2022 D1055AS PCI Express Switch Upstream Port + 2023 D1205CQ PCI Express Switch Upstream Port 3403 M18110 Family 3404 M18110 Lx Family 3405 M18110 Family BASE-T @@ -28852,9 +28920,13 @@ 3502 M18305 Family 1f0f 0001 S2055AS, 2x 25GbE, SFP28, PCIe 4.0 x8 1f0f 0002 S2025XS, 2x 10GbE, SFP+, PCIe 4.0 x8 + 3504 M18305 Family BASE-T + 1f0f 0001 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8, Fan + 1f0f 0002 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8 350a M18305 Family Virtual Function 1f0f 0001 M18305 Family Virtual Function 9088 D1055AS PCI Express Switch Downstream Port + 9089 D1205CQ PCI Express Switch Downstream Port 1f16 XConn Technologies c500 XC50256 CXL2.0 Switch c510 XC51256 PCIe 5.0 Switch @@ -28944,7 +29016,7 @@ 5236 NV7000 NVMe SSD 5765 PCIe 3 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited -1f47 YUSUR Technology Co., Ltd. +1f47 YUSUR Technology 1001 K2-Pro Family [FLEXFLOW-2200T] 1f47 0001 FLEXFLOW-2200T 2*10GE Ethernet Adapter 1f47 0002 FLEXFLOW-2200T 2*25GE Ethernet Adapter @@ -28984,6 +29056,10 @@ 1f47 0006 Ethernet 25G 2P FLEXFLOW-2200R 1f47 0007 Ethernet 50G 2P FLEXFLOW-2200R 1f47 0008 Ethernet 100G 2P FLEXFLOW-2200R + 3301 K3 Family [FLEXFLOW-3100R] + 1f47 0001 FLEXFLOW-3100R 1*100GE Ethernet Adapter + 3302 K3 Family [FLEXFLOW-3100R Virtual Function] + 3303 K3 Family [CONFLUX-3100R MGMT Function] 4001 K2-Pro Family [CONFLUX-2200E] 1f47 0001 Ethernet 25G 2P CONFLUX-2200E 1f47 0002 Ethernet 40G 2P CONFLUX-2200E @@ -29042,6 +29118,7 @@ 6002 K2-Pro Family [CONFLUX-2200X Virtual Function] 6003 K2-Pro Family [CONFLUX-2200X MGMT Function] 6004 K2-Pro Family [CONFLUX-2200X DATA Offload Engine] +1f49 NeuReality LTD 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. 1008 Mango GPUBoost - RDMA @@ -29084,6 +29161,13 @@ 1608 PCIe Gen4 x4 M.2 2280 1f88 TE3420 PCIe Gen3 x4 M.2 2280 2269 XE4403 Series NVMe PCIe Gen4x4 SSD + 3101 EP1021 Series M.2 2242 NVMe PCIe Gen3x4 SSD + 3105 EP2021 Series M.2 2242 NVMe PCIe Gen4x4 SSD + 3201 EP1021 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3202 EP1031 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3205 EP2021 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3206 EP2031 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3261 DP1421 Series M.2 2280 NVMe PCIe Gen3x4 SSD 3420 PCIe Gen3 x4 M.2 2280 6100 TE3420 Series NVMe PCIe Gen3x4 SSD 6101 XE3420 Series NVMe PCIe Gen3x4 SSD @@ -29198,6 +29282,12 @@ 0028 IC695RMX228 RX3i 128MB Redundancy Memory Xchange with Single Fiber transceiver 0029 IC695PMM345 PACMotion Digital Motion Control Module (EtherCAT) 002a IC695HSC318 RX3i High Speed Counter (8 counters) + 8003 IC695CPU310/CMU310/NIU001 RX3i Controller 300 MHz Celeron + 8004 IC695CPU315/320/CRU320 RX3i Controller 1.0 GHz Celeron-M + 8005 IC695PNS001/101 RX3i Profinet Scanner + 8006 IC695CPE/CRE330 RX3i Controller 1.0 GHz G-series + 8007 IC695CPE302/305/310/NIU001+ RX3i Controller 1.1 GHz Atom Z510 + 800d IC695CPE302/305/310/NIU001+ RX3i Controller Atom x3930 1fc9 Tehuti Networks Ltd. 3009 10-Giga TOE SmartNIC 3010 10-Giga TOE SmartNIC @@ -29351,6 +29441,7 @@ 2004 Smart Link Ltd. 201f SpacemiT 0001 X60 PCIe 2.0 x2 Root Complex + 0002 X100 PCIe Root Complex 202c CAEN S.p.A. 5818 A5818 2036 Netforward Microelectronics Co., Ltd. @@ -29360,10 +29451,29 @@ 2036 0862 NF1618 Family NX862 (2*50GE) 2036 0863 NF1618 Family NX863 (2*100GE) 2036 0864 NF1618 Family NX864 (1*200GE) + 2036 0865 NF1618 Family NX865 (2*200GE) 1619 NF1618 Family Virtual Function + 8000 NP36xxx PCIe Gen 6 Switch + 2036 0104 NP36104 PCIe Gen 6 26 port/104 lane Switch Upstream/Downstream Port + 2036 0144 NP36144 PCIe Gen 6 36 port/144 lane Switch Upstream/Downstream Port + 2036 1000 NP36000 PCIe Gen 6 Virtual Upstream/Downstream Port + 2036 1001 NP36000 Virtual PCIe MGR 1.x Endpoint + 2036 1002 NP36000 Virtual PCIe DMA 1.x Endpoint + 2036 1003 NP36000 Virtual PCIe NTB 1.x Endpoint + 2036 1004 NP36000 Virtual PCIe Placeholder 1.x Endpoint + 2036 1005 NP36000 Virtual PCIe C2PMem 1.x Endpoint + 2036 1006 NP36000 Virtual PCIe Pktgen 1.x Endpoint 203b XTX Markets Technologies Ltd. +2044 Shenzhen Jiahua Zhongli Technology Co., LTD. + 8200 CeaCent CS211X 12G SAS RAID controller + 2044 2110 CeaCent CS2110-8i + 2044 2111 CeaCent CS2110-16i + 8201 CeaCent CS215X 12G SAS RAID controller + 2044 2150 CeaCent CS2150-8i + 2044 2151 CeaCent CS2150-16i 2046 GXMICRO Technology (Shanghai) Co., Ltd. 2048 Beijing SpaceControl Technology Co.Ltd +2052 Frontgrade Gaisler AB 2058 Lime Microsystems Ltd. 205c Zhejiang VMing Semiconductor Co., Ltd. 1514 EP9410 U.2 1.92TB NVME SSD @@ -29372,6 +29482,21 @@ 1535 EP9430 U.2 3.2TB NVME SSD 1536 EP9430 U.2 6.4TB NVME SSD 205d Shanghai Zijing Xinjie Intelligent Technology Co., Ltd. +205e SDTECH + 0000 SD85xxx PCIe Gen5 Switch + 205e 0048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 205e 0096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 205e 0104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port + 205e 2004 SD85000 PCIe NT Endpoint + 205e 2005 SD85000 PCIe gDMA Endpoint + 205e 2006 SD85000 PCIe Management Endpoint + 5048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 5096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 5104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port 2061 Unis Flash Memory 4000 E4000 controller 4100 E4100 controller @@ -29402,6 +29527,19 @@ 2061 2061 E520Q NVMe SSD 30.72TB PCIe 5.0 U.2 2061 2062 E520Q NVMe SSD 61.44TB PCIe 5.0 U.2 2061 2063 E520Q NVMe SSD 122.88TB PCIe 5.0 U.2 + 5300 E5300 NVMe Controller + 2061 2041 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2042 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2043 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2044 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2045 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 2046 E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 + 2061 2085 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2086 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2087 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2088 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2089 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 208a E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 2063 Hubei Yangtze Mason Semiconductor Technology Co., Ltd. 0bb8 MC3000 0bb9 RC3000 @@ -29444,16 +29582,18 @@ 208a MICIUS Laboratory 2094 Shenzhen Wodposit Electronics Co., Ltd. 1281 WPBSNM8-256GTP - 1282 WPBSNM8-512GTP NVMe SSD (DRAM-less) + 1282 WPBSNM8-512GTP 1283 WPBSNM8-1TTP 1284 WPBSNM8-256GMP - 1285 WPBSNM8-512GMP - 1286 WPBSNM8-2TMP - 1287 WPBSNM8-1TMP - 1661 WPBSN4M8-512GMP - 1662 WPBSN4M8-1TMP - 1663 WPBSN4M8-2TMP - 1664 WPBSN4M8-1TGP NVMe SSD (DRAM-less) + 1285 WPBSN4M8-512GMP + 1286 WPBSN4M8-1TMP + 1287 WPBSN4M8-2TMP + 1661 WPBSNM8-512GMP + 1662 WPBSNM8-1TMP + 1663 WPBSNM8-2TMP + 1664 WPBSN4M8-1TGP + 1665 WPBSN4M8-2TGP + 1666 WPBSN4M8-4TGP 2096 Kaitian Information Technology Co., Ltd. 5401 KCP54(01) 2280 PCIe G4 x4 TLCKCP54(01) 2280 PCIe G4 x4 TLC 5402 KCP54(02) 2280 PCIe G4 x4 TLC @@ -29513,6 +29653,12 @@ 20e3 Elix Systems SA 20e7 TOPSSD 20f4 TRENDnet +20f6 Shenzhen Zhishi Network Technology Co., Ltd. + 0001 MPU H1 +20f9 Shenzhen Silicon Dynamic Networks Co., Ltd. +2106 ZCHL Technology Co., Ltd + 0001 HL100 Accelerator Controller + 2106 0001 HLC100 Accelerator Card 2116 ZyDAS Technology Corp. 21b4 Hunan Goke Microelectronics Co., Ltd 21c3 21st Century Computer Corp. @@ -29755,10 +29901,10 @@ 7173 CH355 PCI Quad Serial Port Controller 434e Cornelis Networks 0001 CN5000 HFI Silicon, Dual Port, BGA [discrete] - 434e 0001 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled - 434e 0002 CN5000 HFI Adapter, Dual Port, QSFP-DD, x16 PCIe Gen 5, Air-Cooled - 434e 0003 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled, Thermally Enhanced - 434e 0004 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Conduction-Cooled + 434e 0001 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5 + 434e 0002 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5 + 434e 0003 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5, II + 434e 0004 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5, II 0002 CN6000 HFI Silicon, Dual Port, BGA [discrete] 8001 CN5000 Switch Silicon, 48 Port, BGA 4444 Internext Compression Inc @@ -31172,6 +31318,8 @@ 0dc5 Ethernet Connection (23) I219-LM 1028 0c06 Precision 3580 0dc6 Ethernet Connection (23) I219-V + 0dc7 Ethernet Connection I219-LM + 0dc8 Ethernet Connection I219-V 0dcd Ethernet Connection C825-X 0dd2 Ethernet Network Adapter I710 1137 0000 I710T4LG 4x1 GbE RJ45 PCIe NIC @@ -32138,11 +32286,13 @@ 8086 0002 Ethernet Network Adapter E835-C-Q2 for OCP 3.0 8086 0003 Ethernet Network Adapter E835-CC-Q1 8086 0004 Ethernet Network Adapter E835-CC-Q1 for OCP 3.0 + 8086 0005 Ethernet Network Adapter E835-C-Q2 124a Ethernet Controller E835-CC for SFP 8086 0001 Ethernet Network Adapter E835-XXV-2 for OCP 3.0 8086 0002 Ethernet Network Adapter E835-XXV-4 8086 0003 Ethernet Network Adapter E835-XXV-2 8086 0004 Ethernet Network Adapter E835-XXV-4 for OCP 3.0 + 8086 0008 Ethernet Network Adapter E835-XXV-2 124b 82380FB (MPCI2) Mobile Docking Controller 124c Ethernet Connection E823-L for backplane 124d Ethernet Connection E823-L for SFP @@ -32856,7 +33006,7 @@ 1603 Broadwell-U Processor Thermal Subsystem 1604 Broadwell-U Host Bridge -OPI 1605 Broadwell-U PCI Express x8 Controller - 1606 HD Graphics + 1606 Broadwell-U GT1 [HD Graphics] 1607 Broadwell-U CHAPS Device 1608 Broadwell-U Host Bridge -OPI 1609 Broadwell-U x4 PCIe @@ -32867,19 +33017,19 @@ 160e Broadwell-U Integrated Graphics 160f Broadwell-U SoftSKU 1610 Broadwell-U Host Bridge - DMI - 1612 HD Graphics 5600 + 1612 Broadwell-H GT2 [HD Graphics 5600] 1614 Broadwell-U Host Bridge - DMI - 1616 HD Graphics 5500 + 1616 Broadwell-U GT2 [HD Graphics 5500] 103c 2216 ZBook 15u G2 Mobile Workstation 1618 Broadwell-U Host Bridge - DMI 161a Broadwell-U Integrated Graphics 161b Broadwell-U Integrated Graphics 161d Broadwell-U Integrated Graphics - 161e HD Graphics 5300 - 1622 Iris Pro Graphics 6200 - 1626 HD Graphics 6000 - 162a Iris Pro Graphics P6300 - 162b Iris Graphics 6100 + 161e Broadwell-Y GT2 [HD Graphics 5300] + 1622 Broadwell-DT/H GT3 [Iris Pro Graphics 6200] + 1626 Broadwell-U GT3 [HD Graphics 6000] + 162a Broadwell-DT GT3 [Iris Pro Graphics P6300] + 162b Broadwell-U GT3 [Iris Graphics 6100] 162d Broadwell-U Integrated Graphics 162e Broadwell-U Integrated Graphics 1632 Broadwell-U Integrated Graphics @@ -32920,7 +33070,7 @@ 18f3 Atom Processor P5xxx Series SATA Controller 1900 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1901 6th-10th Gen Core Processor PCIe Controller (x16) - 1902 HD Graphics 510 + 1902 Skylake-S GT1 [HD Graphics 510] 1903 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem 1028 06d6 Latitude 7275 tablet 1028 06dc Latitude E7470 @@ -32936,7 +33086,7 @@ 17aa 2247 ThinkPad T570 17aa 382a B51-80 Laptop 1905 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x8) - 1906 HD Graphics 510 + 1906 Skylake-U GT1 [HD Graphics 510] 17aa 382a B51-80 Laptop 1908 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1909 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4) @@ -32956,8 +33106,8 @@ 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 17aa 225d ThinkPad T480 - 1912 HD Graphics 530 - 1916 Skylake GT2 [HD Graphics 520] + 1912 Skylake-S GT2 [HD Graphics 530] + 1916 Skylake-U GT2 [HD Graphics 520] 1028 06dc Latitude E7470 1028 06f3 Latitude 3570 103c 8079 EliteBook 840 G3 @@ -32966,24 +33116,24 @@ 1919 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Imaging Unit 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 - 191b HD Graphics 530 + 191b Skylake-H GT2 [HD Graphics 530] 1028 06e4 XPS 15 9550 103c 825b OMEN-17-w001nv - 191d HD Graphics P530 - 191e HD Graphics 515 + 191d Skylake-DT/H GT2 [HD Graphics P530] + 191e Skylake-Y GT2 [HD Graphics 515] 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 191f Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1921 HD Graphics 520 1923 HD Graphics 535 - 1926 Iris Graphics 540 - 1927 Iris Graphics 550 + 1926 Skylake-U GT3 [Iris Graphics 540] + 1927 Skylake-U GT3 [Iris Graphics 550] 192b Iris Graphics 555 - 192d Iris Graphics P555 + 192d Skylake-H GT3 [Iris Graphics P555] 1932 Iris Pro Graphics 580 - 193a Iris Pro Graphics P580 - 193b Iris Pro Graphics 580 - 193d Iris Pro Graphics P580 + 193a Skylake-H GT4 [Iris Pro Graphics P580] + 193b Skylake-H GT4 [Iris Pro Graphics 580] + 193d Skylake-H GT4 [Iris Pro Graphics P580] 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller @@ -36467,6 +36617,7 @@ 2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers 15d9 0821 X10DRW-i 3101 Killer E3100X 2.5 Gigabit Ethernet Controller + 3102 Ethernet Controller I226-K 3140 Easel/Monette Hill Image Processor [Pixel Visual Core] 3165 Wireless 3165 8086 4010 Dual Band Wireless AC 3165 [Stone Peak 1x1] @@ -37831,6 +37982,7 @@ 103c 87b9 Thunderbolt Dock G4 PCIe NIC 17aa 2303 ThinkPad Universal Thunderbolt 4 Dock PCIe NIC 1ab6 0225 TS4 On-Board 2.5GbE Ethernet Adaptor + 5503 Ethernet Controller I226-LMvP 550a Ethernet Connection (18) I219-LM 550b Ethernet Connection (18) I219-LM 550c Ethernet Connection (19) I219-LM @@ -37854,7 +38006,11 @@ 56a3 DG2 [Arc Xe Graphics] 56a4 DG2 [Arc Xe Graphics] 56a5 DG2 [Arc A380] + 172f 3941 A380 ELF + 172f 3943 A380 ELF + 172f 4017 A380 Pioneer 56a6 DG2 [Arc A310] + 172f 4019 A380 ECO 56a7 DG2 [Arc Xe Graphics] 56a8 DG2 [Arc Xe Graphics] 56a9 DG2 [Arc Xe Graphics] @@ -37915,13 +38071,13 @@ 1af4 1100 QEMU Virtual Machine 5900 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5901 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x16) - 5902 HD Graphics 610 + 5902 Kaby Lake-S GT1 [HD Graphics 610] 5904 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 1025 115f Aspire E5-575G 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 5905 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8) - 5906 HD Graphics 610 + 5906 Kaby Lake-U GT1 [HD Graphics 610] 5909 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4) 590b HD Graphics 610 590c Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers @@ -37932,31 +38088,31 @@ 1462 7a72 H270 PC MATE 5910 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5911 Xeon E3-1200 v6/7th Gen Core Processor Gaussian Mixture Model - 5912 HD Graphics 630 + 5912 Kaby Lake-S GT2 [HD Graphics 630] 1043 8694 H110I-PLUS Motherboard 1462 7994 H110M ECO/GAMING 1462 7a72 H270 PC MATE 5914 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 17aa 225d ThinkPad T480 - 5916 HD Graphics 620 + 5916 Kaby Lake-U GT2 [HD Graphics 620] 1025 1094 Aspire E5-575G 17aa 2248 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen - 5917 UHD Graphics 620 + 5917 Kaby Lake-R GT2 [UHD Graphics 620] 17aa 225d ThinkPad T480 (20L5) 17aa 225e ThinkPad T480 5918 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers - 591b HD Graphics 630 + 591b Kaby Lake-H GT2 [HD Graphics 630] 591c UHD Graphics 615 - 591d HD Graphics P630 - 591e HD Graphics 615 + 591d Kaby Lake-DT GT2 [HD Graphics P630] + 591e Kaby Lake-Y GT2 [HD Graphics 615] 591f Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5921 HD Graphics 620 5923 HD Graphics 635 - 5926 Iris Plus Graphics 640 - 5927 Iris Plus Graphics 650 + 5926 Kaby Lake-U GT3 [Iris Plus Graphics 640] + 5927 Kaby Lake-U GT3 [Iris Plus Graphics 650] 5a84 Apollo Lake [HD Graphics 505] - 5a85 HD Graphics 500 + 5a85 Apollo Lake GT1 [HD Graphics 500] 5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit 5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster 5a9a Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine @@ -38019,6 +38175,19 @@ 65fa 5100 Chipset PCI Express x16 Port 4-7 65ff 5100 Chipset DMA Engine 674c CRI + 6e23 Nova Lake PCH-S SMbus Controller + 6e24 Nova Lake PCH-S SPI Controller + 6e28 Nova Lake PCH-S Serial IO UART Controller #0 + 6e29 Nova Lake PCH-S Serial IO UART Controller #1 + 6e2a Nova Lake PCH-S Serial IO SPI Controller #0 + 6e2b Nova Lake PCH-S Serial IO SPI Controller #1 + 6e4c Nova Lake PCH-S Serial IO I2C Controller #0 + 6e4d Nova Lake PCH-S Serial IO I2C Controller #1 + 6e4e Nova Lake PCH-S Serial IO I2C Controller #2 + 6e4f Nova Lake PCH-S Serial IO I2C Controller #3 + 6e5e Nova Lake PCH-S Serial IO SPI Controller #2 + 6e7a Nova Lake PCH-S Serial IO I2C Controller #4 *** 206 LINES SKIPPED *** From nobody Thu Feb 19 19:28:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MM23Dfz6SJvq for ; Thu, 19 Feb 2026 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH3MM04Plz3ZVB for ; Thu, 19 Feb 2026 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529311; 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=Bhb/O/ePKsXJJl6SrcAxdzKkK97HqICW8KHsKVBl+4c=; b=bdeeH6vZlQcNLxCiAkgsXrrmpO1SPBqcqyZiznlnrdI2unHqGzDrCRW6LsQNijrJT7nVla Dpk3R9LYxlvG4HFTVvegsTG6aYL+6/BfATRUgB+U/VZtzFbp7QhXgohfHII32eYGemJvUs Zcrp7LdNGmRptLL6h8lTwiFEZSJIUzxhwz+O0KPh3WvyLV4BsyguALRksoMSr2zeqOQcby POWrOG2bD+gBYBV1KSGMeUELA8wjFwQKjMrNR9edyxaQBZtH+aE0uIpKQ3YA5OOF/QstlE PeS3U7cgdII3YWPH6iNxf6yYl7RKmxTpIESBdq6EdZXYQ8JOb6hioqzHK1nqEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529311; a=rsa-sha256; cv=none; b=hW8NJyjvkQ7MW13i+jS5DOxTaRMGvSCpSIDCbXZrg4j1qIYzb/PU1MUQASYWHLirlKgoCR js+sv3aez9m0zyM4WSMNL/GkvMVle2rJKHyLESmvK+RzNtAfHslsPBlbEdRDbsg5w2D1tD MEtW4YxgQubeut7LMtchf+8gGPdF2QpPLqjCPFQu0+trKXvsFuBD/6GGT2ysEaBMxmAzN2 XCzveLGjEZzf3630PJiI8o/ufWiTBACrPb44zLv2OWSjzKAIypq7YwbV//jwqT7KjnfrX3 Qzm+1Dz0LfMbKm/R87882YzEZ2seCi0NUt8Er+xXZv4JzMPGXAdHu0stg+Sfug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529311; 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=Bhb/O/ePKsXJJl6SrcAxdzKkK97HqICW8KHsKVBl+4c=; b=LyBfPagebwffz/3/4yHFMPdfHXIBSSugQ2M2gYzfnAX9Jswh69ScEIfLku4PYqQcpSInug /HsqBbcOvNZO1T+cJhABrrfQIphH1a3fTEviwoQNS1S04X6kacx8JMt1XyJ02I+KdHej6s n/AHJp6X9UWEudgHj0AZdVPykcsed8sjX94mfnhk2uB5k0tKBk9RkuvEhMxRg7W7F/Pd2a DTkn7qe15JYNI1oB68Uweazg2FySXDy7p7QgDBVHajXfTxWse7yRZ+lXWCzI+JuoYeZnBK PPhUBuKkQ0nqoVt+j+Du44dCWrXuoCX4tnex9yqAHTzDDl0aI/5432P1SRqKxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3ML6LfYzvxJ for ; Thu, 19 Feb 2026 19:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44bb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 02138275effb - releng/14.4 - usb_vendors: update to 2025.12.13 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 02138275effb63e6cc18ab9ddfa95a3baf59f07c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:30 +0000 Message-Id: <6997645e.44bb5.4722ad3@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=02138275effb63e6cc18ab9ddfa95a3baf59f07c commit 02138275effb63e6cc18ab9ddfa95a3baf59f07c Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:38:37 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:22:24 +0000 usb_vendors: update to 2025.12.13 (cherry picked from commit 8d4c1043bb0630710cbea9f744cdaef499c0ed79) (cherry picked from commit 2f866e0547bd85e4fc66cf5468e8349931e365be) --- share/misc/usb_vendors | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index fa798e65ed9a..5832b6f9f660 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.09.15 -# Date: 2025-09-15 20:34:02 +# Version: 2025.12.13 +# Date: 2025-12-13 20:34:01 # # Vendors, devices and interfaces. Please keep sorted. @@ -24056,6 +24056,7 @@ C 08 Mass Storage 00 Control/Bulk/Interrupt 01 Control/Bulk 50 Bulk-Only + 62 USB Attached SCSI C 09 Hub 00 Unused 00 Full speed (or root) hub From nobody Thu Feb 19 22:08: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 4fH6wG4ns2z6SX7V for ; Thu, 19 Feb 2026 22:08: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 4fH6wG2b95z42Z9 for ; Thu, 19 Feb 2026 22:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8LwfoBUQL1z0/yvFMlSTgcQMXkLsjqp+bibW99upgQ=; b=FlrKAArja3AX8TFaTfnSzIrHSxoPZFOwGb2fPcKSUDv+VL2FqYSjgMQS/LRxVx2BGbQCS2 bBgYKyliDz/fsQ5XiKHTe3XBS9z8Y0PMthuX3ou8WvlFQPcaEpg0auMbr6lWrJ439v71/v b5jzivaHZgofvIt6jyPK2RnqXV9ZvORFAvyuPrnZbiDS3G1A/5JLqH/9VKfVVciAQ0Pq3t 68431Gs6Eb2ntG1X+YPl4zSjHc1j2ER5U+n0vnm3UixONqfDXOyQBYQ0FAWrxh2DXoUlew El99VJ1dMLpNiMLeVUfqhpSf/JHsS5MwSO7rlvIFg5b8Ezswms7Tu5oesm/j3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771538926; a=rsa-sha256; cv=none; b=u5ky8M5zEZgFNs8Ejn5j3PFdjrrSABXqAs8CB9h5ageVD2gvRFI5Is8AdNJ048lVay9+1e WwdvJEMMDGTWqsjh0GL+dYouLHTb3mhjsjsH0kAwxFHmLzbLnsaq4YduY2z/VKV/P/prot y28XMUtJ1v4ezO/81uPlcUlK5yKfs9FHxIFzF3grnzrK1xCDdb1aeuwVPqtiPRYsaRNUEl ORpwJsswtWFc8vALzy11LJadzDNiZEdJM4y5K5RrRMYR0c/9KE/n71YAU2/F4SywZWR6kO sZwu155bMjZQKj5cllGzXt6uC4SMJQ8zG3XO9qDvo6pb+LHloRcwzqnKeresFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8LwfoBUQL1z0/yvFMlSTgcQMXkLsjqp+bibW99upgQ=; b=bpjM5ZcyQ0SECwXTwaGtHPYxg1RMZdmrAmNOEtOhPsr4crD9iyNh4Oe2XWy2QtF+ixD8vE zVDMEX5GKJseCHXZ/CEqM0uchQwciDifcYHXF9Qc8YUdkkZo29ZXoTmpdYn7D/9fDDOxe7 myR/c9tSPSEqKdRvXLQNhaQ4mxCx8N82dRK47vBbt+PW/g/1Zx40dFNJv6HMGyFh5vSmmL XCq4lermoi7elUOgcZMEZO6FmGQ5K+ve4in0rndzJjPJVQaBWc8ip5LrgP+AN3jp+NHuBX tqJ/Gls6rn+Ye/k527rm4/psqz2bE+XdRsuu4pnyk4yiKLBq2LVojGSKbM3CDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH6wG1PXXz115X for ; Thu, 19 Feb 2026 22:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:08:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0558fa8f5596 - stable/15 - x86: add a safe variant of MSR_OP_SCHED* operations for x86_msr_op(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 0558fa8f55967b7a3967604649144540e462b74c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:08:46 +0000 Message-Id: <699789ee.26a33.c060ba0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0558fa8f55967b7a3967604649144540e462b74c commit 0558fa8f55967b7a3967604649144540e462b74c Author: Konstantin Belousov AuthorDate: 2026-02-01 23:43:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-19 22:05:20 +0000 x86: add a safe variant of MSR_OP_SCHED* operations for x86_msr_op(9) (cherry picked from commit af99e40af1dd4e8b39ca986240ee8b9aea722958) --- sys/x86/include/x86_var.h | 3 +- sys/x86/x86/cpu_machdep.c | 75 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index 215fe0562465..caaab207b57a 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -174,6 +174,7 @@ uint64_t rdtsc_ordered(void); * * All modes cause execution on the target CPU(s) with interrupts disabled. */ +#define MSR_OP_SAFE 0x08000000 #define MSR_OP_LOCAL 0x10000000 #define MSR_OP_SCHED_ALL 0x20000000 #define MSR_OP_SCHED_ONE 0x30000000 @@ -181,7 +182,7 @@ uint64_t rdtsc_ordered(void); #define MSR_OP_RENDEZVOUS_ONE 0x50000000 #define MSR_OP_CPUID(id) ((id) << 8) -void x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res); +int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res); #if defined(__i386__) && defined(INVARIANTS) void trap_check_kstack(void); diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5f8965bd5614..023b02ba7c76 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -118,15 +118,60 @@ struct msr_op_arg { int op; uint64_t arg1; uint64_t *res; + bool safe; + int error; }; static void -x86_msr_op_one(void *argp) +x86_msr_op_one_safe(struct msr_op_arg *a) +{ + uint64_t v; + int error; + + error = 0; + switch (a->op) { + case MSR_OP_ANDNOT: + error = rdmsr_safe(a->msr, &v); + if (error != 0) { + atomic_cmpset_int(&a->error, 0, error); + break; + } + v &= ~a->arg1; + error = wrmsr_safe(a->msr, v); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_OR: + error = rdmsr_safe(a->msr, &v); + if (error != 0) { + atomic_cmpset_int(&a->error, 0, error); + break; + } + v |= a->arg1; + error = wrmsr_safe(a->msr, v); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_WRITE: + error = wrmsr_safe(a->msr, a->arg1); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_READ: + error = rdmsr_safe(a->msr, &v); + if (error == 0) + *a->res = v; + else + atomic_cmpset_int(&a->error, 0, error); + break; + } +} + +static void +x86_msr_op_one_unsafe(struct msr_op_arg *a) { - struct msr_op_arg *a; uint64_t v; - a = argp; switch (a->op) { case MSR_OP_ANDNOT: v = rdmsr(a->msr); @@ -150,11 +195,24 @@ x86_msr_op_one(void *argp) } } +static void +x86_msr_op_one(void *arg) +{ + struct msr_op_arg *a; + + a = arg; + if (a->safe) + x86_msr_op_one_safe(a); + else + x86_msr_op_one_unsafe(a); +} + #define MSR_OP_EXMODE_MASK 0xf0000000 #define MSR_OP_OP_MASK 0x000000ff -#define MSR_OP_GET_CPUID(x) (((x) & ~MSR_OP_EXMODE_MASK) >> 8) +#define MSR_OP_GET_CPUID(x) \ + (((x) & ~(MSR_OP_EXMODE_MASK | MSR_OP_SAFE)) >> 8) -void +int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) { struct thread *td; @@ -167,8 +225,10 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) exmode = op & MSR_OP_EXMODE_MASK; a.op = op & MSR_OP_OP_MASK; a.msr = msr; + a.safe = (op & MSR_OP_SAFE) != 0; a.arg1 = arg1; a.res = res; + a.error = 0; switch (exmode) { case MSR_OP_LOCAL: @@ -209,8 +269,8 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) thread_unlock(td); break; case MSR_OP_RENDEZVOUS_ALL: - smp_rendezvous(smp_no_rendezvous_barrier, x86_msr_op_one, - smp_no_rendezvous_barrier, &a); + smp_rendezvous(smp_no_rendezvous_barrier, + x86_msr_op_one, smp_no_rendezvous_barrier, &a); break; case MSR_OP_RENDEZVOUS_ONE: cpu = MSR_OP_GET_CPUID(op); @@ -221,6 +281,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) default: __assert_unreachable(); } + return (a.error); } /* From nobody Thu Feb 19 22:08: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 4fH6wH4nnKz6SXRp for ; Thu, 19 Feb 2026 22:08: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 4fH6wH2cGnz426p for ; Thu, 19 Feb 2026 22:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=terVSF+qBUjB9VF4SVVFDISgQS8DjOBGAGoQEVU7yuk=; b=E4pIcEnvUB6npRqz4YZzX6fwQIw/BTczFa/tUokC+OY8udW9c254AgUzi/uRD0UWo0kb+S +cOU4ABOjwaXPSc2x2axStal1fuQK6nfGfiJPqyGtxNS6bNFVDyg1U31nufJop/kl2EA2Y qD+dpLcq5NhLfccPLLzZbk9D3aYClDgzFaIWLYEKxKw6V96cSV5tHxAO6U6Cx0h0FTPc8T DSJqrQjMlhcv5JeV3RCi1Xhy8Nlxbm8QhZcHn93G/Pjkyd8OI2EZgEmnkNDx6sx5JIeONm 7hOXBj/FRfMIkpuY+bybKv6hyeLB2lEgnxy1s+PxcL1FWI8RWSILNO4OspiO7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771538927; a=rsa-sha256; cv=none; b=H8nPgtmpHAEIhztDHoz/q5qeDIgoBsltsPYnGVlA15lvMQPzFPC976yp2bzjz/a4cld/Ky 9+kVZEisVDR9N13YwL8zWg0Y1RsDGSAUN+lTdirirhZ47tKtvczc6kDYQ2lVVbYo1VVqSN 6lE21dTRO+79RPZ6HOIrMa6CiZk3mRmCZ+LPrKxaODD8wtsoH13vRE7ioBrD14tnHRpHql ahlaGe9VcuoUi/drFbJkTapGGsQvsjXHM5DgFfE4nHuR1Z+LyvdOWRiaYGiqf39PrMBmek MCLdKiuHnMd7b6GMOPscSDK7Y1XvJHBK37shvmyZ9vAkCWYEg2HW4RKa8h/8eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=terVSF+qBUjB9VF4SVVFDISgQS8DjOBGAGoQEVU7yuk=; b=hal6wOE66WZ8W6EqYUmZn8LXr1TisgVXegUdSMwYc0y78HF4aQI6Z8lbevvrtC3F9rlyLp P6iKKhYgUW7bKxSAV7vbf/0WlH0DKRM8X14JmsPEt0NWK3I4BezsGKnIAv6xVWg0zL4Rch oX4jfZ0O+Vi7EwLj/7eVRxdz8xnxp+f1sHYmVIqvJE7hffyOIPhvtFvqLCdqZ72tAy+Uv7 6zlUCi0dXDhbyy2ZlE0VaKJ2yVzw0kSbfhdO68Wds1KtFlwy06LB1VlWNhp6ma9B+5VjTI zNskpXaVCJWr+N79e5WSWif/nYTLnAaot5v4lO1ljnGCjVyuF6lfZ84SdKAe/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 4fH6wH1hmtz115Y for ; Thu, 19 Feb 2026 22:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:08:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b0bc769c363e - stable/15 - x86_msr_op(9): consistently return the value read from MSR List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: b0bc769c363ef616c1e7c21a9d4b031be11ef00e Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:08:47 +0000 Message-Id: <699789ef.26c97.7eec5214@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0bc769c363ef616c1e7c21a9d4b031be11ef00e commit b0bc769c363ef616c1e7c21a9d4b031be11ef00e Author: Konstantin Belousov AuthorDate: 2026-02-04 00:24:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-19 22:05:20 +0000 x86_msr_op(9): consistently return the value read from MSR (cherry picked from commit 36ceb5509d01ff2e6482a78ca809c344574e9a25) --- sys/x86/x86/cpu_machdep.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 023b02ba7c76..6c3f4add6202 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -136,6 +136,8 @@ x86_msr_op_one_safe(struct msr_op_arg *a) atomic_cmpset_int(&a->error, 0, error); break; } + if (a->res != NULL) + atomic_store_64(a->res, v); v &= ~a->arg1; error = wrmsr_safe(a->msr, v); if (error != 0) @@ -147,6 +149,8 @@ x86_msr_op_one_safe(struct msr_op_arg *a) atomic_cmpset_int(&a->error, 0, error); break; } + if (a->res != NULL) + atomic_store_64(a->res, v); v |= a->arg1; error = wrmsr_safe(a->msr, v); if (error != 0) @@ -159,10 +163,12 @@ x86_msr_op_one_safe(struct msr_op_arg *a) break; case MSR_OP_READ: error = rdmsr_safe(a->msr, &v); - if (error == 0) - *a->res = v; - else + if (error == 0) { + if (a->res != NULL) + atomic_store_64(a->res, v); + } else { atomic_cmpset_int(&a->error, 0, error); + } break; } } @@ -175,11 +181,15 @@ x86_msr_op_one_unsafe(struct msr_op_arg *a) switch (a->op) { case MSR_OP_ANDNOT: v = rdmsr(a->msr); + if (a->res != NULL) + atomic_store_64(a->res, v); v &= ~a->arg1; wrmsr(a->msr, v); break; case MSR_OP_OR: v = rdmsr(a->msr); + if (a->res != NULL) + atomic_store_64(a->res, v); v |= a->arg1; wrmsr(a->msr, v); break; @@ -188,7 +198,8 @@ x86_msr_op_one_unsafe(struct msr_op_arg *a) break; case MSR_OP_READ: v = rdmsr(a->msr); - *a->res = v; + if (a->res != NULL) + atomic_store_64(a->res, v); break; default: __assert_unreachable(); From nobody Thu Feb 19 22:08: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 4fH6wJ5K0Nz6SXXx for ; Thu, 19 Feb 2026 22:08: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 4fH6wJ2rNtz42ZB for ; Thu, 19 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4tEt4wX5Ja3KQx0v702OUjLxGVLJiFRCz+mTMJkpDGE=; b=s1wrbn+8kdJFqIESGlxNn9X7vjEHpSp0n1WhYbyfx64laXU9t5Eb9qzt9jjcjb8D6u49Rj aWUkbkOcajQVoZEQ6r1cEHH2gNaMr6gcyBEIYqyREITz9dGTIkKrD16ZgVX+gEH4224PBo PYu+c+BR6CptPRuek9WUsmkdqmgjTgx/ZUeCPqzdNDPp/saN6JUKwFq4mUCU2hGWT6KLI1 OxIACjjIa4dgyzi1A2CDUugVA1D3Ypd49B00cHK2jB8vW8S+pydCm6NjN4l2cripoRMeRn G/WlAVdCQYnVR6q3VARHl51TKjFVDcWi2Injd6JnWYROamwZlIrhVD33wp4jpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771538928; a=rsa-sha256; cv=none; b=egMOrQ3WutPlIoJikxJ968Eukl/6H7Yxf/nRPrl4nGrg5idgrtaj3wbRVDaNiRNuLFMENM A6EtkUmxjrAIS/k9WVAuUWDyePvo3lzRZ/9rdTO5AukxX6J9jAdY/wfaoXKasq6e/kIStG KrA46OoFpdsxL06Uv5U68pfIzZms9W0p4RGECOKKUsdfBi3//+0URQiAnCQlHguugcMepA F99g+9JuA0RtHDwN1V422y7nn24VIeMuIyxtJJXNfdVRqOsBJNLuqgZw56LQtcolHTgbxL ryuDUZd+ergIsdm6xPWDI8NGgPm3mB6lMFcNpPh47iz5PxBYc4lDA81Wld0kMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4tEt4wX5Ja3KQx0v702OUjLxGVLJiFRCz+mTMJkpDGE=; b=nJHEGK+8E7pAvdLJL6DW7EjsyEu7mgowohR2aaYbZK05jqTgaMPBPDd62LeULTZlUIpbgf 4Jm0wIK3G/PVtjGrN4MQVzsQX1uipQX4FkkC/D7QkM+cxh/A7pK00YKaWO4VNk6KT1WFQE lw06tiCmYbcb6kIrNChvNEVUcGueWiGo6YVgs4UkmYZZxPp5YCr/ObReKRpmKQ9A6dSZmt LT9M0vG8Jbg4CI2pR0X0YxcbuoIbXR6CozvxL4EC25kk/XX3aWKjbmQrmnO4ldKRFusEyl QPitZSKXnes2DZC/MN1JtEa2hE0LZhzPk1fLOrTyQ+3zIb8XN8s5xCNnpjY31A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH6wJ2RShz11HW for ; Thu, 19 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25af8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:08:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e334b70a2b5b - stable/15 - x86: provide extended description for x86_msr_op(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: e334b70a2b5b162cc82137776386fa76dc2eda48 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:08:48 +0000 Message-Id: <699789f0.25af8.348a9bbe@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e334b70a2b5b162cc82137776386fa76dc2eda48 commit e334b70a2b5b162cc82137776386fa76dc2eda48 Author: Konstantin Belousov AuthorDate: 2026-02-04 00:22:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-19 22:05:20 +0000 x86: provide extended description for x86_msr_op(9) (cherry picked from commit cb81a9c18db93a2046c47b0c7dc0bd6adcdd2495) --- sys/x86/include/x86_var.h | 6 ++---- sys/x86/x86/cpu_machdep.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index caaab207b57a..40dd21107436 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -162,7 +162,7 @@ void x86_set_fork_retval(struct thread *td); uint64_t rdtsc_ordered(void); /* - * MSR ops for x86_msr_op() + * MSR ops for x86_msr_op(). */ #define MSR_OP_ANDNOT 0x00000001 #define MSR_OP_OR 0x00000002 @@ -170,9 +170,7 @@ uint64_t rdtsc_ordered(void); #define MSR_OP_READ 0x00000004 /* - * Where and which execution mode - * - * All modes cause execution on the target CPU(s) with interrupts disabled. + * Where and which execution mode. */ #define MSR_OP_SAFE 0x08000000 #define MSR_OP_LOCAL 0x10000000 diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 6c3f4add6202..5483fbd6dd4e 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -223,6 +223,49 @@ x86_msr_op_one(void *arg) #define MSR_OP_GET_CPUID(x) \ (((x) & ~(MSR_OP_EXMODE_MASK | MSR_OP_SAFE)) >> 8) +/* + * Utility function to wrap common MSR accesses. + * + * The msr argument specifies the MSR number to operate on. + * arg1 is an optional additional argument which is needed by + * modifying ops. + * + * res is the location where the value read from MSR is placed. It is + * the value that was initially read from the MSR, before applying the + * specified operation. Can be NULL if the value is not needed. If + * the op is executed on more than one CPU, it is unspecified on which + * CPU the value was read. + * + * op encoding combines the target/mode specification and the requested + * operation, all or-ed together. + * + * MSR accesses are executed with interrupts disabled. + + * The following targets can be specified: + * MSR_OP_LOCAL execute on current CPU. + * MSR_OP_SCHED_ALL execute on all CPUs, by migrating + * the current thread to them in sequence. + * MSR_OP_SCHED_ALL | MSR_OP_SAFE execute on all CPUs by migrating, using + * safe MSR access. + * MSR_OP_SCHED_ONE execute on specified CPU, migrate + * curthread to it. + * MSR_OP_SCHED_ONE | MSR_OP_SAFE safely execute on specified CPU, + * migrate curthread to it. + * MSR_OP_RENDEZVOUS_ALL execute on all CPUs in interrupt + * context. + * MSR_OP_RENDEZVOUS_ONE execute on specified CPU in interrupt + * context. + * If a _ONE target is specified, 'or' the op value with MSR_OP_CPUID(cpuid) + * to name the target CPU. _SAFE variants might return EFAULT if access to + * MSR faulted with #GP. Non-_SAFE variants most likely panic or reboot + * the machine if the MSR is not present or access is not tolerated by hw. + * + * The following operations can be specified: + * MSR_OP_ANDNOT *res = v = *msr; *msr = v & ~arg1 + * MSR_OP_OR *res = v = *msr; *msr = v | arg1 + * MSR_OP_READ *res = *msr + * MSR_OP_WRITE *res = *msr; *msr = arg1 + */ int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) { From nobody Thu Feb 19 22:56: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 4fH7z43bKZz6Sbrv for ; Thu, 19 Feb 2026 22:56: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 4fH7z41wr0z4DN0 for ; Thu, 19 Feb 2026 22:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771541776; 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=ezOux77qg42FgnB87MPQe3mKgpdJCZ6awtGqHenp6dQ=; b=XUSuAZ0+ndpDu8/ixdNurC3Y4alNbPwcbQVB3LHkiA8dEvj2izpeHqDy38xyU4jt53jBdt cPa03V3IECPPol9FnThuYoLKKC/+8s/ZJyiJv6UoyNFrv0D6C8Cefpdjvl+Kix/UehT0Xn M8LceE/ci10cp0TJgXzK/6I1gMBJa2tU/xdZadn2QuDuIvcK0HJiTATbwXfJO75mOxwB9S aTw0sRAO4lxBf2ar8odAeOwUvxEoxoN9y1ZBKq+eHIja4VCQTp0aOzmHeN8CrQHdT06z1o +E542QnMwz4JAFhPdwPjxEb7oEXpHYvHx5pa3OjAF681mVcNR3pY+jmGa20B+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771541776; a=rsa-sha256; cv=none; b=FU1WoS2XraSVcamDmleytGbq2t1GYLWzAk3dd1nJOfcRLOZ7js7ooKeMzoeEFsc+hNVrW7 qquJpBLDWmwJDTG/x8Ai307tG41KKfNEumGLVwO8gzydXvmuFJlFi/N2yto8TJ4OBuqffv r+cYx1NeQP6/auzOHuClYkY+igQGXzwB7utx2d22iEQytxIK3XVNk/bADmk/hXNgvbItMS zcNvqaTsKvee2ig/lhAZUGgKgUz7vuQuSW7xZEW3VXST/kDhtFwcF8KHSXulpXyM6Kwgtn KV+smcFwSZt8w9WcPP1T7mBE5OgWpho1d4dRrsbZruNJWtI1D8nwAWrbiFhZVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771541776; 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=ezOux77qg42FgnB87MPQe3mKgpdJCZ6awtGqHenp6dQ=; b=rJEoirZ6PVA93vPLs5XNs5UjNh7V0A9NNtsgE4IhGOuD+h04ER4BlfX+n90Tg7Mym9m4Oo nCfWI7YZBIWstljJVzoeomf5dkmakQJppJ7xVS/bvgmsL4+uo4JWdkDaA8goNCNqyY0USi syGde3mOzC53gF7LaouUUMvxKiXDo+b9TLEJe2BUuerKUSYB+EnRAYtryyCC7nUHU5ObO0 BH9nqjVxrjz581uw/WHhgRSiH6C4lF7EooFgxFdgYxBbbP5d8IWkuNs8v2yQIM0oQxASs+ bhTDHaNBGPY1zptB9QihpR4LHMeh+Edcqv78VEj8pFj/hDkM9PW6z0X3U0ERBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH7z40rYRz11gY for ; Thu, 19 Feb 2026 22:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:56:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Colin Percival Subject: git: 7c81bf519154 - releng/14.4 - ng_ksocket: use new macros to lock socket buffers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 7c81bf51915437bf78c63b3d4772a74bada79251 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:56:16 +0000 Message-Id: <69979510.33c9c.3bf61943@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7c81bf51915437bf78c63b3d4772a74bada79251 commit 7c81bf51915437bf78c63b3d4772a74bada79251 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Colin Percival CommitDate: 2026-02-19 22:54:18 +0000 ng_ksocket: use new macros to lock socket buffers PR: 292885 Reported by: Walker R. Thompson (cherry picked from commit 1a3d1be4965afddded0b2582b9c4969c1e6a4129) (cherry picked from commit 4dc38e71ccd522bc5460f3ded3977baa35dad4b9) --- sys/netgraph/ng_ksocket.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 777f3261356d..5baf25579fd9 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -608,12 +608,12 @@ ng_ksocket_connect(hook_p hook) struct socket *const so = priv->so; /* Add our hook for incoming data and other events */ - SOCKBUF_LOCK(&priv->so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(priv->so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_rcv); - SOCKBUF_LOCK(&priv->so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(priv->so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_snd); + SOCK_SENDBUF_UNLOCK(so); SOCK_LOCK(priv->so); priv->so->so_state |= SS_NBIO; SOCK_UNLOCK(priv->so); @@ -1239,12 +1239,12 @@ ng_ksocket_accept(priv_p priv) */ LIST_INSERT_HEAD(&priv->embryos, priv2, siblings); - SOCKBUF_LOCK(&so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_snd); + SOCK_SENDBUF_UNLOCK(so); /* Fill in the response data and send it or return it to the caller */ resp_data = (struct ng_ksocket_accept *)resp->data; From nobody Fri Feb 20 00:00: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 4fH9Nh4nWkz6Shhv for ; Fri, 20 Feb 2026 00:00: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 4fH9Nh4173z4MMJ for ; Fri, 20 Feb 2026 00:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771545604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRag3G3zPXCOX1tYlvMv0IeSekiXz36PwVLsQCDit0w=; b=iCsExCq4x5VQKpJSo3nzbHlgnaapljshTSXYwuZJGIQG+4ACDnRCoLvWrxEyNB3EPJl6Yu 9vNZCESNSl+jQo4BNQh8OYK/bvi5Nj1jH3iZ4Ed3bV0Wj71Xa0W2OSWm8MPKbdaaIMp5i2 ni7jDFT7u1iF/PRtkwOk7oibTPxXTA1ixRBQCcwn+ISI+eA+ii+WTO7s2luS4CFrfMHE7Z qtoJ5584nRUDuiGvOXxUQBY4VY2bP2+WcNPHiLn4Jw2L0cpCDlp5dJyyjFn23gD4nQKUo8 C/eyrmFjqkGNFIi8mXFc9xvMmidMjfpLy6ghvQmfawB10feiSmLFYkttKQV3jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771545604; a=rsa-sha256; cv=none; b=SFN7Q0AA9p7G3pkEtsUsHzCxCUfDBfg4cQNPmSzJRPS7Fd/hP8o0CjjnVCt3aDtCCBWWfZ TxGtU1igb3wq7hCQUaCk+IL5Q1u3D04QR9JtGESrVVdG7XXCcj7btaSzs+ZDdHBzT9AmJD 6E2zHCUiSD0Xew1L7bdVccOUU+KZN9sAzGanmgGV0PmS3OPCcdA75kXt0lnJwB3PXgHryv hhYrETY39WNs4ecCJUohLLE46kO6Q8LN40DF+dTSTyox07mckmfwnZ3FbH7Eg0gFfmltc6 +FNZIBTZjhVGjqtBjCLE69G9FHE3ZK3PX+PoeumqEeDuQaTZllZ/2wIcJe2Rzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771545604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRag3G3zPXCOX1tYlvMv0IeSekiXz36PwVLsQCDit0w=; b=eDoXs6jBWPoKQUtsDVIDoYHUm0cOFwhV6Z6h5tJzh3llgMDQ0Jee8xd8A8fNwf+xSmNLHR B8T/hoz5uRSV9/6l2bZUL623VGGFJHSUToxD5d6Y3y+ceUNlflW9kvWjneaPxTXmysIiRC 3IjRXst4o+KVSNvy/DcIUCFjW0X4eVPTK636nqCVup06h+ZIp+I29hq56jschLDWeae6Fa U5j5Gztfoqut4ApOvTbm4Kz3hiAcCRh/FwhJ5WIoa/UtoQpcxW/1NsneV1OvhehAD4blCc eVqK4jCk5/T9NuPS1F6DnIEFwQyPTp+KfYjKbaSpwsd1x2lXgLyDQhJXr49X5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH9Nh3KNFz13Pd for ; Fri, 20 Feb 2026 00:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b72b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 00:00:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0c49d9fafc33 - releng/14.4 - 14.3: Update to BETA3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 0c49d9fafc333c96ab6a724cfb14789d7fb85150 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 00:00:04 +0000 Message-Id: <6997a404.3b72b.50d1378@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0c49d9fafc333c96ab6a724cfb14789d7fb85150 commit 0c49d9fafc333c96ab6a724cfb14789d7fb85150 Author: Colin Percival AuthorDate: 2026-02-20 00:00:00 +0000 Commit: Colin Percival CommitDate: 2026-02-20 00:00:00 +0000 14.3: Update to BETA3 Approved by: re (implicit) Sponsored by: OpenSats Initiative --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 56e98241e7c8..905c41c4d0d4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.4" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Feb 20 00:02: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 4fH9S94tjgz6Sj3g for ; Fri, 20 Feb 2026 00:03:05 +0000 (UTC) (envelope-from 0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH9S93GBmz4Mmc for ; Fri, 20 Feb 2026 00:03:05 +0000 (UTC) (envelope-from 0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn header.b=gDFULBvL; dkim=pass header.d=amazonses.com header.s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw header.b=i1LdSo4L; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@amazonses.com designates 54.240.8.237 as permitted sender) smtp.mailfrom=0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@amazonses.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1771545779; h=Message-ID:Date:MIME-Version:Subject:From:To:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=/Z/DN0iObPKLLbwAYLVrvuT8THUCiYtRb3C0QxAmqiQ=; b=gDFULBvL3r0IxuA6RSZ6ak8coCaIPQuulqz6L95xgVI/K4pM7VL3KWSF+3wfDr2r bhtSoycC+CaAGHJZiN4ktGmhU3wzuvjXaFeKZMt+1C+t5iQNV3+NL4B8WTUoRcQ1pku fWabwTqbctBGwADnrZD7IRBNXWSm+EvJI5n9PGH0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1771545779; h=Message-ID:Date:MIME-Version:Subject:From:To:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=/Z/DN0iObPKLLbwAYLVrvuT8THUCiYtRb3C0QxAmqiQ=; b=i1LdSo4Lh5fLPon5PcX25gtdC4mIGmOf2iummbUaLeS4Sciln6lGsN4sQYQYOtWM dckHrfn2OzXN1ErowEiGTAB8JN5y+aBG2/9tTvxr1/vPr8YMB372BTGH8+TzIped8yT gVP7C/V2gSG3Zke/T7LTJj8TBU4x2FMTkaxLkWks= Message-ID: <0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@email.amazonses.com> Date: Fri, 20 Feb 2026 00:02:59 +0000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 0c49d9fafc33 - releng/14.4 - 14.3: Update to BETA3 From: Colin Percival To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <6997a404.3b72b.50d1378@gitrepo.freebsd.org> Content-Language: en-US Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <6997a404.3b72b.50d1378@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2026.02.20-54.240.8.237 X-Spamd-Result: default: False [-1.16 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.956]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@amazonses.com]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn,amazonses.com:s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; ONCE_RECEIVED(0.10)[]; RWL_MAILSPIKE_GOOD(-0.10)[54.240.8.237:from]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-branches@FreeBSD.org]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,0100019c785b5e08-08fc3937-b6c0-4a8b-9a99-74537a675037-000000@amazonses.com]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.237:from]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; RCVD_COUNT_ZERO(0.00)[0]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+] X-Rspamd-Queue-Id: 4fH9S93GBmz4Mmc X-Spamd-Bar: - On 2/19/26 16:00, Colin Percival wrote: > 14.3: Update to BETA3 ^^^^ That's 14.4, of course. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Fri Feb 20 02:23: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 4fHDZk0C8nz6QRfb for ; Fri, 20 Feb 2026 02:23: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 4fHDZj6V5rz3N17 for ; Fri, 20 Feb 2026 02:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FK0T+TYcLy7pVlaJKeSjrEZbqm9e/qP+qj81oTEOvM=; b=Dl3bHwxwkDPMPns0AMwNYzpxwKAfHU3w2Mqdfp3Zp1y+Mkie7nyqHMSYh97n3yJ2Y4RZDb J95UWiehHxXitA2tLF3n9S3VBBRkjxW1NMxH4/gYRl25KsRDScONhs7X8hEf/RE+VMQ5Uu NMQGvwBI2SnZO/jJWaSYiw/iTWBgMwFrfrqBufY+/e7cEvXfSSy1Wzqrs4edNj0n/f5CGU 2zeMGMBvyn/VfCjk8ka1nmnMYvrm5LOf23XOemAzLOrOstjf4/8Wak0a1EZAcA1d975/5p sHDeEIm2lRI40pTiuxBNqxO/YmLIlYcPV37dg8vG4dXxs2I0FTPxz/zgpDHDrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771554237; a=rsa-sha256; cv=none; b=FNQ8XY2110+S/wRjsoYkNcl8RG7sbUbAIjsA8B9ugz2nBOgKvAwr6lqvbnwrf7cDhiw2OE tNNQzh0umd0QFjuefqf90EzUdPp9WNcBb6BVAM3bpaIeKkEbUGSN5VFXroEuje58BE76hS EEZcRXrNBkSoozNzJT68HAHegLXUwk9ZsgFkDnkDlN1olg4ZqxqqK+XP+2Fs31oybOVgUD 2ge4P/rmUGFaIRfEH013k/ndxkWNXlX1HeMI7xJyPsJYAA3x2GMnChURIVMkqxbMa4CI+3 oFrpVL75lfe0SslccNZVe9wWRty03GwfMpQMoJLGfuhKZ8zsa647wNet61pLgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FK0T+TYcLy7pVlaJKeSjrEZbqm9e/qP+qj81oTEOvM=; b=J0ES80cnp7IhI4sZohlEWJZT+oyhK0+divHOJSTDJLsxfufdIC+SgsvUFHWnVNIQF4sJc+ 2mPiUBIR9stcc7jX3vOi/fIhcUWamUc1/aO3anofgGASEOV9Pe5b6HV+6HCtvmCAs404Ks HCvGtSfvsGvk0RTon6qHdYsJAcd+a14uiDDAaXsrdiQV/8QvE4JB+y1UXrA8BrW+zBIspb hX/5ctAyYOwVRibugWaDLkDGELMnDoqddm/RInWPkxVv91euX7Q7TpVfhO7QrXcy7Nu5Ym hSNChRTzEqoSI+0kwdBudFAQ/VNQ4edrNkXCehHzGGiKzcnk1GfJNPSjECLCPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHDZj64Yzz17MQ for ; Fri, 20 Feb 2026 02:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1908d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 02:23:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: dda404ebddf2 - stable/15 - ipfilter: Fix possible overrun List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dda404ebddf271733ba3e90858fdd5e41e8b3cc8 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 02:23:57 +0000 Message-Id: <6997c5bd.1908d.25d48799@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=dda404ebddf271733ba3e90858fdd5e41e8b3cc8 commit dda404ebddf271733ba3e90858fdd5e41e8b3cc8 Author: Cy Schubert AuthorDate: 2026-02-04 17:27:23 +0000 Commit: Cy Schubert CommitDate: 2026-02-20 02:23:43 +0000 ipfilter: Fix possible overrun The destination buffer is FR_GROUPLEN (16 bytes) in length. When gname is created, the userspace utilities correctly use FR_GROUPLEN as the buffer length. The kernel should also limit its copy operation to FR_GROUPLEN bytes to avoid any user written code from exploiting this vulnerability. Reported by: Ilja Van Sprundel (cherry picked from commit e40817302ebdf89df2f3bcd679fb7f2a18c244dc) --- sys/netpfil/ipfilter/netinet/fil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index 242affeff000..355c633d59d8 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -3503,7 +3503,7 @@ ipf_group_add(ipf_main_softc_t *softc, char *group, void *head, u_32_t flags, fg->fg_head = head; fg->fg_start = NULL; fg->fg_next = *fgp; - bcopy(group, fg->fg_name, strlen(group) + 1); + bcopy(group, fg->fg_name, strnlen(group, FR_GROUPLEN) + 1); fg->fg_flags = gflags; fg->fg_ref = 1; fg->fg_set = &softc->ipf_groups[unit][set]; From nobody Fri Feb 20 02:23: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 4fHDZl1Md0z6QRfd for ; Fri, 20 Feb 2026 02:23: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 4fHDZl0F42z3N18 for ; Fri, 20 Feb 2026 02:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOssPc6kLPiWlI2q5Hc/K1JT08oo6snTrjAODGc2kSQ=; b=XjCPsatxfyVxd6BZNsk5nZ2q25/HVa7JiQ2iZGDcrw7EqE5gRA2cO/BR9sjxGRQjML8BKs Ns5s5vmQRLZ07wcLcdMBZxqdVlJuHt+Mx/ZBGjR/8i+PvTZ6qEkqkAAip0/H/+Zti/D54K +hZB4FIZBS8Bd7jZB8KweVDaTNAVAMCUBxyqmI2IB9GQKBqJ0DKss4rc//GVNZxEvRW9KE h+LIsL4MLm4dqBGzH7AVdKg7ltp4lpr/VYTUKpF7hM7qAHXVIKomULvvbyq1+aiJY6z6zS 3aRKruAphHdMzHy/F/oDIXwtMSTbKuhe+4Bc3SnJlajC/k8L2SakInns67PY/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771554239; a=rsa-sha256; cv=none; b=dSWn1ETRhCDj+zmd0LpsMctTjntFsTdoEsbfSBvwcCgRxEEM8Ixr/5NAfPQVTHcHOUpHAC Of8xenUc0l3/xFlIrhQ+manE2ynDYyLiRUODXX+dQtnQ5+6taWiCbxED+IUBZR81aXmJ+q GTN4Kmi25YByGQyf0IfQePVAnBSICF602VUOn5FUELORYe5OHCH5r7htWcLJCEF+B5jxJ1 W/RAfhUIgX2zxGmgAAENdXjy6Bj49npo7DsL7Ld6mfuDv0EHkducs3jzcqCTfjyYJ5LrDp Jii2srO1Kvjypr8nooCXGqcbaz/GC8djvGZIn8b5ihWVAYEwaIQ6Oz5vsKWM3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOssPc6kLPiWlI2q5Hc/K1JT08oo6snTrjAODGc2kSQ=; b=pz74G+H0eKTVDRga82NUGzfbmKY59rth4Xyg21GBCTQoawPptk/p34udLmIhIgJDA2yebW ogvWivrFF7uTWt4ozDKDh3OfQ9HsD150pHv7nTbbf3uH303V+VzvG75ALFMqOfbUaWrxOa krLRkHHWkB53qaCx1WUWggasyIZAwl6maC8IZjJ4UeRWz745fmV4J9XckFKwlbuS8kosHW gBnbW2x9epcM+Dx0g8iodeC3B6VexHg/cbRrCgbreRTkJSOPQ7HChOK5s9xDhC3ZFfOSmh HL9YvqyDXXFyIS45I/fC1WUi4+VG2+tcojQz+/upd/qoH5jboFhy5hy/O9vA9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHDZk6rV6z17dF for ; Fri, 20 Feb 2026 02:23:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19463 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 02:23:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: afaf984ae0dc - stable/15 - ipfilter: Interface name must not extend beyond end of buffer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: afaf984ae0dc65fce9df561d6d3543addf53adde Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 02:23:58 +0000 Message-Id: <6997c5be.19463.3e3c0b41@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=afaf984ae0dc65fce9df561d6d3543addf53adde commit afaf984ae0dc65fce9df561d6d3543addf53adde Author: Cy Schubert AuthorDate: 2026-01-08 17:41:53 +0000 Commit: Cy Schubert CommitDate: 2026-02-20 02:23:44 +0000 ipfilter: Interface name must not extend beyond end of buffer sifpidx (an interface name) cannot extend beyond the end of the fr_names buffer. We do the validation for fr_sifpidx here because it is a union that contains an offset only when fr_sifpidx points to an interface name, an offset into fr_names. The union is an offset into fr_names in this case only. interr_tbl now becomes a static variable outside a function to facilitate its use by two functions within fil.c Note that sifpidx is only used in ipf_sync() which implments ipf -y. Reported by: Ilja Van Sprundel MFC after: 1 week (cherry picked from commit 47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0) --- sys/netpfil/ipfilter/netinet/fil.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index 355c633d59d8..09640623fdf2 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -236,6 +236,11 @@ static const struct optlist secopt[] = { { IPSO_CLASS_RES1, 0x80 } }; +/* + * Internal errors set by ipf_check_names_string(). + */ +static const int interr_tbl[3] = { 152, 156, 153 }; + char ipfilter_version[] = IPL_VERSION; int ipf_features = 0 @@ -3906,7 +3911,7 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) frentry_t *frt, *start = fr; frdest_t *fdp; char *name; - int error; + int error, interr; void *ifa; int v, i; @@ -3933,6 +3938,21 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) } if ((fr->fr_type & ~FR_T_BUILTIN) == FR_T_IPF) { + /* + * We do the validation for fr_sifpidx here because + * it is a union that contains an offset only when + * fr_sifpidx points to an interface name, an offset + * into fr_names. The union is an offset into + * fr_names in this case only. + * + * Note that sifpidx is only used in ipf_sync() which + * implments ipf -y. + */ + if ((interr = ipf_check_names_string(fr->fr_names, fr->fr_namelen, fr->fr_sifpidx)) != 0) { + IPFERROR(interr_tbl[interr-1]); + error = EINVAL; + goto unwind; + } if (fr->fr_satype != FRI_NORMAL && fr->fr_satype != FRI_LOOKUP) { ifa = ipf_resolvenic(softc, fr->fr_names + @@ -4404,7 +4424,6 @@ frrequest(ipf_main_softc_t *softc, int unit, ioctlcmd_t req, caddr_t data, int set, int makecopy) { int error = 0, in, family, need_free = 0, interr, i; - int interr_tbl[3] = { 152, 156, 153}; enum { OP_ADD, /* add rule */ OP_REM, /* remove rule */ OP_ZERO /* zero statistics and counters */ } From nobody Fri Feb 20 02:24: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 4fHDb62dncz6QRdj for ; Fri, 20 Feb 2026 02:24: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 4fHDb61KwPz3Nnt for ; Fri, 20 Feb 2026 02:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFvMrdFWXsmPEk+wcJXXBE0tCu2oqV0ZpAhSDX7XPlA=; b=U9jMOoiNNbXx1IM5e4EL7gihyc3yRUogp/dkyyZLk6Vw9Epi6rt6IjXbGhAxIGR3H6peBY K/Wtd5GOB+nWYuFz36xH57cjg7GB7JpOTOTcPRjUhozlCk1sDoSd4O2djwm5XBSGX8ihAp l67lB+7OpVYIRy5ajMhXSSB841V68SB7EWtMe3iJtZnV0uMSFy4AzXyw5AbGXwM1346TQK BjLtRd6USleBVAxn7SreqqoehB1XkVFFuQZQOG6QRGR66ahaOmczEI4KKDwSKGRTgNwf+S 8tB2noPCa0q9DaCzgimIqC6JGFgFS62y+egJqHimSTTMt9WZneSXgRRfFkB7gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771554258; a=rsa-sha256; cv=none; b=ibK28iazZaonJdyHi+kEckopOQCROXSuXVJB4a7rotGEbm8lpLNus3VnzmfIcYxmrS6rss G5eUXBszZdoplAPCaKKH+Um31eJjlZXcPAXTvri5kN+1Le2WeE30R34JVVdrOUareRO9Uv 6xS+jeMoLQ2qxadhuio1WA+P8JWir4TKT596kQzJC+sEoWyN3oj8t7VPjPDzUpyBGJhvKM AIcxqa6ydIrGgwXwQ27W/9x2XtCxRFhvBq2TWJsVX1SyyopZmYzcf5EBwEX1C6fVYOn6/V gJitaOS6H49dxYCsx5ubyJ6GJuInKcQl6lDVBsf9fpbzYmwNyv93Y6cNZDtRPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFvMrdFWXsmPEk+wcJXXBE0tCu2oqV0ZpAhSDX7XPlA=; b=w2bQMlHTKqUnD565TBr8jdF7D3EizP5jTPZil0l0ZXXArwXX6Wi0ld0V8rfaIIfmP2WrkF VsTewVX1T+48kgukurBhg+eHjEfkQ4Ump6/J25YvOwCAzDyGAUuycrbCFCyztA/8Z/N+OU sHrQKvlNHv5VRpaAATOsIa6dj+7IdI0sMreALsrjyuan+bwRgsN+bNhmzYwvTfGOWMHk3t ismVCcAXec1qrvcP98FnnqzGg/QfcYhMcH632WJfZ0g1R03DJD/NPs3RGbaa1WW4Ai67l7 YLPePGaZSQ9UtpW1trlgTQc/2+6pATLL8Y8Mo/eXDwOw5DjhmnF+zoDIJWHyRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHDb60gsdz17MS for ; Fri, 20 Feb 2026 02:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 02:24:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 53e1019c8494 - stable/14 - ipfilter: Fix possible overrun List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53e1019c8494e560a4ea121ef9e0c4b3ff4ac016 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 02:24:18 +0000 Message-Id: <6997c5d2.18f2f.3c1d30f6@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=53e1019c8494e560a4ea121ef9e0c4b3ff4ac016 commit 53e1019c8494e560a4ea121ef9e0c4b3ff4ac016 Author: Cy Schubert AuthorDate: 2026-02-04 17:27:23 +0000 Commit: Cy Schubert CommitDate: 2026-02-20 02:24:08 +0000 ipfilter: Fix possible overrun The destination buffer is FR_GROUPLEN (16 bytes) in length. When gname is created, the userspace utilities correctly use FR_GROUPLEN as the buffer length. The kernel should also limit its copy operation to FR_GROUPLEN bytes to avoid any user written code from exploiting this vulnerability. Reported by: Ilja Van Sprundel (cherry picked from commit e40817302ebdf89df2f3bcd679fb7f2a18c244dc) --- sys/netpfil/ipfilter/netinet/fil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index b2d84ce1fefc..cf21c68b7b46 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -3507,7 +3507,7 @@ ipf_group_add(ipf_main_softc_t *softc, char *group, void *head, u_32_t flags, fg->fg_head = head; fg->fg_start = NULL; fg->fg_next = *fgp; - bcopy(group, fg->fg_name, strlen(group) + 1); + bcopy(group, fg->fg_name, strnlen(group, FR_GROUPLEN) + 1); fg->fg_flags = gflags; fg->fg_ref = 1; fg->fg_set = &softc->ipf_groups[unit][set]; From nobody Fri Feb 20 02:24: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 4fHDb74N0Zz6QRlk for ; Fri, 20 Feb 2026 02:24: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 4fHDb71ygTz3Ntm for ; Fri, 20 Feb 2026 02:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i9ceelVFkXWTp2PANvtl2ZTXOePUBUCk670Z9xqYxqQ=; b=dXyEXPxlWrMZsBjnPhCN5mZQ+M1Ath0wYdj4w/R/Vxix7zK6+eoQrYOZESzH/EYU4FUeJl D4uQg3QHvdFpJ9bgC3CriA1l5x4DrRHH93qRqIr/UjjIeuJ8XpB+DXnTAwDKK1WFczOctf o68X4xKytIaPxXIMq/zeHF1u5AkCirpFmNBJDvcxPzsoK7X7ULGADrQ+ee0bwo4DPdzsIt YMOkgfTBU7ALQiYVA9y6gdUchWzwt7JlvKjhHa9skRCN+MKvHXBBZS/2HqiZV5GyjPLvOB 0/AMlff9Qf3fU2fAqhKK5zBRpEMbhGo3tzwbUVBxTI2i/e1VoNKs/GJgK2qqTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771554259; a=rsa-sha256; cv=none; b=E9b6GQ4jOsdNn5WvM+LMmXKYTgvqPec5eoyc5mjN7u3Mqr8ImQzOaOanL10kAZYmKdutak ub+1r38GR7UzSI+Gdo/A7e0suI8w6e4XoVuxdgtAto386sa/QnJmguHpZN295NscePZTYO RDDUrbQVzRwvstoQ+shBv7A4TcJiaic/dLRSRMIUEVswE9HdZnPOllbuZ1g+yjMKL7ZRzu /+RfE0tYzJRWK32iLz89yhRKCYTKmhH3aBv5av/9LybKcx0TnYkicBsDY984gcmgZcEsYq g35MZDQD3+YuxZ3KV6VPol4GutpGZ5RIDEjtybrdY9qhyTh3vmLXm6oxxDlGpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i9ceelVFkXWTp2PANvtl2ZTXOePUBUCk670Z9xqYxqQ=; b=vKYE7R5+GOV7wctNkMIxJYgYqBM5LeFuxx6A9noifGZ6tV58YR3urnglAQugd4dnzLxMTn yiLFkgVGJ+Ex0Deb/lLDSPf2uFGwsywtkw+cYUqdIjKnwkJQufytvpFAbOr+MZh9es9Jax fgyF5mdvcdq7YSfAlvjqTfbrn3N8GSTpSDoKzZVuNFpjDsdHiqeLg7QSwK9BWQUE7/b8l1 AssdtmSbv+evhbpNYJU6IJBF2yfJXk7By7TZH9bEnbHr2bom6L2pYInacWfd1vjKIhYAUr IOLCGMgkVGb/eu0xe7RejCnkTxj9CJ0Umlt6nMDfWs8MkW7YnGyDLrhygB68XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHDb71XYFz17vQ for ; Fri, 20 Feb 2026 02:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 02:24:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 60043137c50c - stable/14 - ipfilter: Interface name must not extend beyond end of buffer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60043137c50c635a5ad25428d1d99d22fcd4d226 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 02:24:19 +0000 Message-Id: <6997c5d3.18f9b.f50d656@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=60043137c50c635a5ad25428d1d99d22fcd4d226 commit 60043137c50c635a5ad25428d1d99d22fcd4d226 Author: Cy Schubert AuthorDate: 2026-01-08 17:41:53 +0000 Commit: Cy Schubert CommitDate: 2026-02-20 02:24:08 +0000 ipfilter: Interface name must not extend beyond end of buffer sifpidx (an interface name) cannot extend beyond the end of the fr_names buffer. We do the validation for fr_sifpidx here because it is a union that contains an offset only when fr_sifpidx points to an interface name, an offset into fr_names. The union is an offset into fr_names in this case only. interr_tbl now becomes a static variable outside a function to facilitate its use by two functions within fil.c Note that sifpidx is only used in ipf_sync() which implments ipf -y. Reported by: Ilja Van Sprundel MFC after: 1 week (cherry picked from commit 47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0) --- sys/netpfil/ipfilter/netinet/fil.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index cf21c68b7b46..2b81af276cb9 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -240,6 +240,11 @@ static const struct optlist secopt[] = { { IPSO_CLASS_RES1, 0x80 } }; +/* + * Internal errors set by ipf_check_names_string(). + */ +static const int interr_tbl[3] = { 152, 156, 153 }; + char ipfilter_version[] = IPL_VERSION; int ipf_features = 0 @@ -3910,7 +3915,7 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) frentry_t *frt, *start = fr; frdest_t *fdp; char *name; - int error; + int error, interr; void *ifa; int v, i; @@ -3937,6 +3942,21 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) } if ((fr->fr_type & ~FR_T_BUILTIN) == FR_T_IPF) { + /* + * We do the validation for fr_sifpidx here because + * it is a union that contains an offset only when + * fr_sifpidx points to an interface name, an offset + * into fr_names. The union is an offset into + * fr_names in this case only. + * + * Note that sifpidx is only used in ipf_sync() which + * implments ipf -y. + */ + if ((interr = ipf_check_names_string(fr->fr_names, fr->fr_namelen, fr->fr_sifpidx)) != 0) { + IPFERROR(interr_tbl[interr-1]); + error = EINVAL; + goto unwind; + } if (fr->fr_satype != FRI_NORMAL && fr->fr_satype != FRI_LOOKUP) { ifa = ipf_resolvenic(softc, fr->fr_names + @@ -4408,7 +4428,6 @@ frrequest(ipf_main_softc_t *softc, int unit, ioctlcmd_t req, caddr_t data, int set, int makecopy) { int error = 0, in, family, need_free = 0, interr, i; - int interr_tbl[3] = { 152, 156, 153}; enum { OP_ADD, /* add rule */ OP_REM, /* remove rule */ OP_ZERO /* zero statistics and counters */ } From nobody Fri Feb 20 02:24: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 4fHDbN0X3Lz6QRnf for ; Fri, 20 Feb 2026 02:24: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 4fHDbM6BlCz3PG7 for ; Fri, 20 Feb 2026 02:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcoTxtX48eaCZGeZSSnyoxXG/zeNeHTOvlmRX17yk/0=; b=DnW762e399crdgL4B8ZZr+eaKG1UYaJwDAmvRUDlPqVl1DmNGm3G2c/k+oVAGrwJA85nSr 8mBt/ahm1kwbl5L3IaQB+OSpn2jjyPsbrhgOb7Zug+K1/MyMghcCAAv6RrJogHeOPKlIwX DaDeuaRIv753eYvulJC+E5qhKJw7jWLU4G7de/58N1sHRKVo8ne+r8ukZOkGwj0ld91Dea 3GUrE4Czgn7eM7UlXWvYXgHBYJuReRUu0JaKjDE0iDyNmJwld+e3fQON+x/6hzusP5Xgag b03hpotQxGbxWgxXb8sm2+xuqYuw8Lt7UWZVGt5MbfA0uh9mA/aXJ0+9UDOqAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771554271; a=rsa-sha256; cv=none; b=eltzELl8kkXhuFvHPLhUo3sp0tAfzqPmgBwBwU5Q4sOoehq4qj/3hrG1u46JrzBCzt+h0N Bw46xcFccRgLV3nOM3hM0I39Kdo/FbVXa8jf1zRCICH5HOvGwfBHrOHvFK5KtIO0Lw3CU6 gRzVJZikoaKsc5HGs970fifR9+ZsysOeutZ7xxK2Tp5B+kAehb7U8pHrq6RY/oRHwsQf9q 7HnuJ3pIYvHCtxxprAjSXP3lDSerGNzhBV4mssYJP6j4J8/Ao/xE5zLPuwoAheWi5hq8H9 xnzvqzldY1HYp+iIJQTW4u9De4ddtX2koltKjJR0xl/3kQCb/DTLUV7n7hhJFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcoTxtX48eaCZGeZSSnyoxXG/zeNeHTOvlmRX17yk/0=; b=wq5UgiIFfrvZSJhHBgK3+Fx6M2EcbmMwyDS8UACHjWY67vza11xvnCIL8mp5+660Fq8iCQ oAGjUVlE5yTJUJN1JzrRrMxK8zV0vnVROqlvfdq0UiKcnDjyZoXzBEY0049ZrfU7mo2e/P aKisk0WJZRhWgfjgziUeJ2WSwgafOLKK0sgjmOLcuEIk9Qky8yRfcneOTuNwEcxMnREgdk 9wL9xCyEthsSnp9pLqx6v6gAYPXGaKecY6SiO3eYZ9O3t00usHuDU1jCMdK9THEyS8jayx 3q3H4HXv7fWoJLPA4QeCts6LMPXcxroywIxQS2Bfbb5uuuXEQlf24UvFoyzRvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHDbM5mfgz17dG for ; Fri, 20 Feb 2026 02:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 181bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 02:24:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 15c33b64ac2d - stable/13 - ipfilter: Fix possible overrun List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 15c33b64ac2d6a6201cb819da184d0f4028d7632 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 02:24:31 +0000 Message-Id: <6997c5df.181bb.c67eceb@gitrepo.freebsd.org> The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=15c33b64ac2d6a6201cb819da184d0f4028d7632 commit 15c33b64ac2d6a6201cb819da184d0f4028d7632 Author: Cy Schubert AuthorDate: 2026-02-04 17:27:23 +0000 Commit: Cy Schubert CommitDate: 2026-02-20 02:24:26 +0000 ipfilter: Fix possible overrun The destination buffer is FR_GROUPLEN (16 bytes) in length. When gname is created, the userspace utilities correctly use FR_GROUPLEN as the buffer length. The kernel should also limit its copy operation to FR_GROUPLEN bytes to avoid any user written code from exploiting this vulnerability. Reported by: Ilja Van Sprundel (cherry picked from commit e40817302ebdf89df2f3bcd679fb7f2a18c244dc) --- sys/netpfil/ipfilter/netinet/fil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index b2d84ce1fefc..cf21c68b7b46 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -3507,7 +3507,7 @@ ipf_group_add(ipf_main_softc_t *softc, char *group, void *head, u_32_t flags, fg->fg_head = head; fg->fg_start = NULL; fg->fg_next = *fgp; - bcopy(group, fg->fg_name, strlen(group) + 1); + bcopy(group, fg->fg_name, strnlen(group, FR_GROUPLEN) + 1); fg->fg_flags = gflags; fg->fg_ref = 1; fg->fg_set = &softc->ipf_groups[unit][set]; From nobody Fri Feb 20 02:24: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 4fHDbP392Jz6QRng for ; Fri, 20 Feb 2026 02:24: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 4fHDbN6pdXz3PNv for ; Fri, 20 Feb 2026 02:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nMV/qzKSTzQqVkysnxM8qCP6mqPu/8Z76XWxJYUKG8=; b=uZv0MaBx1zUQ08+pXdskvB32AQQWJ4iwToPooXMXSmDSlTl8UyEWtfcvqmjarC94xVi+fj KaCf/v46rFelGTY6/FmBApHxzwUnbTQi5O+Bc810DWKWl8wdOpq2fJL1JA4+AnUC+y/f6L J0fzlGDh+OhIPhLdZ9zDIFoY6eUTkfEiEPvrDm6T+zV9+vqOv/xgAnIlrRESZba6d+AYGr vqrM/wN+6Ea1y8e2gwLxo2JDMyWCfa73RKS+ht0S8bqM4J0ZwvHY/VBY0OZ3ANhN7ihwSe BkV5p9FSxmuMwW4YYlGTs9rN0VmFHRFjvrMMSsata8kWPwBXv1RieYRX+rigVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771554273; a=rsa-sha256; cv=none; b=cj/dgWRDP0c84VT0t30b0sc/3GbOXmgryaKjWf0OqGn27i7TydFQHMgxxGD0LYdgmprfvi 19fjl9yIkS0UBw6u8qLRu0e/kNNJqH7Iz6/AKiTzVyxr7EJ7yogXVi7c0fi/XX4/2lnLvI ZXRqYCDIXudAQIBGOYaeYXi66kctV98tu7O8OzNWbVflSi3YO3Ljl0vahQJ2cZ42fsxN4A a05OUF+JmZiKA2ymPidooilpS3G97aUaQ6w1ETFVzvxjB7QA2z68+1P7UqErIsVhwvfaZH cnDu/VYYckGk6YkN2kQyDqLuGO9YE0jblhuEWyINLITzRDTzhU3Tg3LeeuGUmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771554273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nMV/qzKSTzQqVkysnxM8qCP6mqPu/8Z76XWxJYUKG8=; b=PlIUGLEoZncqgJSqSMprf4EdbbF0F8QKyzKJEglrdJPZF2tihdapdxrAW0Wbfqe9OWz6Be 1VCQnH4D5U8ypXrWTIiSW7c/Cmau6/M8s+E0dRW/q7ch9pbyS8gfRTMFTku+giOxHn8yxF Xrfy465f/OmTVLPyHY0gDvCD+mYXf9bM98XWOO6u3ATGAeam1DOV25bzH0GOtdX/dgJ0lu R7+8zZuJivNH1mHFafYYhAjSX5f/Dj8mHTw9lO17piu67sAuU3ri5+l4bsgxPMRmwRo7We ymTTsyx78CQxmw5i+TG80n1QWDz/U9pj4YyeKhzi1tJ89tD7dYVIpQ4p+r2RlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHDbN6P3Pz17MW for ; Fri, 20 Feb 2026 02:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1822b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 02:24:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: bdf97b8f056f - stable/13 - ipfilter: Interface name must not extend beyond end of buffer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bdf97b8f056fcb842d4a4feb8c36008aa897cb62 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 02:24:32 +0000 Message-Id: <6997c5e0.1822b.2f2cf975@gitrepo.freebsd.org> The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bdf97b8f056fcb842d4a4feb8c36008aa897cb62 commit bdf97b8f056fcb842d4a4feb8c36008aa897cb62 Author: Cy Schubert AuthorDate: 2026-01-08 17:41:53 +0000 Commit: Cy Schubert CommitDate: 2026-02-20 02:24:26 +0000 ipfilter: Interface name must not extend beyond end of buffer sifpidx (an interface name) cannot extend beyond the end of the fr_names buffer. We do the validation for fr_sifpidx here because it is a union that contains an offset only when fr_sifpidx points to an interface name, an offset into fr_names. The union is an offset into fr_names in this case only. interr_tbl now becomes a static variable outside a function to facilitate its use by two functions within fil.c Note that sifpidx is only used in ipf_sync() which implments ipf -y. Reported by: Ilja Van Sprundel MFC after: 1 week (cherry picked from commit 47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0) --- sys/netpfil/ipfilter/netinet/fil.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index cf21c68b7b46..2b81af276cb9 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -240,6 +240,11 @@ static const struct optlist secopt[] = { { IPSO_CLASS_RES1, 0x80 } }; +/* + * Internal errors set by ipf_check_names_string(). + */ +static const int interr_tbl[3] = { 152, 156, 153 }; + char ipfilter_version[] = IPL_VERSION; int ipf_features = 0 @@ -3910,7 +3915,7 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) frentry_t *frt, *start = fr; frdest_t *fdp; char *name; - int error; + int error, interr; void *ifa; int v, i; @@ -3937,6 +3942,21 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) } if ((fr->fr_type & ~FR_T_BUILTIN) == FR_T_IPF) { + /* + * We do the validation for fr_sifpidx here because + * it is a union that contains an offset only when + * fr_sifpidx points to an interface name, an offset + * into fr_names. The union is an offset into + * fr_names in this case only. + * + * Note that sifpidx is only used in ipf_sync() which + * implments ipf -y. + */ + if ((interr = ipf_check_names_string(fr->fr_names, fr->fr_namelen, fr->fr_sifpidx)) != 0) { + IPFERROR(interr_tbl[interr-1]); + error = EINVAL; + goto unwind; + } if (fr->fr_satype != FRI_NORMAL && fr->fr_satype != FRI_LOOKUP) { ifa = ipf_resolvenic(softc, fr->fr_names + @@ -4408,7 +4428,6 @@ frrequest(ipf_main_softc_t *softc, int unit, ioctlcmd_t req, caddr_t data, int set, int makecopy) { int error = 0, in, family, need_free = 0, interr, i; - int interr_tbl[3] = { 152, 156, 153}; enum { OP_ADD, /* add rule */ OP_REM, /* remove rule */ OP_ZERO /* zero statistics and counters */ } From nobody Fri Feb 20 16:46: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 4fHbjx2Hslz6ScX0 for ; Fri, 20 Feb 2026 16:46: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 4fHbjw6Rc3z3pYC for ; Fri, 20 Feb 2026 16:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771605988; 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=ki4VUKJtkdl3v7FHGwDGRQMmllcqNhTj/7cSMAfUu4U=; b=NoQpcC3EWZRyF7pTLWfWFwq0BffaQSKIm9FY30vsLa7Nk2qbstdYRZGTM6sUPaNc1E7KvA 0qZG5Wp6JmD6pww+OEGTLZZvJVp7ewvEWuO9wUNm2MyMovym/y6tt2twouFTQ8K5xfkNQU hN/RUzd9LoVvF8qMaJVMRZkk0uGH+2VGKMrAeEU68WiHxME1q8SFSZ2sxGAKAi/T9eonN8 nOitH4EKcNLyauZIUUVT4wjJT+JfRut6wehC/ymv3ECrxNnIEuQQylVlnWApcW+dnaVxft t5BNLsbssLL3txgUyjWyNPN8NNx0QF1vlM9InYeqTL3t6vepiJnIQ4kwAHyHLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771605988; a=rsa-sha256; cv=none; b=OcLzvby3ypNg75euT607cU0DktD8Jbb9TFu7zVsQXqit+O5V6PAkx5F/SC0sUTlrNIfoLa EDzvPXp+9wu8ZU3Km1IXSO6btBzENvekIbp7Smw8TlmvdL6fSjDpxEwqTjmWDor6NSwxwx j0K7muDApgU9uJjkQpo/lR8/UoywN2mzX/AtIPwgg4pRHAGW1c1jAYvH+kVOX33+5/cWdY riLUJE64xpRV5pltiQ+yk9buUsdJFlMv1V4eA5q99IFbCuTMu3CACBAiw2coD4lSKOtrG7 eq/B+Xo8a+WczgOB6daRifreC20NVKLPgAyBa5OwLUHZbPbPJ3kwYWNroSCZcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771605988; 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=ki4VUKJtkdl3v7FHGwDGRQMmllcqNhTj/7cSMAfUu4U=; b=c8bgFjjmg/6QaC3iXKSUMT18Odm/Gdou5i1rZMxfGkECVNBSe0Qd36IchsIUDzbB9gTRKi ffsbs05mcFfhjQZnpU/b1kUyNawR49VnB8eaCRpHNYU1jcr000ASlPvm5BH7q7EP+IcJNF gF4hv2A3LO3ojCCFL2a2PDg1zR3WV8+sfCVhuE5/06VWzCAIpqTcZ/HGW54M7LlEQ8HV/0 pAU9QfDlU8/E9OtvaCyJAlXPBlv/4grpnoW9ywe+3qx3IVlUEUzeeOn3FL2cRWkobo5GJh SsTNHc6mWbn/9evySJWQE76F19Ww5YWRnLvFmTCwosyT/SGgU1AgVOBpk6vRIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHbjw5lsQzckh for ; Fri, 20 Feb 2026 16:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 16:46:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Robert Clausecker Subject: git: f16349f12d8a - stable/15 - libsys/arm: include ARM EABI unwind bits into libsys List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f16349f12d8aa63d771d259bae37d262212d8404 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 16:46:28 +0000 Message-Id: <69988fe4.35e8a.2d01cfe5@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f16349f12d8aa63d771d259bae37d262212d8404 commit f16349f12d8aa63d771d259bae37d262212d8404 Author: Jessica Clarke AuthorDate: 2026-02-11 15:37:08 +0000 Commit: Robert Clausecker CommitDate: 2026-02-20 16:44:55 +0000 libsys/arm: include ARM EABI unwind bits into libsys libsys required ARM EABI unwind symbols like __aeabi_unwind_cpp_pr0. These symbols are normally provided by libc, but if a binary does not link libc, the symbol ends up not being resolved. Among other problems, this prevented gcc14 and newer from building on arm. Add the relevant symbols as hidden symbols into libsys to avoid this problem. (this patch was posted by jrtc27 who has asked me to move it along) PR: 292539 Tested by: fuz, Mark Millard Reviewed by: mmel Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55255 (cherry picked from commit 6265f30cd6b523d633efcc314f8952f24446861f) --- lib/libsys/arm/Makefile.sys | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libsys/arm/Makefile.sys b/lib/libsys/arm/Makefile.sys index 424d2f9cc9d8..e8b420932031 100644 --- a/lib/libsys/arm/Makefile.sys +++ b/lib/libsys/arm/Makefile.sys @@ -6,3 +6,8 @@ SRCS+= __vdso_gettc.c \ MDASM= \ cerror.S \ vfork.S + +.if ${LIB} == "sys" +.PATH: ${LIBSYS_SRCTOP}/../libc/arm/aeabi +SRCS+= aeabi_unwind_cpp.c +.endif From nobody Fri Feb 20 16:46: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 4fHbjy2N98z6ScX3 for ; Fri, 20 Feb 2026 16:46: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 4fHbjx6tZlz3pWJ for ; Fri, 20 Feb 2026 16:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771605990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXfbO9ISmWldfxs9VVVKR8F8LAUbA0609ONYXfkX2v8=; b=DTJ54OPcITnFKeDM4Jglo5CeSkJiVNTIUWMfD9bu+KB6QusuDo36hiGf/+c3yU/JXfhGsB fgGmZ9/hwzisE1th3XMMov+Pv/vUtr1n1KYIkHV8+HnR/3Olz0AaV885brcmREdrlp28gS T1fP/+imQdHHqWJK6UjqCeHWpdD3nrnusqSbC4v8EQ3lqNibsnhhxR4qtvx7TEKsOfs5q/ XSaIbTToFCva0mUifppSQy0RCkbrdyuyuIk/OQeXgm8jkhhLFczN5AqdG5zwATr7Nviqca a11vVgFBKMq2LKrLB3WWhHOeb9oV93ZSOGbveqJXaP83w7XxzxoJepg/G2XsyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771605990; a=rsa-sha256; cv=none; b=NM10qztkQbSHGXYy+UEEXOF6a0nx7QsovHhnd2vvofswEPkg7hEKhQMxwx+nNi6GpNcnuD Y10glWenwesCg8H/n1tfgKtD35BBn+mjSREdD/qp0zDa05QTaSUoH3uePM9AN05IwvcMc7 yauXlKoAIaMF+DmRPDKqzg9P4wg2FdWEExzkbh6NF+ZYWJYDw4ZL5k2GuT8MnkTJP5Wy0R YgxnOM+g7wDfA/7lNF655IIEUAkXtlP/f4S1mKh1+VsMvdJsd9TI59yIRlMFDg8ytyPTdt NgxnWqX+c8RdtbjTafHc2asQULlpGd4R72zy3WS9YCLpT3QbIzd0IL2tnQ6+5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771605990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXfbO9ISmWldfxs9VVVKR8F8LAUbA0609ONYXfkX2v8=; b=eHSuVFq8NQFv3aJul11DgefZ63O4xYh/VURZF0D4ZH7MQ3P0bQRBqReVS8igR6AQeCu6gw KwnARsu6/d3U201jjLTARWYFwyOuK5q0zNzt1/0/ViO4ko1ggMRqHd+vv0KGCPVkemYOed b8+rUEcirFWDliXtV1rdSLIvhNgosKejVwhm5P2BYSw6vLdoCdwUPxDrCk1c/WQUeNvBhl OoM22eVLb98YYxWhhaWW6UQyaWcMtwZKeE53HHR3NTCPccc43F2+yOYIrGfVJLlqkeqd/F /aBy+v2ySlJGNp0rDRj9xxBonRl7jE8F3KpTaocoAwLjozpxQv0tPJSHBibZ/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 4fHbjx6Jfxzcrf for ; Fri, 20 Feb 2026 16:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 16:46:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: eac62e18e83a - stable/15 - libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eac62e18e83a15fa744b2683c3a7f1fcf659e8cc Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 16:46:29 +0000 Message-Id: <69988fe5.345be.458009ce@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=eac62e18e83a15fa744b2683c3a7f1fcf659e8cc commit eac62e18e83a15fa744b2683c3a7f1fcf659e8cc Author: Robert Clausecker AuthorDate: 2026-02-11 18:50:18 +0000 Commit: Robert Clausecker CommitDate: 2026-02-20 16:44:55 +0000 libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubs This avoids a dependency on the abort symbol in libsys. PR: 292539 Reviewed by: mmel Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55255 (cherry picked from commit 1782bc9a0a8da2d6aca31b7790981e1980c9e4b9) --- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c index efcace2c0675..3667b7d7e673 100644 --- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c +++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c @@ -27,15 +27,15 @@ * */ +#include + /* * Provide an implementation of __aeabi_unwind_cpp_pr{0,1,2}. These are * required by libc but are implemented in libgcc_eh.a which we don't link - * against. The libgcc_eh.a version will be called so we call abort to + * against. The libgcc_eh.a version will be called so we trap to * check this. */ -#include - void __aeabi_unwind_cpp_pr0(void) __hidden; void __aeabi_unwind_cpp_pr1(void) __hidden; void __aeabi_unwind_cpp_pr2(void) __hidden; @@ -43,18 +43,18 @@ void __aeabi_unwind_cpp_pr2(void) __hidden; void __aeabi_unwind_cpp_pr0(void) { - abort(); + __builtin_trap(); } void __aeabi_unwind_cpp_pr1(void) { - abort(); + __builtin_trap(); } void __aeabi_unwind_cpp_pr2(void) { - abort(); + __builtin_trap(); } From nobody Sat Feb 21 09:49: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 4fJ2Qc3SJrz6SKP7 for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qc1txfz41JV for ; Sat, 21 Feb 2026 09:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Qnm1CL2TJ1KI9PMvtA4iv8oesmkIycZr9ummcWM3qs=; b=GRemWT0CKzHcm2btbkD8QPAvxJ6D99Sc48FdfNcVvQvuNmrpfl8OvopdHJmHgO1tFKd+6f QxHahREgdGFvSMRNi6pzGOnVE55S+ADUjAU6Qu5F2wpY9qb0ERv/eHoMwR636yJwhW5lXW razfhbEKQkWPMF/GFTLIibu4HTOM5wJfVbrBp2VTiYaRrZa8rkrkFsI/7ZaIoYcTw+HMlZ nOv6Rm56XmDeDwGC4TCl6m8rOml3Rr46xaHT9KWmkMH0rb9LTgpE+OgeuwGYJVpU0E18Rj 3a+MfUtiotxIg+nE+tblW0HddexuLFiYvDmy0FaaqI2odCLsf8rTeDdtReUDUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667384; a=rsa-sha256; cv=none; b=r0Jse/0fE2IM/TLDhZcUm9fQAgR5WWM3BSDoQteq/A5y2i5oNnNGZhYfp1Esy8l+gd6Sve f8zXqJfyEk2M189W0dnXWaWiqKeBUWymsXWg4OqMGsknfSl5Wo1jdYbzd2SLrxt3GMdNVu gULoR7waVBsutwAIdLfcHkUUPDgzMywfOMs9fwBH7njrxE/tKQ6IAWTLgLOZ8LiqKr0tda bt5QymXVgB/suNOqMn2z3SsMTD8ari5m/Utt2sbrzApyNYyMY8espAt3geym6QfPX1P7/J XdTqScRddmMqHCLiYWNsnG01cW7H8ykZfOt7fskP/MET47dUuOXpUD4PjxfRog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Qnm1CL2TJ1KI9PMvtA4iv8oesmkIycZr9ummcWM3qs=; b=evh6tDAZTmvuP+dSKGgp0B4nNsUp3WAYr+axpNzRyooyh0Poc5JRVCIEZHDcgLNCTBhv0T yO7J8NYMq9v9/kXTvbl8si3E9+WyFOVJTewEYlfN+fqeg3Ifh4mdqJBt5b6cDz03Jz461R ywEx4R/dtVDtzUcafBDU13u6oKKrdhRyo6Upy/teAcziVWLUJ41DqJnXAEI0QR1SKPwp2t BnJ0tlgKZzJNfHph2csDUZmvTNVWG/au4jK+322ra6Q/DxTsmzgNtArYk7ia9bfCt8sKHv fuvunGLTyFJQpUKQJvz9BJqR/DkI2qKGvLi0DsOFdIlF7kVpEQkQ2fuxIPOv5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qc1GnDz17Bl for ; Sat, 21 Feb 2026 09:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fd91b1f855ec - stable/15 - libc: print extended errors from warn(3) and vwarn(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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fd91b1f855ecfd544ae3b9d01ba58ad0c7952c5a Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:44 +0000 Message-Id: <69997fb8.1de5a.58167dc1@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd91b1f855ecfd544ae3b9d01ba58ad0c7952c5a commit fd91b1f855ecfd544ae3b9d01ba58ad0c7952c5a Author: Konstantin Belousov AuthorDate: 2026-02-17 11:12:02 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:57 +0000 libc: print extended errors from warn(3) and vwarn(3) (cherry picked from commit ffbf95907039821b69dfe1607d1695b46af82e35) --- lib/libc/gen/err.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index 793bf7522e42..2628eb8186cc 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -163,14 +163,14 @@ _warn(const char *fmt, ...) { va_list ap; va_start(ap, fmt); - vwarnc(errno, fmt, ap); + vwarnci(true, errno, fmt, ap); va_end(ap); } void vwarn(const char *fmt, va_list ap) { - vwarnc(errno, fmt, ap); + vwarnci(true, errno, fmt, ap); } void From nobody Sat Feb 21 09:49: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 4fJ2Qd3DRZz6SKTY for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qd2M8Kz412w for ; Sat, 21 Feb 2026 09:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rnxwITdWaEpUTQ4U7TXD5kauAFvNJWu4IQQNt50TrpQ=; b=bjFv8CvuAkxPo1oALxwd8hizVZWXQdPuhsZNfJPckywajQ/LaCI/v5OPCHeJTNfSgBVAgU 3Ww3dUBozPVsjylIXRUmyXYRjp9XakkgK+BUAH5V7c247TXtHdeHBEtr6abO5bYkfpSEja d4Ti4F76Qy3JdZw41p1PsOI5NCF5+WYOiO1Z64HVAFEPvMqM2/eONxlukOnw2XmdO4YZrY BK3vMVpBUs7aJw3NtaYuVAycXMbdEwMNRxXgLz9GJEWx7f6AEnwkjSZy8DXC8uLe0BQfRC HoxZCxIvJR/s6ge8v+PX3WLXhG6g7zHCHgQbcuvfnaTSEG4LzOJI1zEYiHVY/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667385; a=rsa-sha256; cv=none; b=lSDgF3GZ8J1cDJfQUknPTAzmyQyxfdkl6O2zNB39Wh609zz+RCUBgjFGqoho82tR+cyoZK fAXagTHsg/JmvzpSQ6W3cD/OdSyidHmeG2StTvFLlj35G0u+rC0PSQ1a3EjKky6pgGwSC6 HKNXfq4LJN9t7sHnRUIYZGMHeLW+cf9vSTDF/Te7owdxTYxgXhdYz5wmBB7OSV6V6w0aKI c8GRi/beED/FMXLim7sirDjJi/kUqmBlyg6lzEzyRa786OQZWesV6nUoSWGUo209gFQUfT OsH4DXudFcVN3d6+nwOGoN9SDo/xEXU+zVVk9Ist4yp6FfrvmtSbhdoY6EJ0ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rnxwITdWaEpUTQ4U7TXD5kauAFvNJWu4IQQNt50TrpQ=; b=ocm/sg+kRJfjzFzeS9hPdXRL1Tue26Cc7AwQiQ6waQht0h3pRn682Lxt99WA0iZNoFFbyo VF71gvRtzRR2Ph1ufK80zp543IQkUcvxVG2WU0k019o98U+9nXeaJfFY39UrQWfmh2MRGN JSfPSiT5oH95ZlSsO53F6Lnjg2ondx9upjQTQukj8bYXmx6znYhYjNRt80o3zA/+PgFMjX ZXmBB41mFnX83fcbCb4CvRBMVphfE5uQX3w7b+0/yvOzrrO4kI23wgTq4wsbLjSAoJkfjg fjlDc94Q4RH6jaNSpOW+pzJ2jYmjwDDIndmPZIxHTAEiI+BSPGU/OcRNhFAMDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qd1xNpz17Qj for ; Sat, 21 Feb 2026 09:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fca2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6a263d7c1fbb - stable/15 - libc: improve include usage for exterror sources List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6a263d7c1fbb3276e9d5171dc92ae1fcaeff5ce6 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:45 +0000 Message-Id: <69997fb9.1fca2.60a418ff@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a263d7c1fbb3276e9d5171dc92ae1fcaeff5ce6 commit 6a263d7c1fbb3276e9d5171dc92ae1fcaeff5ce6 Author: Konstantin Belousov AuthorDate: 2026-02-17 20:56:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:57 +0000 libc: improve include usage for exterror sources (cherry picked from commit 1443a455a96e587a7b49608def79495e9d74513f) --- include/exterr.h | 3 +-- lib/libc/gen/uexterr_format.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exterr.h b/include/exterr.h index c0273d72ce03..43f1efaef34a 100644 --- a/include/exterr.h +++ b/include/exterr.h @@ -11,8 +11,7 @@ #ifndef _EXTERR_H_ #define _EXTERR_H_ -#include -#include +#include __BEGIN_DECLS int uexterr_gettext(char *buf, size_t bufsz); diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 8d3b458ca9f2..c1974f3c361a 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include From nobody Sat Feb 21 09:49: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 4fJ2Qf6LQdz6SK6Q for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qf3VQMz41P2 for ; Sat, 21 Feb 2026 09:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtM+Q/bs+AsD3iOC/T6O3M+YudGpM6VlDKopm1uiKHw=; b=kEber1yTLPwxCUW+IVddEVjsykdT5T0jSP2N9FOJ7P4M77NWoY4cHRN2kwpmE7EIfd1MwA aD3b8nkl59GHJEKDWHsj+OTxh/LhDqwA397BNCy4Td8LnX6egjAMcpBoVyPcJ0/vAdlmNJ hLl6v33g4BOWLbnHz7RqtH5hgpTnOs3pV7570R6WXUK17XR0aN9sfNYGzt8dh8Dcn/rC7K 6AS9V+2hfhO533sXoInsgZbqjHYYnBipuBIrU/9pM80/wOylEby6yM17n5VqFnNhIRrcZh roht1goiSslKK4F8mkABuXmvbT8lu6I3G4++erjvjr16xCNJm8gJ0uRN1K0H5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667386; a=rsa-sha256; cv=none; b=s75xuCVnqg2r4ffGpRDvB8dl8iufrKqaaSL0eISuwyjKlqg5ytuAm6aNDBy5BmUsdREwlF bll8mRDAyePWfB6xbNyGnkG57zodnIsyZuSopFq2E2ZOwg+BPG+dOrk0z3tI2gHQOXpBvV EVkvtOPQ8FJU5aMcvSj97s1af8YoHaZePSfbhMgCKTvogIoi55XMKRRZm6Yy5axREtA/52 7fhS9n4ZhmAa3HvcB5lau52BjGb2hZkqa9VK0e9LpFVIXJt6xHy9YCLGKlJaejc0hNW/Fh KqZbcnDkHkCq3SragbVnKgD/iVLNTzymiKtWbXr4oSKxTTOQelrxCHUN9L/Bfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtM+Q/bs+AsD3iOC/T6O3M+YudGpM6VlDKopm1uiKHw=; b=Gf0wJpBaWqlg4Ix0AKao30Gl2/h39K0a4FleoFa6wxyotJrXnOPCt+b+3Sc1FUJ6U1nrnO /k9HDcRbohvcoXOO7eHneUlG52MWgRM8cQpSFIjxk7aWERTZ+7fWEBV6We0fw08V5SzsPU k6+5CQDICB0ZL3prbFf76tVW4Z7puoyhakI4aWqUs4fpPEBj0fCIp5xDNnhgzNCnTdFsAO mNj1PdWfgjsXGw6/65SLGC1iuRVwAxMWfOsJ/fCWIpjAIdkwDgXRk/+i+bcle9vihrED3+ VhPwqYtbpg0FxwKOlxdIx0551DqN+D9mIrAl4V2tUinkyAsWPBD/P01SiJECCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qf2kl3z17P3 for ; Sat, 21 Feb 2026 09:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ed48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b0551b04f73d - stable/15 - libc: add man page for uexterr_gettext(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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b0551b04f73d2d06e0aad1c65b7bbf0ec4f4466c Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:46 +0000 Message-Id: <69997fba.1ed48.231abd26@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0551b04f73d2d06e0aad1c65b7bbf0ec4f4466c commit b0551b04f73d2d06e0aad1c65b7bbf0ec4f4466c Author: Konstantin Belousov AuthorDate: 2026-02-17 20:46:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 libc: add man page for uexterr_gettext(3) (cherry picked from commit a03f285afafae243396c9bc7892cbe717a3ac37d) --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/uexterr_gettext.3 | 71 ++++++++++++++++++++++++++++++++++++++++++ share/man/man9/exterror.9 | 3 +- 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 3e68f8400c5c..28e55f58ccf3 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -323,6 +323,7 @@ MAN+= alarm.3 \ ttyname.3 \ ualarm.3 \ ucontext.3 \ + uexterr_gettext.3 \ ulimit.3 \ uname.3 \ unvis.3 \ diff --git a/lib/libc/gen/uexterr_gettext.3 b/lib/libc/gen/uexterr_gettext.3 new file mode 100644 index 000000000000..576fe49d0c37 --- /dev/null +++ b/lib/libc/gen/uexterr_gettext.3 @@ -0,0 +1,71 @@ +.\" Copyright 2026 The FreeBSD Foundation +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd Feburary 17, 2026 +.Dt UEXTERR_GETTEXT +.Os +.Sh NAME +.Nm uexterr_gettext +.Nd "get string representation of the current extended error" +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In exterr.h +.Ft int +.Fo uexterr_gettext +.Fa "char *buffer" +.Fa "size_t buffer_size" +.Fc +.Sh DESCRIPTION +The +.Nm +function fills the buffer pointed to by the +.Fa buffer +pointer with the formatted extended null-terminated +error string, as reported by the +last error from a system call, which returned an extended error. +The capacity of the passed buffer is +.Va buffer_size +bytes. +.Pp +Normally, applications should use the +.Xr err 3 +family of functions to display errors from system calls. +If this is not convenient or even not possible, +for instance for applications with an advanced user interface, the +.Nm +function can be used to fetch the string with the extended error. +.Pp +Note that most parts of the extended errors are directly provided by +the kernel, and as such cannot be localized. +.Pp +See +.Xr exterror 9 +for the description of the extended error facilities. +.Sh RETURN VALUES +The +.Fn +function returns zero. +There are currently no errors defined for the function, +which might change in future. +.Pp +If any error condition is added, it will be reported by returning \-1 +and setting +.Va errno +to the corresponding value. +.Sh SEE ALSO +.Xr errno 3 , +.Xr err 3 , +.Xr exterror 9 +.Sh STANDARDS +The +.Nm +is a +.Fx +extension that first appeared in +.Fx 15.0 . diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 index a7c7a11d1315..47ffda065d43 100644 --- a/share/man/man9/exterror.9 +++ b/share/man/man9/exterror.9 @@ -221,7 +221,8 @@ They pass from the failed request back to the thread that create the request. .Sh SEE ALSO .Xr errno 3 , -.Xr err 3 +.Xr err 3 , +.Xr uexterr_gettext 3 .Sh HISTORY The .Nm From nobody Sat Feb 21 09:49: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 4fJ2Qh2BqYz6SK6X for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qg55YRz41Lf for ; Sat, 21 Feb 2026 09:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=darqT4WSjRRBOitTiaHmcRqcInLlW4TKMQQyTNYUh90=; b=fg2YY1GrdyjpkbodygY/mID9dOf5bozMgMcRuI4WvzPSrcEKzpmgDOfBBossKi24oz7jMk LKFaZ8D1C8kKSggSWEJCz6DzTYOmwAjAFexs5C9eBAKKzqQXNbivAmkZn/06U1FZKKw0Uj KKkdXvN0CAt41Q6ES07xiv61pWfrhVNXgLe09LrF2g6Duf4qNU/ZKd38pfUOJjO8rKi77P h/nUPd1DxlIC7Y5WOjl6xbJs4O0vHRLQoOC84fFZmQkCTwOkLvxROLYxxK7AAxIPX65TQg XD7fDW7rvMWgWI7xTIekUCTwiLnbuJ2NN6NJwBic2u11Zm4xsvao2oIw2wc1XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667387; a=rsa-sha256; cv=none; b=fxPu9Q6b95lamMpP0LZnobMnUbLZmUUzrSGsCyiqsF00W+GYm7kPlvjmaLheUdQTzCtWZE A22aO6W6fjDC/9pssAZIZZikN7tAdwqCshnsftGx4vVxw7RNxBcmlNfmOa3kT/yuNh3iiC Mzs+f6fW3ppBoQmJSaUMg3hJFVExPwmS4YGxXIj6YJa24/5wVCYtQr1nQQ1AB+q/2efOJK wCYc2ZXXND//yKo6W5C7jLy9C9xgLf4uWPw5WTZyrVuzg0DkgGQwJXX40/8cgdKk0Fnwyx TFHeTMEfAKs+si51JoJzUYvcvt4PUi/xYoexrAL3Gs3mkKHKREyBrtQW1HHw3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=darqT4WSjRRBOitTiaHmcRqcInLlW4TKMQQyTNYUh90=; b=soDuNWojVKRhgmULzNk6xxfkVCO/hrM/5sKdLUuTshy9SxFlPNhx3Sxtw+qrE7GiZgtAlW pRbn/iEXsnuIX4sgSp31fuhcyC8m3x2mXDMEdfJGzjoKzwTL7djrxQR3iR6TVJyPYm8tMr x7MW+//j/n/VGKVkkneOUnkr6fIACQBqUOqiAttD8TdiO6eSydQwtel5ycTAIbbxUSi31z +ik1qYE4DrFnp+tJ4qRYxuWdjBYStKho9uZN3cm8WUL3TwyQ+dxcxDzPT/YnsMM51ihpNc H3D66dPLhzUWxH+X2fWRqox28sv3C0TcBW+gG9mCmujVFJewplDfFuife+QbMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qg3Wvbz17Bm for ; Sat, 21 Feb 2026 09:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fea8849bacd6 - stable/15 - pdrfork(2): do require RFPROCDESC | RFPROC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: fea8849bacd6f7d2d027f9ddce31760e94dd843d Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:47 +0000 Message-Id: <69997fbb.1ec4f.435b1140@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fea8849bacd6f7d2d027f9ddce31760e94dd843d commit fea8849bacd6f7d2d027f9ddce31760e94dd843d Author: Konstantin Belousov AuthorDate: 2026-02-14 16:38:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2): do require RFPROCDESC | RFPROC (cherry picked from commit b05be03ceea0a95f7783ddc890885f34bb4023d4) --- lib/libsys/pdfork.2 | 8 +++++--- sys/kern/kern_fork.c | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/libsys/pdfork.2 b/lib/libsys/pdfork.2 index ad7eecb00dae..9cbeb65bc4fc 100644 --- a/lib/libsys/pdfork.2 +++ b/lib/libsys/pdfork.2 @@ -114,11 +114,13 @@ for a description of the possible flags. The .Fn pdrfork -system call requires that the +system call requires that both the .Va RFPROC -or +and +.Va RFPROCDESC +flags, or .Va RFSPAWN -flag is specified. +flag are specified. .Pp .Fn pdgetpid queries the process ID (PID) in the process descriptor diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 595d8687c25f..a453af959bb1 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -214,6 +214,11 @@ sys_pdrfork(struct thread *td, struct pdrfork_args *uap) fr.fr_flags = RFFDG | RFPROC | RFPPWAIT | RFMEM | RFPROCDESC; fr.fr_flags2 = FR2_DROPSIG_CAUGHT; } else { + if ((uap->rfflags & (RFPROC | RFPROCDESC)) != + (RFPROC | RFPROCDESC)) { + return (EXTERROR(EINVAL, + "RFPROC|RFPROCDESC required %#jx", uap->rfflags)); + } fr.fr_flags = uap->rfflags; } From nobody Sat Feb 21 09:49: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 4fJ2Qj2lK2z6SKPL for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qh5GLWz41b2 for ; Sat, 21 Feb 2026 09:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Edt59M2xN5OpcCVZzbmOVsz2GVtHR1L21yk7Mnw+AQk=; b=OXTsf3jOef6hN5Z+NFQW1uo5NKgNfQOte6PeHQEAXY8O7qVtQuGNzO6PIuzKCGP0KC/AC3 tzcDQ+khCPjtB6RFyNdOK+NItWEBZPVlfOMjzn6VOX8uc82uckus+B0rIn+qoKBcRtJ+L3 jP57o2mR7i5NALC5/X1aCxwhjhO5gHQmMm0layM4QZ3S4uOWiUkGsEAC0tDSgo77ThrI1N F2eougI+V6sqGE3m84C12eSrAGdo3ZhtBP+xWFHD32dhaNkmPXBMtYImLfB0DAK8xhOHmR cintMETJ/0+9jb1rIB4BSH2igLDnnw5+NQu1Qf/49NKhGQReUeWyWvU1Er9yUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667388; a=rsa-sha256; cv=none; b=l0DN3oZhjHdMG0Fs6+dXZC/rCxpqX8keX0mfctQFhlA8TbkNVBiBCXkHJaTWdIlEavB/TU lIdMy2+i7b47lxtToTlIo2AF8d5gjlmaGFDb9GgDrpvy8OaU5VSq5NLWXg6ZYDVug6kS+p tlujcYhat7TVoOOQE0bUcv5E9qw6jHOiISo/AfaSOfBAjR4jMXJTEQb2WARDWBjLLDglgr L0nwoTivzoAi8Z8XhFzPHbVpeQAyxLfQ8Bv6LShE6bqKhV8BQyoCWpmnZKyPpjsagWPzmv vbGEmldX8oAIN/Mqnp7mvhXl1uZBwOcEv0wB6rhSocYjE/oWY2RiuBO5iPqPEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Edt59M2xN5OpcCVZzbmOVsz2GVtHR1L21yk7Mnw+AQk=; b=iG0lept5WmT4oRk3obRklV2cKSoex/ckq9IfbEfsGLI+y1GSPtBzOR+UQnmKSEEB3EUiUZ cRhlpXc+9LM38tI3dLDy8+sWqCxyO1T7mHtfyG7VYnjmV58fX0PhF/AwgH/iGESTQw+d8B zsPdqV/+rPsIu2vI08/Yp+eawdgO90QRb8zCe3XQe3cSV4+ft7h8M9PMseZUKI4wwDF8sc wtQuhMMDOa51elTp5GkS3bd8qGP90oH9E9ElrHHd2hitsi5/271Z8JSPZ4gjO6TXj9R6Hw oUHGTsHrqAQFZFFz27MGuJmGJO7UU7O2MndQolWloC3+HdBFtiwMUD+AHoEx3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qh4Dymz170h for ; Sat, 21 Feb 2026 09:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20603 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: afe686823aa6 - stable/15 - pdfork.2: add EFAULT as possible error, explain some consequences of it List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: afe686823aa6311ac9a74f35c6a1100511b521d8 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:48 +0000 Message-Id: <69997fbc.20603.c0aa6f4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=afe686823aa6311ac9a74f35c6a1100511b521d8 commit afe686823aa6311ac9a74f35c6a1100511b521d8 Author: Konstantin Belousov AuthorDate: 2026-02-16 10:18:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdfork.2: add EFAULT as possible error, explain some consequences of it (cherry picked from commit db80ea9b88628168d2bb7f17a60b73568a8ea102) --- lib/libsys/pdfork.2 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/libsys/pdfork.2 b/lib/libsys/pdfork.2 index 9cbeb65bc4fc..49226cf069de 100644 --- a/lib/libsys/pdfork.2 +++ b/lib/libsys/pdfork.2 @@ -205,6 +205,24 @@ may return the same error numbers as .Xr fork 2 ) , with the following additions: .Bl -tag -width Er +.It Bq Er EFAULT +The copyout of the resulting file descriptor value to the memory pointed +to by +.Fa fdp +failed. +.Pp +Note that the child process was already created when this condition +is detected, +and the child continues execution, same as the parent. +If this error must be handled, it is advisable to memoize the +.Fn getpid +result before the call to +.Fn pdfork +or +.Fn pdrfork , +and compare it to the value returned by +.Fn getpid +after, to see if code is executing in parent or child. .It Bq Er EINVAL The signal number given to .Fn pdkill From nobody Sat Feb 21 09:49: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 4fJ2Qj6n1sz6SKX8 for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qj5g0Tz41H9 for ; Sat, 21 Feb 2026 09:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667389; 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=KaOWqh3TDA9ypG0LBMwnCDPmi6wP2j4kX3c+AmafcS0=; b=S4ptNZcbNBN47azjBDbPcL6vDN4n4dbs+/nXhgutNJDeahyhvIpjdwWFfSZNKMV+Vidwjz eW36ihIZTCDhsNC5qiKLX1tgw9gdWSSo+cInrl1jTxXsj7u/nQil7zZnyG+jKmaRCfAzIA 4Z6EIyFOSr5JN/JUwtqAbtAZJIydMLaxn7BTix2JkCYa9HxSBnWGUsgeMe9EVQGlwPxczi VB4qXuFbCm5BNh8r0Yf2KoWOm0i1BqQh08iG2t05U6UDHNBfk1zWFHHBmU5Afhpa2zGOZv Owdy8zJN+BpdiOQOBUkUgSQhzkjBWI03KtEJTvcAVvnEJSSHp7PpCh8EAgeavw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667389; a=rsa-sha256; cv=none; b=Nw+J9RmF83trPlRUJfTDdUo9uTwxefNCP0lQB5s6SJocko9owkpbHJpdGktKr3KvNCswND Idkpy+outDa4g73gvUkhwkSJ9z3gyIuU5quIbF2Wcr4I69APRylzUtqOdqYylT5iktY8jX ofLb6XvPLAZhsnjL1Hg7TjCyOdpc5DrZ+VA7gEX+J7Bj+sIs/M/kxMhq3SuTKfmH/84KiK P7YFsoOGW9ktldLPqSEymbjgINkU0SQxwL4I+6mamdFvDaicUxyjjBP6fqfW96vNoOgx9y yAixVr3UCTWKw0KbRk4vEeIqdvaNgfz2szPT/q6a1ZALJSwyaQt1Ko1vFUxfvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667389; 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=KaOWqh3TDA9ypG0LBMwnCDPmi6wP2j4kX3c+AmafcS0=; b=pZAr1qqfPUPxJLchEJN7ymqDnpSv4c/H9FcCH2zK0sIJTyTcQEs1CWyqng0Rf7zdor+4h1 JFAw2sjw+7+N1uCEeplZXpGx5wMO+NuvuRJ0G1U+SsFmdq2z0F4RDfQdsA8rDboMFUVOVz eOB1Pm0qVENvzVWkeFGyvPShuLSnIT33zCof386mkGQoyMvZlSBTP4BnGz+uHXPcoe+oyo m5k4m23FhnBtwNXW9Y6dpbIFM7Mc8RF0KiaMT9kOl+7RUeu1AqTGeveTBUhTU8pRB0TsCz 7we5ddcCP0AVsIMfE3DQ9rqnPOuGT1Mxq46gIaqBFsQsTq14EhD0ZgjV3lJvtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qj4xmqz17Ql for ; Sat, 21 Feb 2026 09:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f5b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Konstantin Belousov Subject: git: 558b76135452 - stable/15 - Add tests for pdrfork List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 558b761354523d5224928d2c350e1145f9c6b7f7 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:49 +0000 Message-Id: <69997fbd.1f5b8.5075c159@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=558b761354523d5224928d2c350e1145f9c6b7f7 commit 558b761354523d5224928d2c350e1145f9c6b7f7 Author: Alan Somers AuthorDate: 2026-01-25 16:13:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 Add tests for pdrfork (cherry picked from commit d1e6057fa47e842c63461b64b29ac5d3e9fdad76) --- tests/sys/kern/Makefile | 1 + tests/sys/kern/pdrfork.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 9044b1e7e4f2..946a1c2b9b8d 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -30,6 +30,7 @@ ATF_TESTS_C+= ktls_test ATF_TESTS_C+= ktrace_test ATF_TESTS_C+= listener_wakeup ATF_TESTS_C+= module_test +ATF_TESTS_C+= pdrfork ATF_TESTS_C+= prace ATF_TESTS_C+= ptrace_test TEST_METADATA.ptrace_test+= timeout="15" diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c new file mode 100644 index 000000000000..fa644b6658d7 --- /dev/null +++ b/tests/sys/kern/pdrfork.c @@ -0,0 +1,187 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 ConnectWise + * + * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include +#include +#include +#include + +static void basic_usage(int rfflags) { + int pd = -1; + pid_t pid, pd_pid, waited_pid; + int r, status; + + pid = pdrfork(&pd, 0, rfflags); + ATF_REQUIRE_MSG(pid >= 0, "rfork failed with %s", strerror(errno)); + if (pid == 0) { + /* In child */ + _exit(0); + } + ATF_REQUIRE_MSG(pd >= 0, "rfork did not return a process descriptor"); + r = pdgetpid(pd, &pd_pid); + ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); + + /* We should be able to collect the child's status */ + waited_pid = waitpid(pid, &status, WEXITED | WNOWAIT); + ATF_CHECK_EQ(waited_pid, pid); + + /* But after closing the process descriptor, we won't */ + close(pd); + waited_pid = waitpid(pid, &status, WEXITED | WNOHANG); + ATF_CHECK_EQ(-1, waited_pid); + ATF_CHECK_EQ(ECHILD, errno); +} + +/* pdrfork does not return a process descriptor to the child */ +ATF_TC_WITHOUT_HEAD(child_gets_no_pidfd); +ATF_TC_BODY(child_gets_no_pidfd, tc) +{ + int pd = -1; + pid_t pid, pd_pid, waited_pid; + int r, status; + + pid = pdrfork(&pd, 0, RFPROC | RFPROCDESC); + ATF_REQUIRE_MSG(pid >= 0, "rfork failed with %s", strerror(errno)); + if (pid == 0) { + /* + * In child. We can't do very much here before we exec, so + * just use our exit status to report success. + */ + _exit(pd == -1); + } + ATF_REQUIRE_MSG(pd >= 0, "rfork did not return a process descriptor"); + r = pdgetpid(pd, &pd_pid); + ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); + + waited_pid = waitpid(pid, &status, WEXITED | WNOWAIT); + ATF_CHECK_EQ(waited_pid, pid); + ATF_REQUIRE(WIFEXITED(status) && (WEXITSTATUS(status) == true)); + + close(pd); +} + +/* If the pidfd argument is invalid, the error should be handled gracefully */ +ATF_TC_WITHOUT_HEAD(efault); +ATF_TC_BODY(efault, tc) +{ + ATF_REQUIRE_ERRNO(EFAULT, pdrfork((int*)-1, 0, RFPROC | RFPROCDESC) < 0); +} + +/* Invalid combinations of flags should return EINVAL */ +ATF_TC_WITHOUT_HEAD(einval); +ATF_TC_BODY(einval, tc) +{ + int pd = -1; + + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, -1, RFSPAWN) < 0); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, -1) < 0); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFSPAWN | RFNOWAIT) < 0); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROC | RFFDG| RFCFDG) < 0); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROCDESC) < 0); +} + +/* + * Without RFSPAWN, RFPROC, or RFPROCDESC, an existing process may be modified + */ +ATF_TC_WITHOUT_HEAD(modify_child); +ATF_TC_BODY(modify_child, tc) +{ + int fdp = -1; + pid_t pid1, pid2; + + pid1 = pdfork(&fdp, 0); + if (pid1 == 0) + _exit(0); + ATF_REQUIRE_MSG(pid1 >= 0, "pdfork failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(fdp >= 0, "pdfork didn't return a process descriptor"); + + pid2 = pdrfork(&fdp, 0, RFNOWAIT); + ATF_REQUIRE_MSG(pid2 >= 0, "pdrfork failed: %s", strerror(errno)); + ATF_CHECK_EQ_MSG(pid2, 0, + "pdrfork created a process even though we told it not to"); + + close(fdp); +} + +/* + * Basic usage with RFPROC. No process descriptor will be created. + * I'm not sure why you would use pdrfork in this case instead of plain rfork + */ +ATF_TC_WITHOUT_HEAD(rfproc); +ATF_TC_BODY(rfproc, tc) +{ + int pd = -1; + pid_t pid; + + pid = pdrfork(&pd, 0, RFPROC); + ATF_REQUIRE_MSG(pid > 0, "rfork failed with %s", strerror(errno)); + if (pid == 0) + _exit(0); + + ATF_REQUIRE_EQ_MSG(pd, -1, + "rfork(RFPROC) returned a process descriptor"); +} + +/* basic usage with RFPROCDESC */ +ATF_TC_WITHOUT_HEAD(rfprocdesc); +ATF_TC_BODY(rfprocdesc, tc) +{ + basic_usage(RFPROC | RFPROCDESC); +} + +/* basic usage with RFSPAWN */ +/* + * Skip on i386 and x86_64 because RFSPAWN cannot be used from C code on those + * architectures. See lib/libc/gen/posix_spawn.c for details. + */ +#if !(defined(__i386__)) && !(defined(__amd64__)) +ATF_TC_WITHOUT_HEAD(rfspawn); +ATF_TC_BODY(rfspawn, tc) +{ + basic_usage(RFSPAWN); +} +#endif + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, child_gets_no_pidfd); + ATF_TP_ADD_TC(tp, efault); + ATF_TP_ADD_TC(tp, einval); + ATF_TP_ADD_TC(tp, modify_child); + ATF_TP_ADD_TC(tp, rfproc); + ATF_TP_ADD_TC(tp, rfprocdesc); +#if !(defined(__i386__)) && !(defined(__amd64__)) + ATF_TP_ADD_TC(tp, rfspawn); +#endif + + return (atf_no_error()); +} From nobody Sat Feb 21 09:49: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 4fJ2Ql1z0sz6SK6Y for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qk6H6kz41bJ for ; Sat, 21 Feb 2026 09:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gqGt3+TWp0Ruus3LeGahkCP3QyJFxm0NhHSuwr/N6fc=; b=qIlO4QzpaaK9hlIHOaA98YBGFfeEFLP6yuTmshKUg6gB2WZEaTFCmsK4mQ3k0tgv9YRG6L ySGUO1+rWjPYfPb1On5UGjWE52ukfcuvlkmLYDOJADdObt1eUjZQLres12HJzuek0XQOs6 4AXJboocxTniZ4gxnu8CTma4HWgXMNthYgHy3EgTtfXFpXbIFnSEJrG5+dKqO5XHBnTtTC 7x7RbE1Adw3I8DtSNyTRHmaGakpuyCjx4Vj3rvYlW0yZonpMVlwI/hiAoZUkgC5HL1DI0d APJ8FPKYgVwDi2Lt7JlIcIsjcGFC4tfiuAbXXBi367aLZJZxwLVRAJC/MLY40Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667390; a=rsa-sha256; cv=none; b=GOntl+A6+8kztQGRlNebuB+qEvRkCskO9r4Mo7iGTJ8XPSQtlDoFjQZe+e+gHnv9eIAMbG VVIZxBAioZPZWacnovNjTZhVPWqqumb5xyE5gpgc/IhdGtNI/5NBubbbkj0Z1hl6HpyT65 uRWBNdtWda/+jY09UwS98n/q7tHtgP9nQ0I4zQdT9mlhquYiEzQWFWhaKsEjzppkvonqQA ++LDN46+kGeW7ha7pAby+P8LjiprXAJLj7FhklikwyEBqbhFek/Dv6DygP2m2kovxZ4J7E n9ZDe2kg6KUY82X3s2xFX8PxIu17I04VdnNJfMMGoXKZXdwFh1Xk3a/bfMApXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gqGt3+TWp0Ruus3LeGahkCP3QyJFxm0NhHSuwr/N6fc=; b=lo8+5JM9vQAIh847G0XazbY4xsGPkDEkbV4tUM1W6orIE7rE8jV4iIl/7V3ypgXwvE7KbN r2VoxdEh0Q1V7wT0bniLu1OW037poW4VSwBI2kNUv86CL1sKH5OGzVrYcESeoy+d9OZ0qv bK04nVjg7KaLzmlipiH8O7fX6DVHNUhSznvHGBZBz+LeBTLr3sBqZXIxBfGwrflbFxsKYh A4IT8pkU5/NHY+c02bj0hM2mlbV4FgaEFKeY9ALt4V/l2Y1VdWSR09BvwDhME9dJ+g3mXN uo9VBIFTu1p8wBzn/WvJO3oEV0r1h085S+trcZz6Y87cEAnvHzqPQuNPQ66zcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qk5hWHz17Bn for ; Sat, 21 Feb 2026 09:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f5bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e3fda88831d0 - stable/15 - pdrfork(2) tests: RFPROCDESC|RFPROC are required List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: e3fda88831d08f6354be7e0f4466c6acd19c9382 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:50 +0000 Message-Id: <69997fbe.1f5bd.4e2af85e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e3fda88831d08f6354be7e0f4466c6acd19c9382 commit e3fda88831d08f6354be7e0f4466c6acd19c9382 Author: Konstantin Belousov AuthorDate: 2026-02-15 15:00:57 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2) tests: RFPROCDESC|RFPROC are required (cherry picked from commit 68ba270f4fc7799929a3d59d710f44e5e9087def) --- tests/sys/kern/pdrfork.c | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index fa644b6658d7..7a560e4fa08d 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -107,48 +107,8 @@ ATF_TC_BODY(einval, tc) ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFSPAWN | RFNOWAIT) < 0); ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROC | RFFDG| RFCFDG) < 0); ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROCDESC) < 0); -} - -/* - * Without RFSPAWN, RFPROC, or RFPROCDESC, an existing process may be modified - */ -ATF_TC_WITHOUT_HEAD(modify_child); -ATF_TC_BODY(modify_child, tc) -{ - int fdp = -1; - pid_t pid1, pid2; - - pid1 = pdfork(&fdp, 0); - if (pid1 == 0) - _exit(0); - ATF_REQUIRE_MSG(pid1 >= 0, "pdfork failed: %s", strerror(errno)); - ATF_REQUIRE_MSG(fdp >= 0, "pdfork didn't return a process descriptor"); - - pid2 = pdrfork(&fdp, 0, RFNOWAIT); - ATF_REQUIRE_MSG(pid2 >= 0, "pdrfork failed: %s", strerror(errno)); - ATF_CHECK_EQ_MSG(pid2, 0, - "pdrfork created a process even though we told it not to"); - - close(fdp); -} - -/* - * Basic usage with RFPROC. No process descriptor will be created. - * I'm not sure why you would use pdrfork in this case instead of plain rfork - */ -ATF_TC_WITHOUT_HEAD(rfproc); -ATF_TC_BODY(rfproc, tc) -{ - int pd = -1; - pid_t pid; - - pid = pdrfork(&pd, 0, RFPROC); - ATF_REQUIRE_MSG(pid > 0, "rfork failed with %s", strerror(errno)); - if (pid == 0) - _exit(0); - - ATF_REQUIRE_EQ_MSG(pd, -1, - "rfork(RFPROC) returned a process descriptor"); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROC) < 0); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, 0) < 0); } /* basic usage with RFPROCDESC */ @@ -176,8 +136,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, child_gets_no_pidfd); ATF_TP_ADD_TC(tp, efault); ATF_TP_ADD_TC(tp, einval); - ATF_TP_ADD_TC(tp, modify_child); - ATF_TP_ADD_TC(tp, rfproc); ATF_TP_ADD_TC(tp, rfprocdesc); #if !(defined(__i386__)) && !(defined(__amd64__)) ATF_TP_ADD_TC(tp, rfspawn); From nobody Sat Feb 21 09:49: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 4fJ2Qn4tL0z6SK6Z for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qn0Fzlz41N8 for ; Sat, 21 Feb 2026 09:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ihXbllMmQGMP4biztr8Rr/AolTvWXbdrVYvzPe6lA8Y=; b=Bq626eHRVNGWwymtIT1FStBCfVeBIgEBOoTjlXYnE73cd7SRFjKZ06uhnIVpGhgCCOSRT3 1vPlRimqe46MYOA+V05eSmvZh5M4e4OM2BNg7eoE7/j/QY/Dpa/AxofwdGrEEs7KikgEmj BIxkzjGqk0OdmWJq1STy2714nFha+P+l6klcBDSZ+JaMcX3efmuCtBb34zjtDMgnPRx1gh 8rO5vJnnC62wFwv/fDDM6jBo2PlAl8BNfkKzamet1NsucKib+PUO7dOsI7mxhZXUMHUywV uNIEERYkHFYj+cB+yOk2pQxPo6m1ZIXjirSjIP/OKboW2udD05CojMQUNLyUeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667393; a=rsa-sha256; cv=none; b=XT6kWIJEYwZgqZ3Ck2PLXUxdVbomTccIuoUgNljUWCwE6a4bBqVed2MpYLpy9V+XoZFBTB fZ7nIAL++xCAvqqs83VjEJmyrS+mKSc5gw5X1DXnUmPA3uaRpUbNuQD91Z0eFiqMU8ERvH 7ErnkP9oLF+OPGJLcikGqljrc9j8S9HGsUX3NBf3+mKqdJHLu/Maynx9AqjaGERcwes9F0 4e9hvOoxi83oH/Y5IS5z78jOqqjKhr1CZyllinEvkVyRgvQLAOqKLO069UVIPhB2hW6RUO WP99rhmOTtIlfhzt6JKgXn+W3S+Cn7FwUAGvE+r17Xtdiy/0/8Ozzw4bamoBEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ihXbllMmQGMP4biztr8Rr/AolTvWXbdrVYvzPe6lA8Y=; b=ZhTfVh2smQlCCJN8ph4Du7QjL8hfe9hG8wTPYxlQLktUfwQyFGc04ml4Jbmf4+OS+3ADOM 8vIUjNqCgqzo5ZKvjqFeyYTUzvXUtUW3yZLHBXq7BdW8o8LcQblPw2dFXpCYv6wZvWxmyj CpY60lk44jf9rVCp4v4nrF2/aO9hBBcx3kXKLg5KMzn8RYcwQb/M1K/8X7hrvqE/WaauaS R0liqAJxLz1MY2PtPvzRrXj2fUDtupu4/N7N1y6tg2SDtV9TwNcsFOuHKzFg29trh7DCso dDhQKFeDidu/QhiV9i4oYcK33BEiFZ5csyfXj8VDNkO+mM5wogWIGR5bu7u/Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qm6tv7z17Qn for ; Sat, 21 Feb 2026 09:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1face by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c2c3881f70ac - stable/15 - pdrfork(2) tests: catch runaway child for EFAULT 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c2c3881f70acbd02baaa591497edc396323ae853 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:52 +0000 Message-Id: <69997fc0.1face.5be4af@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c2c3881f70acbd02baaa591497edc396323ae853 commit c2c3881f70acbd02baaa591497edc396323ae853 Author: Konstantin Belousov AuthorDate: 2026-02-16 10:04:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2) tests: catch runaway child for EFAULT test (cherry picked from commit 44843695bc4e36abd15835d627da7d38c06f2219) --- tests/sys/kern/pdrfork.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 1003ad9dc746..943e7fde835a 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -95,11 +95,21 @@ ATF_TC_WITHOUT_HEAD(efault); ATF_TC_BODY(efault, tc) { void *unmapped; + pid_t my_pid; unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); ATF_REQUIRE(unmapped != MAP_FAILED); + my_pid = getpid(); ATF_REQUIRE_ERRNO(EFAULT, pdrfork(unmapped, 0, RFPROC | RFPROCDESC) < 0); + + /* + * EFAULT only means that the copyout of the procdesc failed. + * The runaway child was created anyway. Prevent + * double-destruction of the atf stuff. + */ + if (my_pid != getpid()) + _exit(0); } /* Invalid combinations of flags should return EINVAL */ From nobody Sat Feb 21 09:49: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 4fJ2Qm3T9kz6SKPS for ; Sat, 21 Feb 2026 09:49: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 4fJ2Ql6lJXz41HX for ; Sat, 21 Feb 2026 09:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGOr2k2mYFFGpRVxfXrvj3tgtXDUw9EVK+ys3zBBS4Y=; b=u4vtH5PJKOHXqFGdOvruRlc5aFy2wzL2AmFZ8TXCO7PI7PIwSTh3x0FbJXjVtWo+L0IBNy ulGRmMrwNijBNRLm0uMIP0ovn6462VTiC0FYYB8xldRSwoa1d+qiLyeJ44fe2f2DEJXDjO El/UMfW8sB5Br415+I5enS9Df5zou/cnssPHW6Cd3HJW+BKkVEASn8MwvZgBsimG6KV8hO SvGU5BI8GgUR2zYg+disTB/RI3kqkzkhGTb3461Uhr8yqBL+9ye2D5owoQGOngr2qvmZ/N KPlQrBqENfZ1SW7li0W6afuxNZLJxgiHeyB7cKzSPBGOOGDbxB35NcdnZurNOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667392; a=rsa-sha256; cv=none; b=md8PY6piNhxpnPQAsZPkLTUh6qIUOruYEwjtaJC5HmgK2MdVTnhfSk/zTg8AG+QaPlGCzh ZEdZS7yoqOa00H3qMuJI0ymX0Ikl8dRWenz0i7A3U8O4RPlX8UsS6iVWNZJsjGltAVe9PZ JXMotpVCPzNq2ybDtRfqABnB4ikQNw7xIxsd9KcsRi/XGpF6QqdPrFcMl141G5FTnpiAKZ yehAidy80e2JSM+ScQWDD0++494rYYYS/rqhROipYlTAIu2Xou48u2XEIutuKjOZhblpj1 +rCn3h+Cyw8qgWvXJxu6qMiyGcZDBsSxZYQEaCjCS71SIuzEF24fGA7ivrBQ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGOr2k2mYFFGpRVxfXrvj3tgtXDUw9EVK+ys3zBBS4Y=; b=m+Opmfs4Wi8IrpbXxpCdIWcUFu2M7w75EchvqH8f3k8SFNipV1O/bjciL4H9jxarmW77l7 6+4h8GtGaLz7O5NtgphVIWuwpbEKCNCRW1V0f95dBq18BGkp6HyJlx4Oqmil+ZlQ5EtZwH Wg20qdYBqBBY7qkxz+zifQ8ILR+MjxxEWGIEtjgh+utK4wU0kOP7RFoox4vSBEPEKrONTG sTqVQNt+fsTvLgTYitP1ya4/AqIl2NwUag9vacKKlDeUwA6aSy3O+MSFHf/ILpBQyj7ft4 BuwuEpMHhbpPQ7oKD8qv0SoPzuPU/XnpaJfCe12gv20aX0XP+++fT/Pv9qNd+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 4fJ2Ql65Dcz17P6 for ; Sat, 21 Feb 2026 09:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7a1c336ab9d6 - stable/15 - pdrfork(2) tests: do not rely on (int *)-1 being invalid address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 7a1c336ab9d6ac82ac0942f82449ac53319ce58b Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:51 +0000 Message-Id: <69997fbf.1fc1b.69068e2e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a1c336ab9d6ac82ac0942f82449ac53319ce58b commit 7a1c336ab9d6ac82ac0942f82449ac53319ce58b Author: Konstantin Belousov AuthorDate: 2026-02-15 15:09:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2) tests: do not rely on (int *)-1 being invalid address (cherry picked from commit d6bf2d14a941a88e27a82a3f91790353e134b8f6) --- tests/sys/kern/pdrfork.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 7a560e4fa08d..1003ad9dc746 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -26,8 +26,9 @@ */ #include -#include +#include #include +#include #include #include @@ -93,7 +94,12 @@ ATF_TC_BODY(child_gets_no_pidfd, tc) ATF_TC_WITHOUT_HEAD(efault); ATF_TC_BODY(efault, tc) { - ATF_REQUIRE_ERRNO(EFAULT, pdrfork((int*)-1, 0, RFPROC | RFPROCDESC) < 0); + void *unmapped; + + unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); + ATF_REQUIRE(unmapped != MAP_FAILED); + ATF_REQUIRE_ERRNO(EFAULT, pdrfork(unmapped, 0, RFPROC | + RFPROCDESC) < 0); } /* Invalid combinations of flags should return EINVAL */ From nobody Sat Feb 21 09:49:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qp42yQz6SKXG for ; Sat, 21 Feb 2026 09:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJ2Qp11ZVz41Sq for ; Sat, 21 Feb 2026 09:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N3CcdsirajpPq+RFrwKr//fjwANZ4uzwJIbD/upve2Y=; b=vxA8tzjJhZ7yMHdeYpI+RDGimtjcnkXSQLmjgz3mAvKyLIvn1NNbBb80d2t2942du6VaBV 5w5H0hM20tGT5afiaLQUoeF0vESQ8Hep9yV1m2ilcRQSmRsqR22Pu/i30unctR9JXubB1M O0QU4faQmpPkE89x7mRToSv/Nczl8+xOzeohefqRYhfNK3sziB1p8ujfNbk9+UxJLKXv4p MmVxX4cIPk6FPztnIjgrHplXos8RHeJcsoHqt/cmN4IgESc2rU3cAluM2o/0gzMnr1uqvd iz2MxlvFT/C60qpHyRNKVN3Xzda9MZ91K9ikZ2YTqAAbcZqoMjOVv7RkjXuiTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667394; a=rsa-sha256; cv=none; b=mZY31kNhxFVCo9o8UvK5NW+AK569ICcwV65LvaIJt1YQw/jMV22P628jDy6nUttAcBLsk7 eR+1Sbq2Ilhku6faVyZ0cdNk2vZXtA8rVXzV4xOSAI+KlFKFf65mgGi38CfzCU2RNJLW04 nvFJh2SQGunIxWAYHGytE6fwmzF41wIl3BSp1FSPMn+USxKIrPUaPICjZK8BjMx/gLBlhu e69kDdwt3uHCm7ZIuyTN1cD0bYyXBaCtgzc6el9Lc0Ck5K3kmAhVcYVhjOyJhx2n9cN5wU HHx5mj85wAJedpUOWE5STJJT1pzPx/C8x9OEJTPj3gN0Ym7WkHmWHieeIVUlbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N3CcdsirajpPq+RFrwKr//fjwANZ4uzwJIbD/upve2Y=; b=Ou4oGgf0gjM4gZAiXF+opbn/JtQ7u4qxnowZ9mEn3fh89XJcfc2aGIoA4liQ6v0DVxeEcw UWyB5O3Og1y7/1bKL9OhbnQfYabgbwBwmj9hwD5022x0hnTDh7TQvUyLv76wJtD3lMm4fu uAzDnb4Dzstxnqey3qf/+q+sJ6Y5ym+IRHoV501hYk7bXzxzIsAoOwQyal+G1ihzvM8KYA MlvPB0MKKYA1I6CSji4IXNuVyQEfoQwsbE+tD2AicLoE5MuC9mW+7yt86OmWeH5TyVDHz1 RiH/c6A+9//x/akpyt3kcpSkMRiCzjcTgFot21IpI9xAGXWC9Xqcl5DrYBVurA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qp0X14z17tS for ; Sat, 21 Feb 2026 09:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e166a6ef87ee - stable/15 - pdrfork(2) tests: split basic_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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e166a6ef87ee121be547a564cc6284b172ac7828 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:54 +0000 Message-Id: <69997fc2.1eb73.61da3b54@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e166a6ef87ee121be547a564cc6284b172ac7828 commit e166a6ef87ee121be547a564cc6284b172ac7828 Author: Konstantin Belousov AuthorDate: 2026-02-15 15:22:19 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2) tests: split basic_usage (cherry picked from commit 94e4de77dec809fa5a6975e3495a41d1924c25ad) --- tests/sys/kern/pdrfork.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 943e7fde835a..658ffe117bbb 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -36,17 +36,12 @@ #include #include -static void basic_usage(int rfflags) { - int pd = -1; - pid_t pid, pd_pid, waited_pid; +static void +basic_usage_tail(int pd, pid_t pid) +{ + pid_t pd_pid, waited_pid; int r, status; - pid = pdrfork(&pd, 0, rfflags); - ATF_REQUIRE_MSG(pid >= 0, "rfork failed with %s", strerror(errno)); - if (pid == 0) { - /* In child */ - _exit(0); - } ATF_REQUIRE_MSG(pd >= 0, "rfork did not return a process descriptor"); r = pdgetpid(pd, &pd_pid); ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); @@ -62,6 +57,21 @@ static void basic_usage(int rfflags) { ATF_CHECK_EQ(ECHILD, errno); } +static void +basic_usage(int rfflags) +{ + int pd = -1; + pid_t pid; + + pid = pdrfork(&pd, 0, rfflags); + ATF_REQUIRE_MSG(pid >= 0, "rfork failed with %s", strerror(errno)); + if (pid == 0) { + /* In child */ + _exit(0); + } + basic_usage_tail(pd, pid); +} + /* pdrfork does not return a process descriptor to the child */ ATF_TC_WITHOUT_HEAD(child_gets_no_pidfd); ATF_TC_BODY(child_gets_no_pidfd, tc) From nobody Sat Feb 21 09:49: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 4fJ2Qq3W4Mz6SKZc for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qq1wmMz41cD for ; Sat, 21 Feb 2026 09:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H5UOS2+294uLeOLOoyJEsQrQqj0KKrURwvFSRx1+KaY=; b=i8bVRC7gp2NspgU+ynIIxY6IPGGlCRPgDDZPqzVoPWJFldx7vkIlAiKLPXff6ieSVVxZ3j QZB5QGxDE+os86NpqEwfN9oq7xlqUyaBGSjefe/KtKkE0DqGsbEBRlirdKiDMvafqF4tBA vB98+xiMnwb79v6OMCnLbc2cD/c7+VQvyNHrP/UvhsMeX+mr+JLY81DQ8Eg6pap3fEmXuY DI342/uJ2vcixCu97yfDrBBzcddZgr4qVMPl0P9I87tuRjFZFtLJUFl7ixGv/RDGjhPqjh Wm50i62xyxtUlteIt3Cqis7NpAqdQN9J3Ws0tUzH/vbb9htOoaSDYg69aoW8Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667395; a=rsa-sha256; cv=none; b=saw+9UX5Qvoi9zs/VWsFDh6dbRRa3Td9khimSAcNnLxReiSyKq5OjsfrlC7Y4Usppz5KMA qTJERaprsWXd9X898QO472aasT8WXNg9eFpnxAonweaYoX81vqz9iCv+vJICInXqc46nYE /LUdLbX4KPhfRyonVxLJ2a0dwOShwY2Ij+Y8Z/Z+O5xaDYqX1WkFvujE3CKmNKRoi04eGl m+jV7MhgV9qrjMus7/dCTx2Jo0etIB+sT7hL9MpBThsX+g1pdoFM9RgU8SCE1uEHp/Jn8L RlCB/kZGhR+9so5xDEZAvpWxWcd3dcu0vsULUoqZzq66/aqdSSEmYaHzmdQQ+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=1771667395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H5UOS2+294uLeOLOoyJEsQrQqj0KKrURwvFSRx1+KaY=; b=U5TEmkwpJuLudy5zy+lbmk1amIHkrKVXwnOdJnjoWpJbkO1Upl6QRFj7r9BiYbCN76JFJs E5xRL0JeiuvaCkNIvXDOU4TA38nXNbB7BRpXI99HVlnOcjCVdGtHJe37t1Z0TeouV2/XDz hksGfUm1zBCDEg5VKwiAw/FvQ8hEfOQ+TlJBWgkjq7aiswgiTw5eaTHF+T22gHOMrO2016 hnfOowvsJfeSLq1QLe6IBvrrsoUtyolPmFpWxTpKcj6SDNqi8EidWrMiMobd1Urr1xcyuD ESdkUhiU16BoHDkJiAiG8dzlV4sDEjY+SbOilDGdan9VZM2Nq3lt9Nw/5Orgrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qq1Sbdz17Bp for ; Sat, 21 Feb 2026 09:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 677bbff3991b - stable/15 - pdrfork(2) tests: should wait for the child to exit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 677bbff3991b09c4189e9fd9cbb800273c60a8d9 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:55 +0000 Message-Id: <69997fc3.1eb77.77085f61@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=677bbff3991b09c4189e9fd9cbb800273c60a8d9 commit 677bbff3991b09c4189e9fd9cbb800273c60a8d9 Author: Konstantin Belousov AuthorDate: 2026-02-15 16:53:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2) tests: should wait for the child to exit (cherry picked from commit f90ee665d035a5e4aea0bcaa18793e683ea253ed) --- tests/sys/kern/pdrfork.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 658ffe117bbb..8244a34b6577 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -45,9 +45,10 @@ basic_usage_tail(int pd, pid_t pid) ATF_REQUIRE_MSG(pd >= 0, "rfork did not return a process descriptor"); r = pdgetpid(pd, &pd_pid); ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); + ATF_CHECK_EQ(pd_pid, pid); /* We should be able to collect the child's status */ - waited_pid = waitpid(pid, &status, WEXITED | WNOWAIT); + waited_pid = waitpid(pid, &status, WEXITED); ATF_CHECK_EQ(waited_pid, pid); /* But after closing the process descriptor, we won't */ @@ -93,7 +94,7 @@ ATF_TC_BODY(child_gets_no_pidfd, tc) r = pdgetpid(pd, &pd_pid); ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); - waited_pid = waitpid(pid, &status, WEXITED | WNOWAIT); + waited_pid = waitpid(pid, &status, WEXITED); ATF_CHECK_EQ(waited_pid, pid); ATF_REQUIRE(WIFEXITED(status) && (WEXITSTATUS(status) == true)); From nobody Sat Feb 21 09:49: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 4fJ2Qr5CzMz6SKRM for ; Sat, 21 Feb 2026 09:49: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 4fJ2Qr2Vgbz41X3 for ; Sat, 21 Feb 2026 09:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMGsq1pKls3vIIC2NK55uJkJG/w8mpDA8zD2O5flvDg=; b=kg/Z8gSK+3bq6psmUOQHdiJwzQMFbrhEukkKhygRqmpAlyvJg9AJj/xuUqYbnltXCYC4tH iD92n8EiRtVfJh9IjurdIK3YKDmCJ2kQ8igLH+HBwVRoIf8FO9Xab3C4+wfzJqnftVePdl HkZOQiXO40VLanxkeA/Yz/470YdsVWWAh30G2COFV+gT1qO/XUOL+wbNpDH/lj4vl5MW7g GWQDJcMTAY8zm0P/gkDg8z9YbhX4EAo1vEUbsv5nNHbi5L+4nLijMTKuzx0/geCzJu4HdS 8jTAjajJpP0wZBsLHgy/mZingtF1C+NofHrON4LZCyyf54nH57zuEAgCY3xZGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771667396; a=rsa-sha256; cv=none; b=ckoEGHHUfWBPLZq+cuKdPbJsGvU9LfOvvqh0deYAyAZ3L3JVdUsxUqdnDNq89vLv0qYgiC O7M8aDqAQ8umYRjxwJs8Zr4OCnAipgCzquktKklFYBCKsDMGNCGuP2sj6r23MH6W16GRV4 dPVe2TVsYdWHZBRcpQJbc5DVdi/QuB+ajkOTVTB0awdn5k72CBWv03GlfRajkkqYSg9C1b mPmDtmTI13WejUtNMxioVA9On91ls2s9gV/V9MzV8HbO0nxYQp2O5PiiavP9RGjEGC+bF3 CQ7jeVT828TooDNmaIXKhEydputU6Al+heAnPqovSYCHXVtniUdJmAu98x/pww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771667396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMGsq1pKls3vIIC2NK55uJkJG/w8mpDA8zD2O5flvDg=; b=lrguKJogcduX1ab6tioHx76IhGZ/zIT4I5+Ff6ZsowHJwPAW0PSQeoC0cqQ1BTU0R8HET1 5iF2/fx7kEBNdE2PobQb5ZXQkGmDk2MBnLOoVG5lHCWEOTZ5sVu2f4LBzed7fszDRGeu9+ qfRcIdswYjcu+do14jgtD7Am5vNscH+9A9/HrUva03kNvy7QPS/vJtwkIaLL7tWt8HZqfe fbVe+LPIzoyDuSLQNICSnzTxyAlHlEmyk2vN1I4XbEifL8S5f7tp9YmA5gkzFDMU+9iDtV D6/RAkVklOROvPdYAwB53+kQEinMMXd9TssvbSwRUlVVXSNIya6vu3Td3GXs6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2Qr1t84z17s0 for ; Sat, 21 Feb 2026 09:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20486 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 09:49:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 396d70935ecb - stable/15 - pdrfork(2) tests: enable on 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 396d70935ecb309261d2bc7adf001102d4b91c22 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 09:49:56 +0000 Message-Id: <69997fc4.20486.7cac9ac1@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=396d70935ecb309261d2bc7adf001102d4b91c22 commit 396d70935ecb309261d2bc7adf001102d4b91c22 Author: Konstantin Belousov AuthorDate: 2026-02-15 15:23:03 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:48:58 +0000 pdrfork(2) tests: enable on x86 (cherry picked from commit 793e891f4ad1ef450f562a241fb0bd3b21d72251) --- tests/sys/kern/pdrfork.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 8244a34b6577..30045e0a05a5 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -145,18 +145,31 @@ ATF_TC_BODY(rfprocdesc, tc) basic_usage(RFPROC | RFPROCDESC); } +static int +rfspawn_fn(void *arg) +{ + _exit(0); + return (0); +} + /* basic usage with RFSPAWN */ -/* - * Skip on i386 and x86_64 because RFSPAWN cannot be used from C code on those - * architectures. See lib/libc/gen/posix_spawn.c for details. - */ -#if !(defined(__i386__)) && !(defined(__amd64__)) ATF_TC_WITHOUT_HEAD(rfspawn); ATF_TC_BODY(rfspawn, tc) { - basic_usage(RFSPAWN); -} + char *stack = NULL; + int pd = -1; + pid_t pid; + +#if defined(__i386__) || defined(__amd64__) +#define STACK_SZ (PAGE_SIZE * 10) + stack = mmap(NULL, STACK_SZ, PROT_READ | PROT_WRITE, MAP_ANON, + -1, 0); + ATF_REQUIRE(stack != MAP_FAILED); + stack += STACK_SZ; #endif + pid = pdrfork_thread(&pd, 0, RFSPAWN, stack, rfspawn_fn, NULL); + basic_usage_tail(pd, pid); +} ATF_TP_ADD_TCS(tp) { @@ -164,9 +177,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, efault); ATF_TP_ADD_TC(tp, einval); ATF_TP_ADD_TC(tp, rfprocdesc); -#if !(defined(__i386__)) && !(defined(__amd64__)) ATF_TP_ADD_TC(tp, rfspawn); -#endif return (atf_no_error()); } From nobody Sat Feb 21 10:59: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 4fJ3yg6QwPz6SQnX for ; Sat, 21 Feb 2026 10:59: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 4fJ3yg5rK0z3FNW for ; Sat, 21 Feb 2026 10:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771671547; 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=oHqblhOZVHP6/V/SskonXlRX2L6n0OVSiXRMEtXDi/g=; b=JCnTaQRJiHZQXMvf7xs0xeBDZUuog0WLHHm/ZE7o52stKDtUjcPRaaCXEs+rIO0r/XqUSZ R3HTgTgu3kreIIdmpxJgR8DJajemnsiT8OMqbhnW4RWMC945a5qS7zfoRuPJzwQUn1j/lq Z25Si4/9YGqtxzJSyfOfR6t6N0ESxNdCSm1vZFWglUIpiQBR8tHYY2HDv8vogmBGMO4i6R 6DScuT6uUGyOD/hLMGgdF0UjvDx/Bs/cx4rHeupygOZtnbbxoPcQmdt91mOpSOuxAJfU5k VFITop+2veGZEFgTc06+dPnOo8+/wUJfv9mjjBBLzbEW5GI+W+5H/oTYPRLSiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771671547; a=rsa-sha256; cv=none; b=VJW1oFr42wrrBVJMeSLznru0RjqFAIq4cnQDNdsCnF4kcTqtPp2UXcI4XVpSUBm3atIZJf mJXm7iebMbfRoSEg9M8J9ghJ8ePQX8w8Do9ZckjQ5xaqN+lHSnTnIZDKii+uE+N+ZnI2OX hkNf6d45uvX7ROXsaf9hjF8Vc6wjD+NDaEsjRE8ucEp2/a18NAMRQVtljsCCR/JemGWqAE TSm+wOe52HjrcCReEa6V7iuoYK3Mver1mSicyyWvzHSVPyXpHQYlRGxU837JrG7OvVXRSP de0igd57xzBgPD+QCH64Rer6fVvO6z6Ju4F57xgzKs4awtHUanKd0GHRWhAV/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=1771671547; 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=oHqblhOZVHP6/V/SskonXlRX2L6n0OVSiXRMEtXDi/g=; b=wgd0iYHI7e7TjQo2gNmSO8HZPjM490bIwv7ZDGtqm/twFX/QOhYqGwzVfuAuNLYJrsZIC8 +YhT5KPgyV7N1HWF04ZMlMCvO6rCfZTGYpaWbdlByOo/SRwTknUaczyV3pgMhinZ/SDY38 ipTNFlrzB8i6ClDcDKnkkDAkW6UVKBCws9XeerDFx0XbTm5q6GrpDADR22aYYR21BFHwUi RpZ5pjpgATG/6qHDby/fX7qJcZEKYzEl/i4S+O62FjipSBlCk0XJ5klpaSyZ2SVWH83Hsh 049stfPWDvxr5IGRLznckzIGBvJn8/x4HINlkg2p6B1Fel0furh0AM5+EkpCKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ3yg5PjNz19tN for ; Sat, 21 Feb 2026 10:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27616 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 10:59:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Maxim Konovalov From: Dmitry Morozovsky Subject: git: d5dd331d54d3 - stable/15 - pw.8: spell List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d5dd331d54d33d64dfb254a55b8e54d8c0f603d5 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 10:59:07 +0000 Message-Id: <69998ffb.27616.52efee@gitrepo.freebsd.org> The branch stable/15 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=d5dd331d54d33d64dfb254a55b8e54d8c0f603d5 commit d5dd331d54d33d64dfb254a55b8e54d8c0f603d5 Author: Maxim Konovalov AuthorDate: 2026-02-11 21:03:11 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-21 10:55:35 +0000 pw.8: spell (cherry picked from commit 66797b469ee3e303c5e228bea1e244f433e666e1) --- usr.sbin/pw/pw.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 9b75ff772c25..91d746e90c02 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -687,7 +687,7 @@ user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . Also, uids and gids between 100 and 999 are commonly used by pseudo-users -assotiated with third-party programs, and generally should be avoided for +associated with third-party programs, and generally should be avoided for assigning for normal users. .It Fl w Ar passmethod The From nobody Sat Feb 21 10:59:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ3yp34Bqz6SQr9 for ; Sat, 21 Feb 2026 10:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJ3yp2GzVz3FbY for ; Sat, 21 Feb 2026 10:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771671554; 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=05Efn6+5eq8B/7GmOV2cyi5gOgx6c1nNq2mLzBKsTnk=; b=jBlC+pGGwObu9YmPWgpBAPUse0ib+4LW2iqjhOVgLXntems+qcdvcOkMiDPM3MxrO43uKj 4AI5VNoJf7MtAAAKRIGVqizA8d460KNwYLvyPNqp+kRf+yoMGC4SmB3aj99cJDZx/HHCKa mZPsAKjBrtmGJSWARdpDjsgdQio0Gf4x0JmlmP5sSKf/S7cKGdFtG2hvPOeARafEo1Ecr4 d8Os4GNHLll+cRZ/mhVf7iyLzifRmEAIkWZ/NpG+6rh7D1g1b1DtUYueO2WflmVCfIg1bv kEr+V2KVDF6LUWcXIqR0f55bB5ntPiAxlOkK98TzN9jHy1vrpuTB/gPiYruv6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771671554; a=rsa-sha256; cv=none; b=J56V5XMgpuKRztCqE1hdZ+5BXuyqOYIMqEbN0Iso4ahkku9odgZKp2OPH/ZtKcNP4F5cWZ is8bkqjcHIZl9b0bcA1G/Uku77KYcx7E6b1oVnfWOc0AY96mxUCzbzdPfB60CKUQ44dRbs HHjDymBSX+KiOckl7DcfU6d/b8/8j3qMUwvuEH1mElC3B7ZRodU310MvwSt8wWiYFHvvKf FaDIMkqyjQwc/HbEkHGMnS2cm5jNTukFh428QDYKKQkxYfIW89gbuP2W0cGZWy9uJvqzyc Y7x0Bd5AgitPOtnRk5nXXYQRQ+Is1jRrDOqGRn0bEPhPybDOqZp+Sm/YLY/D9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771671554; 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=05Efn6+5eq8B/7GmOV2cyi5gOgx6c1nNq2mLzBKsTnk=; b=ugJ/CudRm+/59PZ2M0yeys/nI7bdwrt9cTm5eG2gB5+GmLTC7ZSbmRK2vrR62DT/d8gqOl +0WJ5DMnafibW60VvnLwmIrl6olsASIAWfT95D6+FCnpjIRQw5joCvF7fg+zkKIbpNPE0r NCHg2wF9NU/YRdAlgFGT2KjzmEe7491VyiFRtQ1l9D/c/RjR4Cf+8z+qLJdU45cn0wtn+w dVg41yJ2Ky7nQzrSY3hwMEO1ZJ5PealNGrXPhsDNyV0+pxlz2WLoeEMx/eNHotDTDaNm63 wPn2t2klUIib+dYpsx1mbAgX9REMMazMIwZ/cUXDwDmX643cJTSN2JavAvMsLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ3yp1TJYz19YC for ; Sat, 21 Feb 2026 10:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30215 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 10:59:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Maxim Konovalov From: Dmitry Morozovsky Subject: git: 8f8a9adb14c7 - stable/14 - pw.8: spell List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f8a9adb14c764d4fdfc6f43363a8f58451aec70 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 10:59:14 +0000 Message-Id: <69999002.30215.1549487d@gitrepo.freebsd.org> The branch stable/14 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=8f8a9adb14c764d4fdfc6f43363a8f58451aec70 commit 8f8a9adb14c764d4fdfc6f43363a8f58451aec70 Author: Maxim Konovalov AuthorDate: 2026-02-11 21:03:11 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-21 10:50:37 +0000 pw.8: spell (cherry picked from commit 66797b469ee3e303c5e228bea1e244f433e666e1) --- usr.sbin/pw/pw.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 9b75ff772c25..91d746e90c02 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -687,7 +687,7 @@ user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . Also, uids and gids between 100 and 999 are commonly used by pseudo-users -assotiated with third-party programs, and generally should be avoided for +associated with third-party programs, and generally should be avoided for assigning for normal users. .It Fl w Ar passmethod The From nobody Sat Feb 21 10:59: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 4fJ3yw3MYrz6SR2F for ; Sat, 21 Feb 2026 10:59: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 4fJ3yw206nz3FsL for ; Sat, 21 Feb 2026 10:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771671560; 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=spZNDAzm7iNFDz/vg6JM3wZa73zy14gvwihCIjNxfrI=; b=aYznYWMJNcAWji9uWn18VyY401JRMgTbzTPc+Q2FnmLWgtnjfQnzNPhwR/l6KbrIYeYr6M 43tjZmXxGO3fNGUMhxuEAPoXsvd+kZZ/N2K6AxTKVDxVAQXeR6O18XvD99MLVUWwt/bhKe iplKunnq637wXxoCMA88k9e/J8bXr0SULV70kH3AxObV4lj14A1nrWNAlT699RuwgwEGVf M9oegI/scCrzZlhnNVS4uPdvDn7Wa1vvmM49z25XC1fqqV7y7pNTTZNT6bTPBgX/86rUx3 3Yt1bdjLuGqtqlCBbq4KopS01NZ+GfoPDlTKA/keVRMMvB1uJS+IcZY8DueJHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771671560; a=rsa-sha256; cv=none; b=m+w5FNjo8UsLGRSTZQPRLgfpTmH5XwrIj2sQlDDkT/rHn6jQRHf8lWcywO0av85bWWNGFE NymPKGQjoY6bXX3mywAQ1SfbR54htUDW1heTPpJou64tILYsvy3/W4ugmtqEycIsRuKDhA y4SWNQ0bVRVKpR7HjKCxfqo1R799q5fEZphOa93cf5Blp10350l9mxLotvWy0vWhGBW8G3 TuJwCIzsqZknkmYPVN7O4Ghi7HApx4BPD9RoeqtRKplXT8WXiaCiEuNAh2Tl8PgDGDLjkA AhyPoSumhxfQcx6nhKJr1Hyqxxt3271HSPft/TSwFb0FNlZLOGzdBXS8m3tIIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771671560; 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=spZNDAzm7iNFDz/vg6JM3wZa73zy14gvwihCIjNxfrI=; b=VQVYuasetGMpEx3O7VIzjSNrMzFtlua1jnhTXSjCTuMpSLMBuGHUsozFdhCFiTtgykijxg 2gP57ndHd4S9tbaNbcMzUUggIz0dhXXiPbBubSHbGyr6GpobHAxujxPtcqJr4nSgLHDpCl Bm2UqWjdR6k6dWBpelWTFZDcWAL8Xck1uGZCj9QM3QmTITtkyNOfwKeOOnKuyJPPQkU6ko AeL0xQSYmJoJhBj1kd915LCRoTzF8ZAFjQo64GWgICIRSx38XzTk5hBl0HA//+3azpQW2m OeqB92Zz4GoPR9+cgGAlDO8Dxs6Q4gs+9JrGavRIyW/zw1AN19CQivUV6BGNiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ3yw1M5sz19xm for ; Sat, 21 Feb 2026 10:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27cdb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 10:59:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Maxim Konovalov From: Dmitry Morozovsky Subject: git: c4a5799b76f6 - stable/13 - pw.8: spell List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4a5799b76f655a63e0204d125ca42d4cded86d2 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 10:59:20 +0000 Message-Id: <69999008.27cdb.4defe8f0@gitrepo.freebsd.org> The branch stable/13 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=c4a5799b76f655a63e0204d125ca42d4cded86d2 commit c4a5799b76f655a63e0204d125ca42d4cded86d2 Author: Maxim Konovalov AuthorDate: 2026-02-11 21:03:11 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-21 10:50:46 +0000 pw.8: spell (cherry picked from commit 66797b469ee3e303c5e228bea1e244f433e666e1) --- usr.sbin/pw/pw.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 9bbb05ae0082..40a5d202594b 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -666,7 +666,7 @@ user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . Also, uids and gids between 100 and 999 are commonly used by pseudo-users -assotiated with third-party programs, and generally should be avoided for +associated with third-party programs, and generally should be avoided for assigning for normal users. .It Fl w Ar passmethod The From nobody Sat Feb 21 17:05: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 4fJD4r6TkJz6Svmp for ; Sat, 21 Feb 2026 17:05: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 4fJD4r2TJcz3x5y for ; Sat, 21 Feb 2026 17:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771693500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LW9wh2zlP7zH/byx7cpTjVAU/D+Awny6yaJHUI6IJ0=; b=iwkhDd1B/zTCm5mK4T+QXbfTbrp/s9TQ/E9GDxqxMgZ4jQi3Ou3ddWml9Y4FL5nAtxZSnu 2H9GijIW4QLsc7fxxHCiE6xihp0Cp7N2qGtEKcfU9ItyahMdoCpnUf23+IICrdzASSa1vw bqbKqOMD2y/UEfjNHski9gZvaLoPKTs9eHo7RBenIPKY3Ek41PWi22VjvaI2PXGTFzcBIm Pjzxg4GHXr1VVLhu5uVynVMDeFFW28iCeVeripFpOvHnN44b3g0P5nVpI2Z5cXV7qnFtEm mmgsRHzwRVbKCmrLHutHdWkxG+uaOETa35vFOk1L6x2pVV+t2LW8rfQc3qIecg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771693500; a=rsa-sha256; cv=none; b=Ex9Wr/TGZwR/oWydIPGedLUnSxDWpWQdhk25iZY2nrneEB+7X4nI5VTfrxaLPNE2Vfn0Iy Oed0n+Yhl7akN2S4S73XTT2P8t3PmxpBya7pLTFKzbXfvhD5AITxG7Yu8yTHzVXQ5uVw2F a5JfD1zUMNQ7P3soGHn//KtRpngaOkJ1ibX9BmAx7E2sWv3uyZ1crkbeeqRpu6w6aMi7Ai xMXKvdpExzpV0ar18b3ypBvsSsXtGXHEuv41GZraNkF9PUCInL4eb5WJzdRur4uT+K0Ngp SDyYxuviIXu+WRIuZPuUv/DQaAIpMLlrP3i7NbKjoR+WOXSuc43D3hpBw971ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771693500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LW9wh2zlP7zH/byx7cpTjVAU/D+Awny6yaJHUI6IJ0=; b=YD6Db3Z5Gc9p0l9ayzvXYZAMOBomyit1hza+VuWlQoWANWOf7aQlQKwZKbxAbvj11fPqwH /u22Qnf2VvVnHRaO2Vz24efuM0vrC0ObLQOvJ7/1xc5dB2lGh6pRX2HPJ+hd+Or6Vrh1pZ dWT9Qd89UDgylY+/j88ejQxiCohdbcww8saPa0LoyqXVIj1k+trUBboN69ki160JmuQf9Y VGn9nebooNYpNhbrc3OAbs8nHM4conaXVu1z2f0wsKH/EFAIWQn9OFulJrBNgMbSQakN9Z 6DsDeNwxkVg+Twu63ofcWzmuUtijW89VBVwoJwsbUWQoO85GPwMuORcnSgH0LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJD4r1D7bz1M9K for ; Sat, 21 Feb 2026 17:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ae3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 17:05:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 86a6407d028d - stable/15 - linux_file.c: Fix handling of NFS getdents() emulation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 86a6407d028d9a58c93c7d1ac54e737d78b1aaaf Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 17:05:00 +0000 Message-Id: <6999e5bc.34ae3.1b88ca7d@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=86a6407d028d9a58c93c7d1ac54e737d78b1aaaf commit 86a6407d028d9a58c93c7d1ac54e737d78b1aaaf Author: Rick Macklem AuthorDate: 2026-02-07 22:12:55 +0000 Commit: Rick Macklem CommitDate: 2026-02-21 17:03:38 +0000 linux_file.c: Fix handling of NFS getdents() emulation Bugzilla PR#292282 reports a problem, where a Linux binary running in the Linuxulator gets bogus entries in a readdir()/getdents() reply when the directory is an NFS mount. This appears to be caused by the NFS client including entries with d_fileno == 0, which are always ignored by BSD, but are not ignored by Linux. This patch filters out the "d_fileno == 0" entries and the reporter of the bugzilla PR notes that it fixes the problem for him. It could be argued that the NFS client should filter out the "d_fileno == 0" entries, but the NFS client readdir code is "fragile" and any change to it runs a significant risk of causing regression type problems. As such, since the LInuxulator is already broken for this case, it seems safer to filter them out there. PR: 292282 (cherry picked from commit 110f2567cb51f1eeddbd5d9937000ad64f6dc746) --- sys/compat/linux/linux_file.c | 178 ++++++++++++++++++++++++++---------------- 1 file changed, 110 insertions(+), 68 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 8413a481c5a9..ca089585bb95 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -398,12 +398,50 @@ struct l_dirent64 { roundup(offsetof(struct l_dirent64, d_name) + (namlen) + 1, \ sizeof(uint64_t)) +/* + * Do kern_getdirentries() and then skip over any invalid entries. + * (Repeat, if there are no valid entries.) + * Adjust bufp and lenp. + */ +static int +linux_getdirentries(struct thread *td, int fd, caddr_t *bufp, int buflen, + off_t *basep, int *lenp) +{ + struct dirent *bdp; + caddr_t buf; + int error, len; + + /* Loop around until a valid entry is found or at EOF. */ + for (;;) { + error = kern_getdirentries(td, fd, *bufp, buflen, + basep, NULL, UIO_SYSSPACE); + if (error != 0) + return (error); + len = td->td_retval[0]; + if (len == 0) { + *lenp = 0; + return (0); + } + buf = *bufp; + while (len > 0) { + bdp = (struct dirent *)buf; + if (bdp->d_fileno != 0) { + *bufp = buf; + *lenp = len; + return (0); + } + buf += bdp->d_reclen; + len -= bdp->d_reclen; + } + } +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_getdents(struct thread *td, struct linux_getdents_args *args) { struct dirent *bdp; - caddr_t inp, buf; /* BSD-format */ + caddr_t inp, buf, bufsav; /* BSD-format */ int len, reclen; /* BSD-format */ caddr_t outp; /* Linux-format */ int resid, linuxreclen; /* Linux-format */ @@ -413,11 +451,11 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) int buflen, error; size_t retval; - buflen = min(args->count, MAXBSIZE); - buf = malloc(buflen, M_LINUX, M_WAITOK); + buflen = min(roundup2(args->count, DEV_BSIZE), MAXBSIZE); + bufsav = buf = malloc(buflen, M_LINUX, M_WAITOK); - error = kern_getdirentries(td, args->fd, buf, buflen, - &base, NULL, UIO_SYSSPACE); + error = linux_getdirentries(td, args->fd, &buf, buflen, + &base, &len); if (error != 0) { error = linux_getdents_error(td, args->fd, error); goto out1; @@ -425,7 +463,6 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO); - len = td->td_retval[0]; inp = buf; outp = (caddr_t)args->dent; resid = args->count; @@ -434,44 +471,47 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) while (len > 0) { bdp = (struct dirent *) inp; reclen = bdp->d_reclen; - linuxreclen = LINUX_RECLEN(bdp->d_namlen); - /* - * No more space in the user supplied dirent buffer. - * Return EINVAL. - */ - if (resid < linuxreclen) { - error = EINVAL; - goto out; + /* Copy a valid entry out. */ + if (bdp->d_fileno != 0) { + linuxreclen = LINUX_RECLEN(bdp->d_namlen); + /* + * No more space in the user supplied dirent buffer. + * Return EINVAL. + */ + if (resid < linuxreclen) { + error = EINVAL; + goto out; + } + + linux_dirent = (struct l_dirent*)lbuf; + linux_dirent->d_ino = bdp->d_fileno; + linux_dirent->d_off = bdp->d_off; + linux_dirent->d_reclen = linuxreclen; + /* + * Copy d_type to last byte of l_dirent buffer + */ + lbuf[linuxreclen - 1] = bdp->d_type; + strlcpy(linux_dirent->d_name, bdp->d_name, + linuxreclen - offsetof(struct l_dirent, d_name)-1); + error = copyout(linux_dirent, outp, linuxreclen); + if (error != 0) + goto out; + retval += linuxreclen; + outp += linuxreclen; + resid -= linuxreclen; } - linux_dirent = (struct l_dirent*)lbuf; - linux_dirent->d_ino = bdp->d_fileno; - linux_dirent->d_off = bdp->d_off; - linux_dirent->d_reclen = linuxreclen; - /* - * Copy d_type to last byte of l_dirent buffer - */ - lbuf[linuxreclen - 1] = bdp->d_type; - strlcpy(linux_dirent->d_name, bdp->d_name, - linuxreclen - offsetof(struct l_dirent, d_name)-1); - error = copyout(linux_dirent, outp, linuxreclen); - if (error != 0) - goto out; - inp += reclen; base += reclen; len -= reclen; - retval += linuxreclen; - outp += linuxreclen; - resid -= linuxreclen; } td->td_retval[0] = retval; out: free(lbuf, M_LINUX); out1: - free(buf, M_LINUX); + free(bufsav, M_LINUX); return (error); } #endif @@ -480,7 +520,7 @@ int linux_getdents64(struct thread *td, struct linux_getdents64_args *args) { struct dirent *bdp; - caddr_t inp, buf; /* BSD-format */ + caddr_t inp, buf, bufsav; /* BSD-format */ int len, reclen; /* BSD-format */ caddr_t outp; /* Linux-format */ int resid, linuxreclen; /* Linux-format */ @@ -489,11 +529,11 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) int buflen, error; size_t retval; - buflen = min(args->count, MAXBSIZE); - buf = malloc(buflen, M_LINUX, M_WAITOK); + buflen = min(roundup2(args->count, DEV_BSIZE), MAXBSIZE); + bufsav = buf = malloc(buflen, M_LINUX, M_WAITOK); - error = kern_getdirentries(td, args->fd, buf, buflen, - &base, NULL, UIO_SYSSPACE); + error = linux_getdirentries(td, args->fd, &buf, buflen, + &base, &len); if (error != 0) { error = linux_getdents_error(td, args->fd, error); goto out1; @@ -502,7 +542,6 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) linux_dirent64 = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO); - len = td->td_retval[0]; inp = buf; outp = (caddr_t)args->dirent; resid = args->count; @@ -511,40 +550,43 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) while (len > 0) { bdp = (struct dirent *) inp; reclen = bdp->d_reclen; - linuxreclen = LINUX_RECLEN64(bdp->d_namlen); - /* - * No more space in the user supplied dirent buffer. - * Return EINVAL. - */ - if (resid < linuxreclen) { - error = EINVAL; - goto out; + /* Copy a valid entry out. */ + if (bdp->d_fileno != 0) { + linuxreclen = LINUX_RECLEN64(bdp->d_namlen); + /* + * No more space in the user supplied dirent buffer. + * Return EINVAL. + */ + if (resid < linuxreclen) { + error = EINVAL; + goto out; + } + + linux_dirent64->d_ino = bdp->d_fileno; + linux_dirent64->d_off = bdp->d_off; + linux_dirent64->d_reclen = linuxreclen; + linux_dirent64->d_type = bdp->d_type; + strlcpy(linux_dirent64->d_name, bdp->d_name, + linuxreclen - offsetof(struct l_dirent64, d_name)); + error = copyout(linux_dirent64, outp, linuxreclen); + if (error != 0) + goto out; + retval += linuxreclen; + outp += linuxreclen; + resid -= linuxreclen; } - linux_dirent64->d_ino = bdp->d_fileno; - linux_dirent64->d_off = bdp->d_off; - linux_dirent64->d_reclen = linuxreclen; - linux_dirent64->d_type = bdp->d_type; - strlcpy(linux_dirent64->d_name, bdp->d_name, - linuxreclen - offsetof(struct l_dirent64, d_name)); - error = copyout(linux_dirent64, outp, linuxreclen); - if (error != 0) - goto out; - inp += reclen; base += reclen; len -= reclen; - retval += linuxreclen; - outp += linuxreclen; - resid -= linuxreclen; } td->td_retval[0] = retval; out: free(linux_dirent64, M_LINUX); out1: - free(buf, M_LINUX); + free(bufsav, M_LINUX); return (error); } @@ -553,22 +595,22 @@ int linux_readdir(struct thread *td, struct linux_readdir_args *args) { struct dirent *bdp; - caddr_t buf; /* BSD-format */ + caddr_t buf, bufsav; /* BSD-format */ int linuxreclen; /* Linux-format */ off_t base; struct l_dirent *linux_dirent; /* Linux-format */ - int buflen, error; + int buflen, error, len; - buflen = sizeof(*bdp); - buf = malloc(buflen, M_LINUX, M_WAITOK); + buflen = DEV_BSIZE; + bufsav = buf = malloc(buflen, M_LINUX, M_WAITOK); - error = kern_getdirentries(td, args->fd, buf, buflen, - &base, NULL, UIO_SYSSPACE); + error = linux_getdirentries(td, args->fd, &buf, buflen, + &base, &len); if (error != 0) { error = linux_getdents_error(td, args->fd, error); goto out; } - if (td->td_retval[0] == 0) + if (len == 0) goto out; linux_dirent = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_LINUX, @@ -588,7 +630,7 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) free(linux_dirent, M_LINUX); out: - free(buf, M_LINUX); + free(bufsav, M_LINUX); return (error); } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ From nobody Sat Feb 21 17:29: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 4fJDck1p97z6SxLH for ; Sat, 21 Feb 2026 17:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJDck15GZz401P for ; Sat, 21 Feb 2026 17:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vy5ZCzLc8jW/V63MIw2vhruAeO+nnW/1fPsa0Ym+KPA=; b=FGTDPXaTFnd4VmQsTeRy6bwLC8xFyyTOz4KX5Kvxw6FmozGfCyFDS0HW6oFbyEQhFzVQS8 Ap31lGauVBLSO+suQwSPEmN9RDXGiVlJkMh0s84cq7exf/plvKXEHNX009GV3yt6zQsCk7 U13tRDdC3HVKWOikYQEIPXGPwKcKsF7sB0DXVfYN4rJWMVpOB3N60zX013oM+Z63VxQdmz ugQt3j6xDBWWvMNF5inFnqkZxEOp21CkwoZSUxpQT5jsv4VmO3vFCjP3MpRL9QQtRoCd/A gjdsL8y+ICP79yAaRFx2Y+ThE2+1G8EwmlV2f4ijwyZzv8SSScNuZu+aO7aZkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771694950; a=rsa-sha256; cv=none; b=WCphIlGoQ58vzh61cXUi6w2C/yh8+zHyjb9Mm+KLfyrkWDH6AOxxyb9aSNMXGiYhJEIAAF E4tdjiv23xUeBntUNomdTv6k1CbKsZMx163N8NingJajkmxK2B22oKQdquapwAH7gWeipV q1JmsGJpea6dAHvzYMLYueYxSbzBQ9q6cYRMGy59xOQv81KO2Elfz8fo6MOI226yXs796v h7NmJcCmMGEtJtzI8PZ53lmK8I16KEr8nHMmsklVkV+0cUNGEyWQ0VS9mGowT5tS3pOkSW Pa3Lfg5W2M/HW4Vfk+hXA7zjRa2/ObVbasfokiKzLJZE+ravJFKMY3Jbos+Ziw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vy5ZCzLc8jW/V63MIw2vhruAeO+nnW/1fPsa0Ym+KPA=; b=MwjYsV/GN8CN00EMzjDGGoSJqFPbinmsxTEIYqKhLsgi2wnf36E+gWOqmDiEZbFpEPhFu4 X3ZBoQvCDE0jQYyhigA3Tkjq5p2JImXW31CDIzVw0gsOqWibdTfD+6iXOEn420OoLaD1cZ T0evjYF4KjaxkKGPrQ2eG90k8t5VOXWqJU9VzmCkXXnPIL8jNTHSGvBoQMnOh9+K6QW2Pz C2glN3eTESXA6petxAYjKJ/1PCp32HB+GwvFBQ4TTFGA+rpy+C4gsDXtmKjhf6tDg5sYil PqZGeotBDDMvwFwq0D0UnS1kfGsPXpTy4Fhbe6anUfIQKwgcipfMjrbaw7uCOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJDck0YJSz1MxD for ; Sat, 21 Feb 2026 17:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 17:29:10 +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: be10d6fac6d8 - stable/13 - diff: Fix gcc build. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: be10d6fac6d8366123a7ec25ba3826c045027dc6 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 17:29:10 +0000 Message-Id: <6999eb66.39905.1ad097d4@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=be10d6fac6d8366123a7ec25ba3826c045027dc6 commit be10d6fac6d8366123a7ec25ba3826c045027dc6 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 15:30:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 17:29:06 +0000 diff: Fix gcc build. Sponsored by: Klara, Inc. (cherry picked from commit 28d9586cde8dc783f7b698b10c2b564fde14ae74) --- usr.bin/diff/diffdir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 6d71d0eeada5..25930c461846 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -61,8 +61,8 @@ RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp); static int vscandir(struct inodetree *tree, struct inode **inop, const char *path, struct dirent ***dirp, - int (*select)(const struct dirent *), - int (*compar)(const struct dirent **, const struct dirent **)) + int (*selectf)(const struct dirent *), + int (*comparf)(const struct dirent **, const struct dirent **)) { struct stat sb; struct inode *ino = NULL; @@ -81,7 +81,7 @@ vscandir(struct inodetree *tree, struct inode **inop, *dirp = NULL; return (0); } - if ((ret = scandir(path, dirp, select, compar)) < 0) + if ((ret = scandir(path, dirp, selectf, comparf)) < 0) goto fail; RB_INSERT(inodetree, tree, ino); close(fd); From nobody Sat Feb 21 17:29: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 4fJDdF4QD1z6SxLL for ; Sat, 21 Feb 2026 17:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJDdF3ppWz40lx for ; Sat, 21 Feb 2026 17:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSX3pIRcLWLDrEsOY/GRSqbkqzS73lPwIzIBC9jTR90=; b=IrB3eEE5x8ZJ5WawLRjtfn3ToGU9RJ5tuyY5PKQYwvZWFzXDSpo5wHq11xFW1z+8xw4qTM WoTOkxUAYDoB7Ci4GTcAYNB7U4OqlSztU50cFaxXw8crhj0evEkyMZUJfRdVOGcM8WQ/92 qlRWTpbdHSiZxx5koCQdy1sl0etiKDVbPIhB98XUigKcdlV05X88Yigea1CLougungSE/o WlVWrqxG/DyuD8zkIeF+O0Z/EOUBE93iyejJMvMGC3kKWVFqRF/3T5LZ9FBaR1JioITjEe wpZ6CyWsgb+cyAF0bbW0Uqfa8gV04ToKnmL81d/d7nyPAVjE0aWm9h7C/THSkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771694977; a=rsa-sha256; cv=none; b=VTnmrQdkoqE7T+zUOSbWjdnl31cAXd4mpJh3SDYn83KyiR+P0YnE2gQ9wl+wwhP2mzTdDG 1NANXkfJpSUHFJ0czYYOiQEUGQ3wyf92pPJF+oD/d7R8x2B2iLw+nBwhsQHmYu4hhuANxx QvJWPH+lwATgun8o3SCshrpDiVfznwJFoDefxPksfNMdbGKz1DQz8q3U3rIaGTQNws5tuv WcZ6lE1rnRs1JRFARlzwON/Y3ea9UOCQryzW05cF7jKm8nvwb13O5ng6cj9sknXY6fIbCW bBNb1eEg4fc5n5j3JQiYfWoGX5t8S4ZFrhuhDNc6K+mow1njc4oj/FZ3S1rx3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSX3pIRcLWLDrEsOY/GRSqbkqzS73lPwIzIBC9jTR90=; b=kM0S1vzNyYiBGcdqP5pVR1ZP50uesiuwXy3+1+kz/JBu/szPLFpoMG8uZ4Ejl+J0XHWJwa avD8jpAVnVwawnlPZOP5GAUgPwjGW5Ri2UgSPBGOhkc43WzzhQ446AY8xqAOBsjorY1W17 GYHDQTNQJ2xpIRcGmiK0i0L0HjbVIdyJoxHjprF6L1AcLo/xJoIyN8ppQDvhH+03JIbRsc WE+028O8oJ+bf5+ECIq9sXFdj+VwXBT45WL1p5AwBT3oqfeFH8SM3DKBEAEwgh8Dj1jZz9 eXCatb1GdJPRKSyyu3/EaPPpKBmQPLt1s9RGI0Cx1KgrFCmOap36a1lP3xC4fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJDdF3MfNz1Mrm for ; Sat, 21 Feb 2026 17:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 17:29:37 +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: 93043c650548 - stable/15 - kqueue: Make kn_sfflags 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 93043c650548c80f13e5d0db32dc5998eacf8a61 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 17:29:37 +0000 Message-Id: <6999eb81.384cd.1e9ae134@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=93043c650548c80f13e5d0db32dc5998eacf8a61 commit 93043c650548c80f13e5d0db32dc5998eacf8a61 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 18:28:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 17:29:18 +0000 kqueue: Make kn_sfflags unsigned This is used to hold a copy of the original fflags, which is unsigned. MFC after: 3 days Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D55348 (cherry picked from commit d379432808ed286dc051a34138ae250addbc469c) --- sys/kern/kern_event.c | 2 +- sys/sys/event.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index a1cd409c53d9..e8e670d39d09 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -735,7 +735,7 @@ filt_jail(struct knote *kn, long hint) (NOTE_SECONDS | NOTE_MSECONDS | NOTE_USECONDS | NOTE_NSECONDS) static sbintime_t -timer2sbintime(int64_t data, int flags) +timer2sbintime(int64_t data, unsigned int flags) { int64_t secs; diff --git a/sys/sys/event.h b/sys/sys/event.h index ebbcdb703183..b339392c7d04 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -314,7 +314,7 @@ struct knote { #define KN_KQUEUE 0x40 /* this knote belongs to a kq */ #define KN_SCAN 0x100 /* flux set in kqueue_scan() */ int kn_influx; - int kn_sfflags; /* saved filter flags */ + unsigned int kn_sfflags; /* saved filter flags */ int64_t kn_sdata; /* saved data field */ union { struct file *p_fp; /* file data pointer */ From nobody Sat Feb 21 21:34: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 4fJL420LpSz6SJhw for ; Sat, 21 Feb 2026 21:34: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 4fJL414Fznz3NqZ for ; Sat, 21 Feb 2026 21:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEVDQSs8SYMPjqm3KbQsoZlfOIkR8AaHtIxif34okBA=; b=VFQLdfFXxaLub7Y8Cd3b4MZNDHPmUpfnT/NjbClqUpfXh3hLxyo69+a8iQqATykXSlv11e YAl/0FJhPDaP27op+sdZ19rFKCiuJCDCuEVXjNxFaagozSNT19x8tsCxyj4/NUlvqyijnN UaNxndkCt3BigPPY4KkNyCGPIo6pNw5qnPGxweLe24SiwawGD1dmJeaY6ZWp5yWEpADsGT jj2k7nmmYv336JKdGctTl/5Z6SP00pAcNb/oU+iXT46cSWCxLKCI95fMyq3oP+DMmCe9/t JL1N0ecnGL5ZZDFgSQOAFH4t7hmnJjVEqddSE2wQgngp8sarp6CToToIxovK1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709681; a=rsa-sha256; cv=none; b=Fl9S+h+kw8fOtPVUYwXdVA6J2mr5x/uQXnN1ykgfOob5zAKZ5kSoq9EUZbHJZkNNNPDlkC 17N2MdtrAb7Y9eOqsajxU32VT2A3hrXS4dTSqxQIjZh0sK6J6E+jVU56/+EdgcVcEFqVO+ f1gYhJ3F9RgVH1bZZmAqvrN3VSPGPhRpLP3EWzjrYZ2rD69dPt1SvEEXh9bYra4bY27lUQ cC/s+oltYtklwetF6UsQPxbd4SUEYgw4bub3tbiw7hCZ1h7wTxuI9YLrdrORi5nI/bQkWN ZMOdSIxv17ty5G6gi+9w9farGs+O+5oWTFVkK5cC6fqQSIcP589eXwMxgFbtrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEVDQSs8SYMPjqm3KbQsoZlfOIkR8AaHtIxif34okBA=; b=mYNxI/rqwM0XqV7plKcg6FNBchGkY54PVmN2j59QcAiz9JcBzTi+VSoB20aXvkQBlAxpd4 OOfQ6MZvlFIDXU9maqYzqNq67laYpS6d2G1BL1OGbWKQjeZMKOekVgoOpmaWiPAtva50tD OCSjfPnIhKdX0/gs4LIrSkxBHxbTsDJeWlWjJUJZ+F0WtkcuxOJuz1UQpMoFqBM+T7NQ5H 92FD1ptsHm6i3PAOZIYKyPw+JCycsSB1Xuwc5WBADIFG9wXvQZXdY9EeTQcxGdHWe4TAX7 8SI7FFusZC4Ycu6lbdg9/CPWDGAJRSewb1UniYAIc1Iz5sErU5LMdLOIHaoO2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL413RQfzc8 for ; Sat, 21 Feb 2026 21:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23b12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 51db826bcee3 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 51db826bcee3f6820bd2dbc8b32814ca8d1bcda7 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:41 +0000 Message-Id: <699a24f1.23b12.58977501@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=51db826bcee3f6820bd2dbc8b32814ca8d1bcda7 commit 51db826bcee3f6820bd2dbc8b32814ca8d1bcda7 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:06:16 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/abi_compat.h: normalize include guard name (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 Sat Feb 21 21:34: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 4fJL426f5Lz6SJhx for ; Sat, 21 Feb 2026 21:34: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 4fJL424j1Xz3P4x for ; Sat, 21 Feb 2026 21:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gHNOxXW9iYf4pCknoSFVuv7B1y2xCk0Sn9GmEhbraLo=; b=WPfBo3JfnxXtJfIDzM4wgPDaMZLFbtl58RWARKM3rAiaCDSvA3e8ivhqk1P4wzE+Wy2CYn 3SQUfm41MbQd2ghk1L3sXflXXYYTXzK6jgqZzbDX2w6pz7K1jcljp7S5pqo6R3KbP11clG sjvNMnstNpGDHuOQye/TPFMPMuSByv0TwmHqrxlsiICPWMsrnlw4uKPF5GQ7LrZkWXTRn3 d+/ysdvo1p2L35f0sWp7rgN8I6AHXiQ3MxiSzkaSzP/8l5Xy5qjvIAt2qkEMXbLsJeIWCa hKaNdFlZO1HZ0/u0wMf835ZLmA7YfRp7SPjKkob8s5Z2vYfql6Eie77HA149jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709682; a=rsa-sha256; cv=none; b=gOdjfrsCwu9TQ5OgXEajVe2v1RnZ4JAIcdpEUrCbodMqv2m+Gy6uDDNt0r+pC1w3GjeVoQ bVNdKdE3DAo4sZbI94pWrAKJBO3DYyhqg6pM2icQe0toKVtlQX3Xkl4UyAzjlQ9bWybtX7 82aPbMMTRwjZXUytW38XL4mf7bAs3M6qfPzycEVOICNnmkyBPTs1pS3fQ1yCLpdFpVVZWt XUwEaGCx0MZbYJytuocGTHQc4z4laanb+6xuId1w31sBpes4f/sWP3tjJ2mB//d1f/xGpF j8Xj8HCRzE4D2VWtHwJyIXJzTPZ75uUi3pO843gHSrj73FyUVF+cLCcPeVBLUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gHNOxXW9iYf4pCknoSFVuv7B1y2xCk0Sn9GmEhbraLo=; b=Xo/P4/p2mdl5GJprknOExeApxXEykOu+3VJ2uROA1zg7ZT8WTPy9p94fRx3u+xVhJxPpLQ kmppHT8hTe4qwuhXiAbl7H10cxFrGU91EI9soeDJimzpFOatviC6vjRTe7noYYj0qeTBun 9mXrae3/KVhUPLPhkkcXD2Oq9bz3q3QtdFVGnhLNo/okRJHuMwlEJdT16iihEOQ79Y+bjK EjL7ZDnb3OLTFByRb+NdOyYhR0kSs4MIp1odSJSoqX/1loZo/4OC2AzxJFMmtWdpYHV6sG q2K36JeQ1VQrsm9bSOzdKhdHwt5S7NuPCwk15CZqRhcmTmx0rnpvslpHs3FyXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4240dKz1Pp for ; Sat, 21 Feb 2026 21:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c3b1a6ab18cb - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c3b1a6ab18cb4911c0fe05a21d5dff8b79a7ec4b Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:42 +0000 Message-Id: <699a24f2.220c2.3a6a4bc4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3b1a6ab18cb4911c0fe05a21d5dff8b79a7ec4b commit c3b1a6ab18cb4911c0fe05a21d5dff8b79a7ec4b Author: Konstantin Belousov AuthorDate: 2026-02-05 19:08:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there (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 7d21a5be5570..cba8474b5bfc 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 a7d98f06aea3..474afcff60a7 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3084,8 +3084,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 Sat Feb 21 21:34: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 4fJL445pLtz6SJpj for ; Sat, 21 Feb 2026 21:34: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 4fJL444MF6z3Nt4 for ; Sat, 21 Feb 2026 21:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTnXFsSLgpj8c2l3V61NiyQI7MXo479xSayGIWs7rYQ=; b=YUPt2xRaXLh27W2VDmUfXFeTwCg2Bs49aa+WPxm2rt36PZ/WukUTGfG6OCOSMijzHWQG/y QjJAreAwMx5ADVcTtHRXRN6RZIVRzht9mCStSUWcYf49OkhM0HEEctMWbBq8lpwDZQGak4 6WdEJZOaSHjSVv1QRzyeWNF1nURGgNVW+GaGBdAS/klXtJPoxyO7LIekhBpumWTm/hEw7n IN0j8ZicS5si3YnVPbxDJUywUxkFdjvRAlXI09FU8iy3EgNCBqvECFGjPs67a4QWPzyHIt 7vgBQenw84YEvmO1fhwxShldsbEf5pY0WVp8F636gLBZGKGbbufeDpjIJ6HrZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709684; a=rsa-sha256; cv=none; b=ovN+l8oKnApwUeeyHdNwUP/vmrPz5p6MqoP39FRBWpkhDpZaOmTma6U+pFRGsnHzx+syPC ISfC5PYM2AyK3LzaU90x9poWIK1pJofdXYo4ai+tD5ArQcRaRniIsGjxMTYpm+D7uqSlSP nzCWjVeREuTHsN+0qhUfHwuGOBdjqLvDEVgxpg4t4YU1bFl9KWGWZDKy2mtZn472NIrZp9 SD97PFu9+G8HK1N0g1SqSLsIPTepArzjk5a670D1nRZ2J1Uw9skH3An/ncvlFMQGVHVmg3 mOxDBLSnvnvCFqKlRyu+8Mn5pXL5bzrVeJl/rLq5piLo/JhOdFVkxuFM1+LdBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTnXFsSLgpj8c2l3V61NiyQI7MXo479xSayGIWs7rYQ=; b=ekRy2cPzV0UL1ff/arQx5s/K88xAwEzrUSe/os1ue6AQVpzaZR1eY3Yg+b7at2I2cUbM1Y Jg3XMT8lpuB9CE7k6qZuSuMGp1VeCaiNihMwARAPPCB3bmL1JuflHuNzb1D27M1wQK9qjM asLm0QPu5YuR/2LbT9c6l+AW5dSvHf8EfqC4v8eo1sGT+Yt4m2ZQioDDYinqRXxrxUFh+w N87dxkWxglWKPG5gNUyrn3fGYlI0+NqEcN3jyAs8pIjVUyHdv0uMaMJd5im3Q8ZKXf+xdo 4gGqCwI4RSKRhORsUvIjLUzd7mlpN9928mtsc7lgmBsHJx4gXQOsXkF/wbrR4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL434lbKz1LW for ; Sat, 21 Feb 2026 21:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22057 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3d14c793f882 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d14c793f882bd884ed8a1a5367fa4be768a781f Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:43 +0000 Message-Id: <699a24f3.22057.2cdb4f79@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d14c793f882bd884ed8a1a5367fa4be768a781f commit 3d14c793f882bd884ed8a1a5367fa4be768a781f Author: Konstantin Belousov AuthorDate: 2026-02-05 19:10:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/abi_compat.h: add Foundation copyright for uint64_t stuff (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 Sat Feb 21 21:34: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 4fJL453Xm1z6SJSQ for ; Sat, 21 Feb 2026 21:34: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 4fJL446Hnzz3P87 for ; Sat, 21 Feb 2026 21:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6Ly1ZvrIdpNr1jGYX2WPDFiLQW5O7cTVctu8qTXdHI=; b=r0giQylvoddOPDrRmj23HGZdBLsJXSQPI8OEUHtcKED6nqdCmLOvALj2hT36nQfCxcfPvD gFvkxPadwMFuSu+b/tCyWxVdGueF/ceXKknK8/wkW/wdqn6IPebKaLinEN1/SpwCbHKIa5 +T11a2vekaAf8mOYxtzBjupm0xyVh7mcVDwLp06CHWlMD5X608vO11ABxjJ295DP4en3Db DlukEsNixzinq1GNzn1Q+rHgZxCQl02n3tVhJMlq7snJVp6gMCjYCF2sV0A54PibWUE6wc eSKp9y07k/+2sqgu+8N9KSatbhqoOI0HOOf4xn+FoTIKizGn3mYLGKuW9EbuVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709684; a=rsa-sha256; cv=none; b=gONiCBWpWYpB4NcB+NfMTRf4k+Uj+yJnhM7zAaxXI5zv8OxnlG/ezDmiPOYI95V9K8a/mn GnswVfsvO4r+MM3j9zFRrGKO+aF+l4KRMTVYhS2rYnPOy8ZLASpiiRpAkUEzgQePpO4/r0 NEGhqNtzHMCCxShY0G3XKJShWMLZaZ/actI3z+l6/eLMfq/SemXn/S2bDPm1ELWa4qbPnP 26yiXbIGerrDNhR8feEAg4NAuxnKOIE0cTe829D4784g7x1RR1vO5xXkGtWNR3zaayk0zO zgOYuvRpwSVu3oe1EnBstD63pbXp8/FSqOgHyTHTdq9xASOAKZsAujzZZBEBOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6Ly1ZvrIdpNr1jGYX2WPDFiLQW5O7cTVctu8qTXdHI=; b=k3jWzo8vFOVFOAqz/Ffj7bMeFa6iKgGci/UC+1d4uhc0rNL0vT3iRg+IYGB5t4RyS6btbn TsID1N0Rym0U0Diwwrs/ZM8npUZAHn2biGQS7iwGR7W+rl1OXZLeAARORTNYYvImj8GAnk R17EEz8yCE5mC0jICX14G1kBffRTYqu0VBqIt3PVbDOtFCLbJ2fojT3uupRAqHbHut8cdJ pJ+Z81EwfwAUW2jbqnb6mDB5on+xDS7HdV1rxH+gIUatEdUJzVTPNara+q66rx3P3OiK1T RuNTcL0UX9M7bIORgo5cpGRTzkB6zS1+RcPkSY3mj5E1PHjQTDFzhY6z3/+txw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL445d6xz1Dr for ; Sat, 21 Feb 2026 21:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21fcc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f0fe4e11be92 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0fe4e11be92e5823f3a7974c9a1c6783ae074f2 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:44 +0000 Message-Id: <699a24f4.21fcc.4fbdc9fc@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0fe4e11be92e5823f3a7974c9a1c6783ae074f2 commit f0fe4e11be92e5823f3a7974c9a1c6783ae074f2 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:22:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/event.h: use freebsd32_uint64_t for kevent32 64bit members (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 c76c9d5c1838..544842803e21 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -713,31 +713,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 @@ -819,7 +804,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)); @@ -835,20 +819,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 b339392c7d04..c313cafa9e99 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -104,6 +104,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 */ @@ -112,12 +114,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 17ed43b55c5a..d3f2ac882e61 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2404,11 +2404,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 Sat Feb 21 21:34: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 4fJL473FHSz6SJlg for ; Sat, 21 Feb 2026 21:34: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 4fJL470dzrz3PV4 for ; Sat, 21 Feb 2026 21:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwwTnk9TIqmota3ntuaVHoKrRok+X85Lm3s7lRqEAR4=; b=MXMmR2VTCIFAqOfjDKVFSCF35uizSAl2wazgw94leS1BCpbwR+R0JWWjEqZ2Kkdbr0BIeS BtyFEVehVQ8lVUEvKHdrRvUvpaj6g0c9EBZOtXWFWlMg+tC9bVhH7CkfParIwApbYqXKdM YtaX5tSG48/bGOAjH8t5CuCY+lBZIu2qVvljHrT0KXBLWkuqw0AtSBz5QAUM4NqzjAd+pp qNP5iRHXqqbYLlEyGkI5Gl+HyBO8Ovc71pbjZjWFnVd/Uf97uJPEt/TNFacXsjizJUMVZ7 +FX7zVhaAGgwMRCUD+RUygGsCnvbCODU9rqAdF4g/7tzZVfFoJiMIy9OfCiesA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709687; a=rsa-sha256; cv=none; b=a1kUBAWmUyZmzgTKC0YVNVgP1IsKlJX8spGJ+YqNPpogkZ4M4QTQd4iqeR0ehQ7+KbU13T A3duIdSr78aszONLqCOdKQH2LOGrN6/PZUI94QisLH+DFDNPdWXzWwkpEZmaPH5Gsl/qGz avTPiakWfZLsgTVmmSnRDQ05fL2Zr2AZ2KpnXcP8Fz5BPuMcXSYfx8qczApI+IRtHRkecD SqvA63tmR/H1734z2VlDV5qo6ckBiea+WTS9KfnqawZiFwsyQMHiGNf1MVvX+5yXl+zzCa UjoK4ZXRSXcXpg1UzEofxDh+a0VhsIDBUmiRdjSXdYhzcS0E/pxc9T5I7pYPtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwwTnk9TIqmota3ntuaVHoKrRok+X85Lm3s7lRqEAR4=; b=UG7RmyJjqIWxEVgS0G756czRuXMqynX8UrfF197JagfXR7f0TJHKH+nsFEL9aA41Rz2c6m LLxzC7KuJrSlCX4x/sEu9kQe6Y8BvoJwiRQ/I6QYp6Ap9MCFttEsMHVYqiPie2DbIC3WcS HBxcdWrsRAWAEvLtLCd7DMTW2Vb67Y6pYPamitiQD+LW9FvQxxjkUMRO2Y262Na6/8D/Az YVHYhCK3eLosRwgg8SMXLcVxfKMYKDwn9/5g3wA+Xq3c5rR7BC4DikcrT0587FC8H2a1lv 2i9vf8nqjkrH033O5837RDCgLKfXoRehJps5AIUrqYPlAoatOGju2kJhmmuBJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4709KLzcB for ; Sat, 21 Feb 2026 21:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2293f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 838fcf30d7b8 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 838fcf30d7b862ac3d15bcda370f74fc69d63dcb Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:47 +0000 Message-Id: <699a24f7.2293f.1129d638@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=838fcf30d7b862ac3d15bcda370f74fc69d63dcb commit 838fcf30d7b862ac3d15bcda370f74fc69d63dcb Author: Konstantin Belousov AuthorDate: 2026-02-05 19:35:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct ffclock_estimate32 (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 7dc1c5d2302c..78eb34694f7d 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 25a8558335e7..7a624b45cbf7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4149,7 +4149,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); @@ -4179,7 +4179,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 Sat Feb 21 21:34: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 4fJL464J5Hz6SJlc for ; Sat, 21 Feb 2026 21:34: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 4fJL4617sHz3P5Z for ; Sat, 21 Feb 2026 21:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkbF7tCZO5nTolXIXTghq9zgUdOFJngfvHI0LYdoILM=; b=xseisx62renjCT1gJgEquc+I/xkHVbp+BYO9bHZ3D7QAvkN6EcgSFw4JiQT/4Kd7MJWcYf PIilqHVoe3fxG/+LpxKFz3f3gwZ6+tGbG4GcQyikL7PyCHlqA2ahPehK30FUEHGJ3sk/UN TVGFoBSJ9yyLebtBbYM/2i+UkxpLDo/drIMsBkt3ZIEvH9um9ZklOA8AFLZsEXCdANEqB4 pJ3rz7luWcq0RxWGSBsEsK8BDOn8jxNLNhRXhZjfxFC0mqBY7115CTw2uNiSfgWSjKoqMn lRDQiXprhKXvol2Z93dzcNTqIZBdpgO/MPihdWhI6IGfZHiSb0KYargOgA7NWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709686; a=rsa-sha256; cv=none; b=ruE1SRWRCV1s8lNtRpljysSuDL+j35f5AViBQ8fS13Xt1DnaWR2WG03yfZ9v2vo3DSwkIa rD7U8T54RGovwK9GlP9RoyUIJwqpDMikWs5aB/+5w1OWWrhevqxOTkFVjQwV3AkhNSNiYG N65HqjZWc6jN8qbeoF5SuFncatToQ11FnKnC5xGE98E/1+sjNF9egPXH6R2ua5hoKzlhi3 oos1zug2CCrYf732x9ioy51nI4921Cn/PoEx/f1Nlq9Ut44e10U40RG0U9B6Y2l+7hsd9p 74rLjX9kdRIMUltH4RDwPwMwvMzmoTuDxiCbFommPGVys3urjKNTZviF3Iy3Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkbF7tCZO5nTolXIXTghq9zgUdOFJngfvHI0LYdoILM=; b=Q1D/BQq6KHckam2pFUFcpuAIwz4rB6bq4gHRZQoAqwD/CXzR8Yw9i6wCegUb/yWcbCELT5 sZConD5YvyFY/GiFRSabgMVJ2gK8q3QrMj5N18H8ebDq1DVYQo1E7Be5gCL3Skoiy1Mfj3 zyNVTX7AxRh5rL9QrnOLP1t1g2EAgWeTAcCZb77p5KxOBJhmxl8wy0qjBZYzwhMdfpIGgO xdv1AhY89yidDG/AnV0sXgwr1Z+M7w9VF06emS+FF6rXWE8Qlv50X0GTKEAEfcXZCfKnSe ZuZTrky8MyrjwvArzy16LAMBIbgQufQtvKfpixKDZaPeM1sid9qyv80AX3MtIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL456S8wzrK for ; Sat, 21 Feb 2026 21:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f4f4f2783c6e - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f4f4f2783c6e015a79396689e34807676c87bc02 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:45 +0000 Message-Id: <699a24f5.23304.329adeb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f4f2783c6e015a79396689e34807676c87bc02 commit f4f4f2783c6e015a79396689e34807676c87bc02 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:29:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 (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 cba8474b5bfc..7dc1c5d2302c 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -448,12 +448,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 544842803e21..25a8558335e7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -739,38 +739,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 Sat Feb 21 21:34: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 4fJL484zfPz6SJSf for ; Sat, 21 Feb 2026 21:34: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 4fJL481V4Rz3PRq for ; Sat, 21 Feb 2026 21:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FhpLAVTccClxAuesvNt6/4xno6z1E0IduFmHpJk6fBY=; b=aQM8QzrIMR4IYnlAawxQIW/zdo7CicBZXLITa6LeZCrl3v807qfYQ//UGXiBIdoZYo6mY3 OpLQvZAs89z1wl/QlUU4OnVX9qkmG/EHEFybjutyMDWxxJf5v3Lth7uIUf7umsmI3BK7UB xrl11x0PQxRoLfU3yWwURVLSi+yP2j2GUvSQI2TH0tqxjLgQRiDG17H6Kz7JwARhv1mNFx 3++JB+GYqYBWUlYn2rjBIO557MnjwsY09SyfmWXB+6BE0jaQyjcdUYl4EnTbfuHDVmNt1i r5IIwQTrh8cxK4m+gSgXDji2lczdjhc75xPHi9qnGc8efHzAHmCSshmTToK26g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709688; a=rsa-sha256; cv=none; b=c3mT0gOb7VNW2+gR55tvbnpYTHFICF/O50nZAk2xU+YVwRlPHBbIh+W2wBu9lJdFtWzi+U OoQktEaLGH/QWfiTXzMvX3TANYFFN183LtUQyNDS0QPwl+chViUnsVtfYnjDC2aefsrGMB xXXy7i8mH0BVC4EorsZfRjwp7kCPy39ONZ2lrzJf1NkUof7ad2kC4NFxdqWmcMNyXpJ5Y9 txZT05D2rFHmbfoLMDa9Ic2/uP94F9f1+HnalcoY5i7HVutqEYV9i+owVh3i2gDIcFqCvf 1YJiIOubyzPog+Y0YLYprwyxvVM0JvTtH7W/UQdDSAOHwpC4HGNi/fjxeevLbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FhpLAVTccClxAuesvNt6/4xno6z1E0IduFmHpJk6fBY=; b=oo2xap/Ko9VrY5mFDfcNbqK4cLjN5a60pQVRDuw1G2vLLOb0cC2l0dqrM52v3zz5Ag6Nan YW0bkIz+r2OqLNjD/SxFA4w4xD6nCQgwjDxoKRuWw4djOugI2LF0TbJPojCgK0ExoGWi2O aVvfkEeDDONY6SQMPKVsjCQbfsp6Q4DT3ut8o6W/XgmmqUzL7owo0dnrY1xKflFJPBYGvY qK9CEU6LRsYEBb6IyiY1Hpd6fRCnkHG3vi+dKVGbny46K/NyiSRvQAgaA38CcdRAOkwOx6 hMGvVVyeQCEcXaXHyOY5LKQsR5nfI2HXO/TKo+LKaq8Rofcp2auaA7OvRTYZtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL480nthz1Pq for ; Sat, 21 Feb 2026 21:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c06360af56e8 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c06360af56e87b70a055655de29dfd0144ee5666 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:48 +0000 Message-Id: <699a24f8.23a37.475c4ca7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c06360af56e87b70a055655de29dfd0144ee5666 commit c06360af56e87b70a055655de29dfd0144ee5666 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:39:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for several struct stat's (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 78eb34694f7d..2be4810ff44b 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 7a624b45cbf7..457e599c22d2 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2287,11 +2287,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; @@ -2500,7 +2500,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 Sat Feb 21 21:34: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 4fJL494Fgyz6SJKP for ; Sat, 21 Feb 2026 21:34: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 4fJL492HqHz3PXj for ; Sat, 21 Feb 2026 21:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKNKh2+HocVbhuvl7O0rQL74ase//vXGFttRJQ2cspk=; b=SWT4VZGmhVYX/xJ0U2zm5jPBKnySvpRu93zXxeRIYoQh4NwSDvAiKnm8Bo2YVN3DoBAKgZ 0u+VQTZUBQ1FBvQNtFo6vSQwGhoBOg7UT+w+niTdfGFRhV/jY6PRLxWNX6r4xTVAa3KXp3 I+UN/KbXJ4cGEda3Zw9HKRaGsLyWEoH0Es17LKQTunky5WRCvvI2mdLR5pKMk9u1RdYq4h afw4tYD4aODuGoeiCrsRADDblT5abRuocpEmyvrrCy9HNngsaQjyYJQwzOMw0VVj1ulVic KrmAScMPjFnQGqIXcdCjisS8NB7UHNrT+N6SkNILUkiQaZj5RdUpm7nfM8/jsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709689; a=rsa-sha256; cv=none; b=UiBQ0RX7jD+6+7cTPlfmWxvrbEqikNkM8mXRTsn4IaW6ugVPD7G1p18fG3Bb3275FGAd0C t051wbLHWBRTVRfMu/TwXc79MwbXtdx2jM98+mN3uLkYjE7buhp8pLXeEMREfbPDpBa25h zEHsFz0qP4NsAoj7JXR3+gXA48W/xnHVLUqvfKvVwDLGwHrrQRjBwSp+6rPIdHaoLhbgeb KOsSd1avhHcEZVu+Dnsg+tjLPQgjguE9XBSobgnoMaHjQlsBO9mhPMsWCPH/pgrmAO/7Tz lXoG2GAfM/Qy2aJH52Y9+eD6OZdqgNs9kttg8laZ3t7+duZihLivYUkloFmgFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKNKh2+HocVbhuvl7O0rQL74ase//vXGFttRJQ2cspk=; b=Pm8XCPcVCVyjSACtcx6wIdi5LfFAquonjT8zgEQQCCu6TBlffHDfsB9JYQXMX/uX4ztkkd SN4CAlVZJ+zTabNW1rZjl75Ir+04RiiOLiImLFCJJKRzt2A9t6oX28w72p7Qi2yfsa2aXJ xuzIgQ7Mn822eutMb/vvE8+JWzJUL45SMHHzckD9lil6Q56NckmA/Rpo1szivjf5uYce1o fyX4yXdiP6q3JAUBdj8WEDIg+5zz1t9jcWixICySeRqSfkwHDBsVqqrZ1uSj6jQhVfasVR Z87DzDTWHFhPMNBnMytSuVhnJvS5mhZP+ZKWQMyYGUCO/CIMkHeC1GDfMfKxQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL491Yl2z1Dv for ; Sat, 21 Feb 2026 21:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8a8e4399d8c8 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8a8e4399d8c84d7f86262aabbea68a6f4a64dd17 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:49 +0000 Message-Id: <699a24f9.220c6.536a7e1e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8a8e4399d8c84d7f86262aabbea68a6f4a64dd17 commit 8a8e4399d8c84d7f86262aabbea68a6f4a64dd17 Author: Konstantin Belousov AuthorDate: 2026-02-05 20:02:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 sys/compat/freebsd32: ki_pd is missing from struct kinfo_proc32 (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 2be4810ff44b..ece7ace1e862 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_uerrmsg; uint32_t ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ int ki_sparelongs[KI_NSPARE_LONG]; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 8f86ce349e30..e84eb1efbc2e 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1505,6 +1505,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); PTRTRIM_CP(*ki, *ki32, ki_uerrmsg); From nobody Sat Feb 21 21:34: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 4fJL4B55gTz6SJSh for ; Sat, 21 Feb 2026 21:34: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 4fJL4B34VYz3Pbd for ; Sat, 21 Feb 2026 21:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fEA9Q6YIp35OHZXq/NZZkZsRGTyb16vkGG6oWrPRl/I=; b=NEcqM7Z/yicTbt/D9Vk4LJHKd9+n6oXwekuJBhoL7QgWQIFBIBwPXrA2cqJon2cuziHOJA mBdgH9KadruG0mOM2Q6QhMjy0WYTnDA9MSHx9CmrGDI508brZ4th6yhARPI4K50j2QdvdL wYc+rFj5vfmIXDbd4BtQrYqcv8I3clm/yKEYJboOjzeHYJLgNSPYxAzTXyeWz04d1hMR92 kcLTJ8qFcMqG6sXkjYZRRoUvlDxpEc2ap0ehTzFaX1QpMj89RexqTWggy4M9FZhqDwrweB AJsassBcONqw4oRPkiSF7kXZDExhABMAp1Zh6ElcoqX5w6jjXscKcY7I9ZQgeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709690; a=rsa-sha256; cv=none; b=J+OPUq1HJoXbinCHerCXQ01wGFhM+eFgUz+0QK12l2qTdx68K0i1W+fV+gJJff/ztwyYV2 Ds4yixeBDABmbGBYS+wMTXCPQLwalnYiEgNNTjF4dV31o4GTfsi4BJnmSaIJBQ1ZduGA5w ElpnnTMEfoXoUVkFQgBtBDt0wjETORf35HQTbKqTE5Gpchzu1KzhcRHVgfifQp/P0jTYQN RYtLGfxuRfeWmhKS9s/ocBPRdDfWxgZtiedOiJtjTwAkOmjB26Y6NITIB78j1XwF/5YSEj QRk4OVZT3prKa8HKxgUpBjwO7HS251vBqTmuwbXa603LHqJN6EjfYu2eomNztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fEA9Q6YIp35OHZXq/NZZkZsRGTyb16vkGG6oWrPRl/I=; b=epdcjAFIDGqDYByQ9B8QrDBefgHXSMc7Nv6YioeTp80i7/Ofp6qQDrBsLuEZjMjqSqCM6K m1xo4YA7TnStYz5MkhKEPhhXvBaCebXqoh+7RBAv03JZpXcQGk9zZCFVehz8hlMZc0NE0o wRIDEDVwvOxm8CFm6Aj2Osg9VL/hMPpgKLa21rtHaUHxwdfETSDgSR2LB7D+oSFamw9PKg tYlKGPuVQ7+thOiX9gCchYZPTV7xx0YL83aMLf0Sq04zxVAjR98PuiHRLlJpM7GfFnCvBP Wl9GtSOAhNF3FUXenAm0RirHQrU0KdL7+pkZ8QiPC8RHXIDOowIbWQXTJZu3QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4B2NrZz1Pv for ; Sat, 21 Feb 2026 21:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 232fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c709baba436d - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c709baba436dc0ee36c8ea0d0b272ec1130dbe55 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:50 +0000 Message-Id: <699a24fa.232fa.357314bf@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c709baba436dc0ee36c8ea0d0b272ec1130dbe55 commit c709baba436dc0ee36c8ea0d0b272ec1130dbe55 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:40:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 (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 ece7ace1e862..d742139f9dd0 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 e84eb1efbc2e..e6541c73ccac 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1439,7 +1439,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); @@ -1466,7 +1466,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 Sat Feb 21 21:34: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 4fJL4D1Y8Wz6SJsK for ; Sat, 21 Feb 2026 21:34: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 4fJL4C3cvqz3PQF for ; Sat, 21 Feb 2026 21:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6N5n++qXE9msYXhTOOTirJKor/EiLQSz1fBNEXRX+Hs=; b=F7ZYRTuuo9z8LcL9IZj/e6aA+qJ3gsyKmIkzL8q9feGlKj9nlkZp/WgSjTf3yv2tBtK/Ie MDOthYxR/7q3ljpalNXxp9S/5coo5udkQ0KRFCBjAZhVfObs69mzNYd1sbP5zozlnftojN RTrTIpfdv6YTbtV8xT3mo4L8i278AwQll5XxdXHDqYkn74Ct5yswbNYv6wPveMWTKsu2hd wrS8xMSXCPs+9i0tVuQ8Jy+feSJi6UrNiyND5uaTsXkEkkLQiK6oGkDT6y+9t/KGdKOVuH gTOtPAOWpi7YttHRmIXDZg7fTjjKtMuYZL8GpAgrWq0IUDMiNaomZXsTtqNt9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709691; a=rsa-sha256; cv=none; b=DLU8oe6X4//UhGBDiwDKmeYbH5lKr/Kr8HwTsuaX63ZlyfdzDdCVMl8tjZ/4hc/Wn6jeR2 ep7LAhHZ0GhNQ1LvZrYrarBYH6nDAbjsbRhR9Cfac3QTfub2YDyIbeHvWypzeh77ETdC0n 87e5fd+XLehWuqb1Cp6CnJGxwFQR9rkNK7YR516XhJ3ybPgQL6S8hLc/x9eFKcYARAq4cc 1ilEL+H8F+/xI3502JmNKPqvztw48uxZn+HPct0kDMHy1ZuX5+VTZqDXWqiSbdEokt0VBW 29M4RuFsjGQZyKRgGad7JA3xmS2nO7Kp1A+4e7enZ5x7PMaHnAKC1JjaV1zePQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6N5n++qXE9msYXhTOOTirJKor/EiLQSz1fBNEXRX+Hs=; b=L8vvAuWwdBjR5rss3Ubn9FfmsmrAndQxQ3DnDhmBMHhZLNVWzryxfPVfF/sbROasMf3c1o lCjEU1gdpeuAbYLM5S2Ez63rDA4Prkus81tU8XgjfiNyLmrfTeeNJLsM9X0bw58BhcoWwK vQTBu7o43Emx9XOSqIbyfYWL3K2Y7XsNYDMKsQl1rJ79xDg1fqZfAG96heyI8oPpNfEjnv mgaxZvKWVcVCF6cKnIOVbPyMX6UAndpm7vX5xGjNtsa/TIUivLdNySbwdx9A98K13nUSbY DOxy6JIMTCQHOanSFanMaYACcqs74/As+wTo1RkrPU+ydJKcvIr9AxrJR1SFlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4C3B04zrM for ; Sat, 21 Feb 2026 21:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22943 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5ae9aac0c7d8 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5ae9aac0c7d819556a1cf2ec7bf61b78740d4917 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:51 +0000 Message-Id: <699a24fb.22943.558e4bd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae9aac0c7d819556a1cf2ec7bf61b78740d4917 commit 5ae9aac0c7d819556a1cf2ec7bf61b78740d4917 Author: Konstantin Belousov AuthorDate: 2026-02-06 23:47:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 openzfs sys/types32.h: use abi_compat.h for time32_t (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 5b7131923460..cb2ef27cf933 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h @@ -30,9 +30,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 1bcae20187ad..850435b29f2a 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -63,7 +63,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 Sat Feb 21 21:34: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 4fJL4D65lyz6SJlk for ; Sat, 21 Feb 2026 21:34: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 4fJL4D4XK5z3PQW for ; Sat, 21 Feb 2026 21:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yB8esf9hxhyB0X64XyIFSGbIPq4BnoUKGUEtrvB/BKo=; b=dnrE9ZIGKkUxABGB+q5USSNpDkEyTh2uEKwE13otpI0Fhspmtjz/YDOB9WrEj+GXyIE3Tc 7ci7NH3guk64tuT7uqAGA1T6ppYbKslY6HglHyK/BYZl1u68ZP0kG37KCS/vvz0nGWCCig TTuzdMvENYztMXFWRmgspi35xTzh+kMCdme/+MjbUEOu/twqXT+JuVHw4xNp4+uF+7M92C NxS8YUQQcMyyoXdY/SdLyTJtOBcy2G9c7n/XptLGu3JoAPzHepHqGQm6n9k64A1MBuWWy8 PBYh/Qe2EQiafhpXWnI96GxMrLu9HtyqtYOCGfygHeIDaHesKoFPbbtz1KUM7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709692; a=rsa-sha256; cv=none; b=kUggcQV7MLR3UeDPseooUh9r1XuChvcXCNAqSM4X9DqM2zEQS6jy/nI3ZWBxrAYCI/+7Ot Nz2oI84paasjUCzBPCblY6y5ymAj44jY751mQxBYSH1fingXZhbt9zQm77/w/CSggDPixi i0sli++BsHqB2IrLi75YBsDFtk+QN+r6hy3BFAEcIiVnFp61lCPkDR+yShZm/mXzCQ9Gn+ 0AXkRGF1bQakWOLYh+Dl6NdCEvcC2nQq+X83lot4wFpJGbVw0LIlZ0pfKAkCPDzB9hfIjX wFNtYfidd2VcoRLOatBPbr4NR6mKg57EZVJtbZ7PCpDnKp5J9H+1VMcacHPQeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yB8esf9hxhyB0X64XyIFSGbIPq4BnoUKGUEtrvB/BKo=; b=cE98Nwc8IT3RpcmwSwBW2upe4sayZ+PiPadCFAxDKmjSjBtJPTNAGgJO31CKCQPCy1TrxS B1LAZHLTnuDeb8H0HpVfp3MGWxpFfv981vd9y1s/W5QxjyXnaO8Aoh756Z6GcEiQBrl94Q V8GzJeLDLNEf94hJhnhiLG6/F8YuU7qSmqvjQ69o31j2g09JbwGL1rCFHy0dWoMFOXfTTZ pBTfW+pgmlqkNUMWRvZ9MP7gKlhzcq4id/vvzOQU+QQYzTqweviFeat0neA+iUGGvbNHRV biJQMgHxLXLShb86ug2aRsHP0EsLXtLcu37lPz6YngcAQXP9Q5LSTDocxbLBKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4D3zSHz1Lb for ; Sat, 21 Feb 2026 21:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23c0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7a2fdcc5acb9 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7a2fdcc5acb9b3fb81226b7f1e877029cf28606c Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:52 +0000 Message-Id: <699a24fc.23c0d.da3e0aa@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a2fdcc5acb9b3fb81226b7f1e877029cf28606c commit 7a2fdcc5acb9b3fb81226b7f1e877029cf28606c Author: Konstantin Belousov AuthorDate: 2026-02-05 20:19:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 sys/user.h: remove XXXSKE markers (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 1704bc089d85..59210913f889 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -196,8 +196,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 */ @@ -216,7 +216,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 Sat Feb 21 21:34: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 4fJL4G0H4cz6SJq9 for ; Sat, 21 Feb 2026 21:34: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 4fJL4F4wKwz3PSs for ; Sat, 21 Feb 2026 21:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqs1+AhAjd8Y3ky9kcUwvH7o2rZhCdNsu8eb057+swQ=; b=p7CVQ+Yjm8EDr6V2OOc3zwfhrDzqyDEZNq59Zl6nuaUAZ5tng3XQpDoX+coejm1oH/sty/ 4OCL0rNgBMTy01YSIQRmxkGkCao7Zcq/DjDJkoqGwCBjYbXC39KqsAZavS6d3tOZREHaHR 7q/eOXFLE/UiiW3sX8pqaEWe6Lequ6YTPLoFRN8bv3Cq3Y/CCv2eKd2DxSPwd9c5eP8Vuy i8LgevHHcLOON82tST1AWGssv9/zxDrp5WvpucG0avFDl8HsWiSUnrx8zf46IGaJmlLqij O9U3wueXlVW3BtsQIGBUygcDneEkmMLeum2AENGPtJ/LQI0IVZmg6ANG4NIhMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709693; a=rsa-sha256; cv=none; b=Ap557n/ntJreSF1+f5vhC2i5xmuuAF4LGMvDvXRr9AuT0gsASbfDK5scMyYfqm7NYnUSjy Tw7CTN2aCGVgaaHaXxNGO/9ukSq/08HJLFaqCDtGM+//9xhg5fkzMtZJqtS0K3QgLc/0IB EPfFNLGqC2jfdW8gzwTz2sAC+uMWPOqKo6hmzV+VP9qRAZAuxJqpNFUiAtLk58xisi4ynb eR3mWd+rbvkDPOVbAO/IwVFip7Mhk3FEedB8tatfJeoxt0dPmWOYKGVqqiE7A6WHRBIZZ+ 9gbU97Kee8lSE4EC8BsfO+2ZZcWUHjVeeqSKVIs4gz2lZ4rOR8/ti5qBNTQ9EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqs1+AhAjd8Y3ky9kcUwvH7o2rZhCdNsu8eb057+swQ=; b=jhCXda9iF6/znwtnjyI1MCx23Yb4FWkuNPX5mc0rgWAmp2GfUMSVYeXuq3BdlEcKzvkhn9 NP0wYzZ/NEP5H2pY8mBdrPDUBeLeEU+bl4N2xy/0XMZcT42OlbfkPoCH/Ujxo2K06aD5cA lyLzX9bR+aijh+H2N5l7KfUbVKl2jTC0W7dfSYaYlPke4y4TaoTGa3X7QaJu/Rxw1CWwB3 5/eZgaOFkpmt+BzPQFsX2+O/jdU98zVHMoJ1lZ1SrOaXWXCUZ9ckiqwt4wADyda9jvdrM8 Igb5d1940kBuutznOCLk09mly48zrvVYkZ0ReGbBwGyHHoMmqKUvXznRCFdEZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4F4VgLzrP for ; Sat, 21 Feb 2026 21:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2318b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2d63a28811e6 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2d63a28811e6ac98d1aee6398c97a14f93669f83 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:53 +0000 Message-Id: <699a24fd.2318b.345befca@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d63a28811e6ac98d1aee6398c97a14f93669f83 commit 2d63a28811e6ac98d1aee6398c97a14f93669f83 Author: Konstantin Belousov AuthorDate: 2026-02-09 20:13:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 sys/event.h: reduce namespace pollution from sys/abi_compat.h (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 474afcff60a7..8ad343d6d813 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 c313cafa9e99..de24c9226e4a 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -104,7 +104,7 @@ struct freebsd11_kevent { #endif #if defined(_WANT_KEVENT32) || defined(_KERNEL) -#include +#include struct kevent32 { __uint32_t ident; /* identifier for this event */ From nobody Sat Feb 21 21:34:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4H0CtPz6SJls for ; Sat, 21 Feb 2026 21:34: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 4fJL4G5qWSz3PlL for ; Sat, 21 Feb 2026 21:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HH4xF5O+ZNEmJll2FwxawXKqRFKoUSFEqESpd8UxEBY=; b=WrgioMjxsDgl/YttO8DaRVPKRuEhf33MMaj+z0+Yu9YINltjRdVb8LuTjyWbG6vog0KiEb k1aziMkbs8TjJRBxOVX9cprwTyxMXv7FKW5ZABYAQ+90PDD+HC/qTpddjmDZiaVpHGN3ho K3ZRx+9SYyXykr+t2ia/nz3iuavZYK0UXUCZOayV8WXX0tg5RUQRFXBwfyGz6k2CH+KmNr 0Uc+wqjkUp2pRkcs1JrQFooDoghvGKvc4df2acNfU4FpzjMr50+Ya52AitdEIQM9r5f/xG j0qHmEx8wympz6wdWbnBB5fJwmqm4zsS9DwiAw6Op9G3sJHxwXVxj0Q/9ComIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709694; a=rsa-sha256; cv=none; b=LnOWH7QGbj27hrrIEKDlthO/YKVAREkzmXi7tZ9GqqDHNm+6VQ0iWK60d8I/PZxl0H4Xg1 9Cj5TpWscBclRHy8O0IqUlSgd/HvWiSr2AJo/6VdwXS+th+PPAeDv/ICp6Tamdc5N4SbEz /YBhhwWp8Ymkc/JPFDtoAKizeMy+tnWrsDt51m+SEwhu5GDLVs8rDV1GGQfbL2DQ6dtKsI 22B2YGBr5fZklTgMEBmWsX/fNyn6bCWa73qAp66Fvca0AS3cVk7LgHLO1sbD1lpTBBuN0A aYBzVKdXo/tUdcJk7OdGBoHNoh+6elib75J/u2sBRla4UmVmM3aIMPluuXWRbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HH4xF5O+ZNEmJll2FwxawXKqRFKoUSFEqESpd8UxEBY=; b=blX9HjYyWpQkypaJ+Cm/CuzduB0El39X8EDbgjprUqv+sO4BGSKHv3rpcSGpPJtiE95Qtb lsvR1Wz3M0Ch0styMv9oFLcAVsWateo1q9Fm/I4rwpHDx9L3UDt6v7C4Aq67HMuzHRZL3S oQE4Hhuthkw6nMffzWMcqTvoLeCarpF6VHY9RgHuGXUcRJfwN+L9mBPklxlnLU07QK88TE cdcBht/P1EyOi5UAPeGGayQB5GQo5P3+pKdiQ4WYhJWpyV5YXPkuqPw/yBszGuLI5A2y4R PBtwAmNfRmc8iDgHhDemU1J7tRpiA5IxuJBMylqwOATkdsXtVJhHcTchUrt2GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4G5JK7zrQ for ; Sat, 21 Feb 2026 21:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2205b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1661d41cde10 - stable/15 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1661d41cde1056b70a1c7685ca47916b8c00f1b5 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:54 +0000 Message-Id: <699a24fe.2205b.1e6f4b48@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1661d41cde1056b70a1c7685ca47916b8c00f1b5 commit 1661d41cde1056b70a1c7685ca47916b8c00f1b5 Author: Konstantin Belousov AuthorDate: 2026-02-10 04:17:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 dev/mfi: include sys/abi_compat.h unconditionally (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 8ad343d6d813..6ab6e5a7f19e 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 Sat Feb 21 21:34: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 4fJL4J2Yykz6SJvl for ; Sat, 21 Feb 2026 21:34: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 4fJL4H6qDvz3Pch for ; Sat, 21 Feb 2026 21:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709696; 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=3DVVvcf6WDNB4ocfsOH2sEIGRgWd1MDQVz2zPTzsQ1k=; b=nJ5iVS1jlFc/KMhHca41sxqtXPOAtW4vqvgYaoTTrW4mwROfmjuF4SeF8MX5VV3W6Lpu+G Jhh/v7dw3CKlOsHaTtnH4YuNzM/TsTSMkWw/uWHQKuxgBCDWcboMid4kve/tDHniJsEULx Tdol9ba3GlvTOYhEIp1OlrDtrld5+zQPEaUQBjFzf9IMP9jMCQVZOG9vkx9tg0wWNnNvS5 NeREd8t2L12Zfe6aXwXkBkUmWKIrL5tatob2lPXX0RWrAYWGm21Faz9Ldbf8DIB48n62Ni qB+WB6dK4mwSPMKzJC+18YTVvR3QWcE7vTwfHfjkYisX9Dg9LHJxYJl2P2HF7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709696; a=rsa-sha256; cv=none; b=PnnaNu6inwXwOzj/FpPwSc5siKvddqoRQZvP1gSm2zMxQ5fM+6VzPYhT8J6Yjq0nJXdj6H fAb57F4098VK/yDcRCQk2O8nxlJlVgWogxMYR+iQgV9CsaV5b0QiD2dUSB41KHzsdcITJS Z/aDx7zPm9U4GcyLgvqQBXVwGdW1HdqizzK64UzhN9HTqBLwYBjzD2M/GvA7N+q+JFLGHg WaW1T29c8ykC1z14PfjxfyTTqzXxTaCvyb+crHECFk7PBPYr199rq+foFPEq8BTKvEoeVr Gh3bLe5845kazyhVIiI8tdHb6lY77tUPeZmMexd5u3x9gLxUR6VxSRTc9uAW0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709696; 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=3DVVvcf6WDNB4ocfsOH2sEIGRgWd1MDQVz2zPTzsQ1k=; b=uiiDOINt6/JdWvjxJEZtGzkLWPsTrH/+OtRzUvjrN19T6AtyTyYRedl/ps3rZsSLrS79yI LyvXRI7mL+MBRK5goqC8lDm6LugUTfTjSwZ9gnYBs+ceLhGIRAuAZObo+tu6ibFv3p/31e +YLa8Bc4HM9EMfXtF5Zb2uLd6nj1SGDpYhGt3I+WlGrMD7UECl4laxBs1Eh6z0/TlRvFId USo/Pkkl/lDt//LPqq6oP9qKSQKLnXNt/m/kZQTrk7EKG5+Bx5MT98bOjHZwTTjSxOYr3L z6bCQURyyvCnOiFjKWeF9Xpr3V/INq+lrghX0vQb+87uBN2UBJiBdRaFNyfnMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4H6719z15D for ; Sat, 21 Feb 2026 21:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2320e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Konstantin Belousov Subject: git: de0a53727cd7 - stable/15 - sys/abi_types.h: time32_t is 64-bit on non-x86 architectures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: de0a53727cd73a4fe89d8f7c959297eff9fa1053 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:55 +0000 Message-Id: <699a24ff.2320e.80e984b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de0a53727cd73a4fe89d8f7c959297eff9fa1053 commit de0a53727cd73a4fe89d8f7c959297eff9fa1053 Author: Olivier Certner AuthorDate: 2026-02-13 17:20:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 sys/abi_types.h: time32_t is 64-bit on non-x86 architectures (cherry picked from commit 4ccca2100887943b11187787004bc8efc2a149c6) --- sys/sys/abi_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index e449c86323f7..44d1bd733bbd 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -25,15 +25,11 @@ typedef struct { #endif } freebsd32_uint64_t; -#if __SIZEOF_LONG__ == 8 -#if defined __amd64__ +#if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif -#else -typedef __int32_t time32_t; -#endif #define __HAVE_TIME32_T #endif From nobody Sun Feb 22 00:37: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 4fJQ6j6JDfz6SZJD for ; Sun, 22 Feb 2026 00:37: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 4fJQ6j4Wfjz3rsd for ; Sun, 22 Feb 2026 00:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771720637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HNi4Lm5SC5KS8Z4Aycbt4M2Rhn7tlIYCPRQslUCMaw=; b=IOQAmOecMsv0yyHUbIM5cHk45gwRZipw9rBce4L3upbYkB/nc1ORZnW/c3jXrV9BLw+DZD s6oVHiBta9/b8RZFyXnH/yO082fIiDOVWCMElHw64c7vLeq4+Vm5hEVumhfy9ejuGPcA7h 0xYi+MToJSMIq0SgonsBbbQGDxVDQSPGsTgBC8q+rpRPIy9yC2B2KpCpJshdsGX9axm9RU v0Rt6lwFrYUGpVlejiuGdpzdp0JORmEci227+3w6OLhuCsgk9Qyc8f46TEkJqEPOFr6LsM iLYpHS1qhe7ezkOEU2OMCbNToialwZjJLhLBIUIlycqVti3iNevl0fThgJ2PSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771720637; a=rsa-sha256; cv=none; b=mwqIV+mDYHaj0YbopoYVNeJCYLR+HqfqKD2t2lQksqbgDEOB3IiCpHukbRyy2pHygt5BjM BaqsFzWumha2c3dxq2OnlmfTEc5/nC8lie4iUFbHTZHLJAFvyu82A8AZkXRIITqWFvs2Z5 OqvfPFvIizpbRs3dkEv8mqfkjLsmp5C65jrRQt0jcK1YH9jr1fqZS7BvS2wIM2pQz4Je1p 2Nhno0Bvlhc+nWNO+nTGlAU8QdcWkW3SF09GKS+bClkPh9jcF2O1qZNhmNodB1voeRhgHS wGUFkDRZx/fvPDN0+R7zhPX9sVmftzRU89WcFkFoAd4dW+6bWXETPNnjGsrEng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771720637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HNi4Lm5SC5KS8Z4Aycbt4M2Rhn7tlIYCPRQslUCMaw=; b=U9f3SSnmRTjT0U5h46NiTx1sjxb/2XX+oUqlXkT4smeh6a76KEU+JWtTI43Os4xYJeM93I Mf/csanZZXyjcqpAvuNMqNB91NUD1dzxK+l8t/6NMoFC7NlVVhc2V5Y2DyhET48Hg7mVNS NOGpTW8V4TUxYk7vPsIFtvTx2UCg4g3VJlCgrTyS3CK24GyK3xUd0zZYmUSYb8vCwNJIQ2 VK/kC5mEL3UYsOGL3QuoBd5SDZqIkgFsVF4sVxlvJsUlkVhdPq8nzX9kbbVyh7q2X2FzC/ nl/37mLp8nSRf861CJ4+RptWUVvSBF0MTBTnHmEML29NI/ABz8rq/TMN48RhFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQ6j47WCz5xM for ; Sun, 22 Feb 2026 00:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3deee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 00:37:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d982b7bd4ebf - stable/14 - pkg-stage.sh: Add emacs@nox and vim List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d982b7bd4ebfa483a8fa03411fa798add225e6f5 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 00:37:17 +0000 Message-Id: <699a4fbd.3deee.49e14df4@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d982b7bd4ebfa483a8fa03411fa798add225e6f5 commit d982b7bd4ebfa483a8fa03411fa798add225e6f5 Author: Colin Percival AuthorDate: 2026-02-22 00:33:27 +0000 Commit: Colin Percival CommitDate: 2026-02-22 00:36:45 +0000 pkg-stage.sh: Add emacs@nox and vim We have a bit of space left on the 14.4 DVDs; add packages for two editors, one of which is useful. Direct commit to stable/14: These packages were added to 15.0 but at the same time as removing kde, because shipping distribution sets *and* a pkgbase repository on 15 significantly cuts into the space available. On 14 we can keep kde and still add these packages. With hat: re MFC after: 3 days --- release/scripts/pkg-stage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 68cfb1c5dc75..8f7ae35ce9d1 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,6 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES_MAIN=" comms/usbmuxd devel/git@lite +editors/emacs@nox +editors/vim misc/freebsd-doc-all net/mpd5 net/rsync From nobody Sun Feb 22 01:11: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 4fJQt314bzz6SdDY for ; Sun, 22 Feb 2026 01:11: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 4fJQt24nXJz3xMS for ; Sun, 22 Feb 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722682; 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=ImpKR1Kytcexo61ELC3N7WDhdgZ+43UGQ35BpqMXzWU=; b=CPuOcFjEUmI3w3fajRcfzetbwKdI76LZNB4Ln78d+teUylbZeIlAlkb8ycyRl3U3CwCpMl HOM7Zxdd5lA827fPBfAiQEonulHKipPO4cGWgPU6OZgGcvANMiWi+8X5p7Ov5Hj6kaAgva KgpJr1uuCaQ5S1Kubw/jdLL9AqOinygP3FMPam1MTAvQAs6rWRbTO+y9x0loqXSe48wQCl NxXYf0GwI60eM9zcwughWgtkin68x8gAtSVGfb5BwWP6dl9tMUJgZnC9NldU2oAIpQXVgW D4Sg5gYBcznUsWgtXsmCLCeDR1VQJemFgFb2eVYEFU4FW0s7sqUX+tFu+kowgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722682; a=rsa-sha256; cv=none; b=x/5mvIF3YtXeh+ETAkcfmxQl6ArPZXYLO2OyfC/h7E2xPt5rf0qVwwbkUTH8XI1sMBChQq nmwP0s2eZKP/0Ze4FRDnrzJLfyN41ZSBzaQO+hMj4raI3Jkhq5oisGvvcsI5Nr83mJ2KZS Mib6Xq/PepYZq5YJFowqgLlIOH/+E2cCkZNLMA8PB3jAlIUfz1Towbou5guhj7GUBKzSSP kjUBl53SG3mt+UcrAI4YVed4IRDO9AGeu+LA8iEFwVJBzj+1YdPYTxXjEd/rDG6mP5hDrW V+EGCTvrRA6KE572WMZLBMr9kud4BVn7/f9y+OChjsk8qT8ttgVNpj56TvHldg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722682; 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=ImpKR1Kytcexo61ELC3N7WDhdgZ+43UGQ35BpqMXzWU=; b=Kin71LCP5K2PGnwd7OmCpuQl/db76JwyhaE2nRAkd2DWxHbyDqHpI4nPx5w0DrHOE/4nyf hqcImkRk612yyA27SZNmV2rKbQFvtHVVgXXk+DLdbavXdeVDu7R7BnW5C9HxW/51IpUHSb Yr0X3FZHNudhCkZo6SVlBhmtZzSiEofPrn6nP07OTfLb1sTBKZbkbXnMHHuC73DuTRhwem 9QrGp7WGfJgFwHzrpe2en5oEpL2tB1No2Wg6STFtuG6wSebmQZtxgYZabWbu94n9Y11WQy Ynima9j4W9as3GJUp0mRdDlKEBmwn7aoens2WfVL1yNyhu39fzFs/41Eme6UyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt24MMhz7K2 for ; Sun, 22 Feb 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41137 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Lexi Winter Subject: git: 6c0c5c03413b - stable/15 - Makefile.inc1: Make NO_INSTALLKERNEL less of a hack List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 6c0c5c03413bf69756fa19ac7f2bcd4270bdb01b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:22 +0000 Message-Id: <699a57ba.41137.197a8557@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=6c0c5c03413bf69756fa19ac7f2bcd4270bdb01b commit 6c0c5c03413bf69756fa19ac7f2bcd4270bdb01b Author: Jessica Clarke AuthorDate: 2025-12-31 17:36:10 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:57:19 +0000 Makefile.inc1: Make NO_INSTALLKERNEL less of a hack Rather than adding a dummy entry which requires everyone to know to skip it, introduce a new INSTALLEXTRAKERNELS which contains the set of kernels to install as kernel.KERNCONF. Reviewed by: ivy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54291 (cherry picked from commit 2c0e9a76c1cee8766245a0b5bdad73e995b790c6) --- Makefile.inc1 | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dd47b53bf681..ea7e417992e0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1773,10 +1773,6 @@ KERNCONF?= ${GENERIC_KERNCONF} BUILDKERNELS= INSTALLKERNEL= -.if defined(NO_INSTALLKERNEL) -# All of the BUILDKERNELS loops start at index 1. -BUILDKERNELS+= dummy -.endif .for _kernel in ${KERNCONF} .if !defined(_MKSHOWCONFIG) && exists(${KERNCONFDIR}/${_kernel}) BUILDKERNELS+= ${_kernel} @@ -1818,12 +1814,12 @@ _BUILDKERNEL_START!= date '+%s' # Builds all kernels defined by BUILDKERNELS. # buildkernel: .MAKE .PHONY -.if empty(BUILDKERNELS:Ndummy) +.if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif @echo -.for _kernel in ${BUILDKERNELS:Ndummy} +.for _kernel in ${BUILDKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -1885,6 +1881,16 @@ NO_INSTALLEXTRAKERNELS?= yes NO_INSTALLEXTRAKERNELS?= no .endif +.if ${NO_INSTALLEXTRAKERNELS} != "yes" +.if defined(NO_INSTALLKERNEL) +INSTALLEXTRAKERNELS= ${BUILDKERNELS} +.else +# First kernel is installed separately by INSTALLKERNEL, typically to +# /boot/kernel, rather than to a config-suffixed directory. +INSTALLEXTRAKERNELS= ${BUILDKERNELS:[2..-1]} +.endif +.endif + # # installkernel, etc. # @@ -1911,8 +1917,8 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" @@ -1949,8 +1955,8 @@ distributekernel distributekernel.debug: .PHONY ${METALOG_SORT_CMD} >> ${DESTDIR}/${DISTDIR}/kernel.meta .endif .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} rm -f ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta ${_+_}cd ${KRNLOBJDIR}/${_kernel}; \ ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \ @@ -1981,8 +1987,8 @@ packagekernel: .PHONY @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ ${TAR_CMD} cvf - --exclude '*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ @@ -2350,8 +2356,8 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} . endfor .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -. for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} . if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) . if ${MK_DEBUG_FILES} != "no" _debug=-dbg From nobody Sun Feb 22 01:11: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 4fJQt40X22z6SdQC for ; Sun, 22 Feb 2026 01:11: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 4fJQt35Xhkz3xDt for ; Sun, 22 Feb 2026 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P3+59tehR8WhIPclmFdAbZPfOlzf2dFmBGjGJdL0tI=; b=SUBEBqcLeoRldbn9v0+b3TQk81cKWXhUiqZTJFxjIZ/bWPbdRHSeYNy4qpLsaUsd7fF5bS X88jPIhv2t6BuaGRjRdD51be/q/jGGlsdAc2dBqUwTFdgUI5UJRUZBiXoMz+UyDpXVHHz8 kp5hJzUKZdrS0AWPAJn/QuzEKkgIXREZtZdge0Rwk0tpTXDOP+Ya+/Xa6MHpV95DqSjMr6 3Wpmuu/AARF34fZV7NlPmSd6FHyeiXjw/bcMW+Nm4DU8VVSPB6eey2UaJ98PS5in5vJ2q0 DgpUkCelTpGHkggATibcGVDGbtrm/okUaxPHfSUlpnQAriqwdVcCTxLGNZyp4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722683; a=rsa-sha256; cv=none; b=TRDlywN1MYMdCAQnwCAHqDJR3zCUqdp33Ub+iUeq7n9fB+O1zGJEhS/D8UitWBh6Pa2Yn6 OVTr/Lp7dPpc9oW1lLoc2FNS6gb4qPIr6PwvpMRv47Fe+IQCzI0bNH5CGbttIliOLRuzns FFPXCYyRuzOitqnq8ycNlYcTM37gNgbtLwf3ejY3Gd+bFLcddqzWdu7/qiDM8UZl5MNHtd L/OYCSFTAPU6BwiijvEkQEjJgPppkfKTOO0+sZUJKUBJplQSjRkMQr9quyWsNwO8gNqZoQ vEpM5rw0/3Tbi7lyB4+Cc6U4zkS4z79FjsnvOqFLYKQ1nfx1SqXeMRHyFgemyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P3+59tehR8WhIPclmFdAbZPfOlzf2dFmBGjGJdL0tI=; b=v9HuEiYCyKpuApgJCs0U+TY0S3+bhAXBx2ywdsTchu70ehNYwP8yvrxZLSBTDRCBpRPIWE xQoyKTx75SeR5DWvZYxs+hIil0HqAJHHWR4hFQZu1jmvjG1TEQqZpU8vETyhJpSt+59kEF t/o02EGXByQwXpWRiOpLE4PyOZLUXk3WkaM5YSKpV9Bx6WVdp9QCWnsUDI8rLSli3cHa1+ XdTpb4a9WXMe81U2eq2h9HEb0kAlc3gVXWP++C1x/5gn4s//prRcWRAw2gLokWUhT2wSR2 yEQ1KvnYUzc62GZjDUZ0fahoQ8PjDBcuFkRPEwVBLyGL7sHbcAvyfrCh0BUGNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt358mZz7Gc for ; Sun, 22 Feb 2026 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 413e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 03c9ad37b497 - stable/15 - Makefile.inc1: Fix INSTALLEXTRAKERNELS for one-kernel case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 03c9ad37b497bd59dc3fb9ec86310b95e5d1abbe Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:23 +0000 Message-Id: <699a57bb.413e1.6cd5de24@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=03c9ad37b497bd59dc3fb9ec86310b95e5d1abbe commit 03c9ad37b497bd59dc3fb9ec86310b95e5d1abbe Author: Lexi Winter AuthorDate: 2026-01-06 01:48:04 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:57:33 +0000 Makefile.inc1: Fix INSTALLEXTRAKERNELS for one-kernel case If BUILDKERNELS contains a single kernel, and NO_INSTALLEXTRAKERNELS=no, then ${BUILDKERNELS:[2..-1]} returns the first kernel in the list and that kernel ends up in both INSTALLKERNEL and INSTALLEXTRAKERNELS. This breaks the package build because it means we generate that package twice, once with an incorrect install path of /boot/kernel.NAME instead of /boot/kernel. Only set INSTALLEXTRAKERNELS if we're building at least two kernels. Fixes: 2c0e9a76c1ce ("Makefile.inc1: Make NO_INSTALLKERNEL less of a hack") Reviewed by: jrtc27 Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54539 (cherry picked from commit 0b298e314a8b47c1f2bf8a9ff86c050accbd744d) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ea7e417992e0..631c12543b3a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1884,10 +1884,12 @@ NO_INSTALLEXTRAKERNELS?= no .if ${NO_INSTALLEXTRAKERNELS} != "yes" .if defined(NO_INSTALLKERNEL) INSTALLEXTRAKERNELS= ${BUILDKERNELS} -.else +.elif ${BUILDKERNELS:[#]} > 1 # First kernel is installed separately by INSTALLKERNEL, typically to # /boot/kernel, rather than to a config-suffixed directory. INSTALLEXTRAKERNELS= ${BUILDKERNELS:[2..-1]} +.else +INSTALLEXTRAKERNELS= .endif .endif From nobody Sun Feb 22 01:11: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 4fJQt21C7wz6SdMN for ; Sun, 22 Feb 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJQt14qPFz3xMR for ; Sun, 22 Feb 2026 01:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srIIudAalgUJB3sFVGe/yNviQJxkPR5+Q/tHcty8vAM=; b=k5cZ1USRWT3dKqLWt1bPePev9tW1OxPtAjhHPNja3WB7+kwr3dmh0H7EdkuqNsLFXqbdeX K3Zw0LNb5iAO/ycY8hcZqvsWUNWvHV4pYmP6rKQtqLQ2XTZOcG7wV1wNFh3ndRcSx7ye6Y LzE957V9FH5aD3GoH5BSHozV0jaBm7ajCTz1ak7CqzPgQ/Id4s92oTCr3CZ8UmIpSf7gXi gzlIB0Wy1NE0OknxRJuRUi16zqBSI5wswOLU7IDNQZC5hDPTWq3vUdW7lp0acDAHoru5NC LU/ocB+i0FGspg1CeUT5fzhFLFjxpv2ke0E7yufyg5GyzcG79pOP/TxHsqVCzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722681; a=rsa-sha256; cv=none; b=pyK5BF81+SxzpXXc5hewenMxDS10j7Ctj3BzYt9zLMkE0rdkjUqkEb3HCI4fHPbVDThzcC uu5fBJlC0iKtm/EjcqfZp3A2/ndi4B1fPWdpMDjfKYo7muWjZ0zN4Qxf7p+XP6TGqlqec3 JMgZCsej+lsd72b6dnfKa/bzVlkDgovSCN0ut/9yWPc52hc9vTi8ZTxOmk3rgegE57UbS3 92N4toLrpFsdYEurF7a3GiTHg0CFMYTsskJP7NOcYz5OTzL0GRXJErkA4+N9nLsCbefT1D qe5NLzopiHU01NzupY148U9W9JSoGBMF49v/jm7/3NZWi+laLUHqLWWW3TL7oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srIIudAalgUJB3sFVGe/yNviQJxkPR5+Q/tHcty8vAM=; b=QZRw88EefrIX6cJfNoPSac/UR4W/mBKM07uKUhAmrXu1E/PERCnXgVOAswifTT/RwBGCIH qX8joQH5bfHQDIax9G81WB4kwg/MBK7F6oFQ2VQL3Xc7pSbi5rQW/px2OX2+vg631ymduu /ZtsXP07j9DOWIjOIB9ldRPI4CDGM/N3ZF5sxRJcu08k76UrqDfmXaf2rlBAi5yz7LHeGD pMBF2PcGY0li2u7gUwPf/l78gKxnGN8v4nhR6ft/D8psq0Hz5W6LhYSKxScQhViBOl69P6 rGWa69RkqQnorwmOHlYqhm9aG4t8KJxWgZhVL7tmGJVMpLdYhsJnLJKR9jX/dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt13x84z7GZ for ; Sun, 22 Feb 2026 01:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 863e71060327 - stable/15 - powerpc: Update CPUTYPE options in make.conf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 863e710603274cf05d7074d409206a25e168bdf6 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:21 +0000 Message-Id: <699a57b9.40d24.4b63fa68@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=863e710603274cf05d7074d409206a25e168bdf6 commit 863e710603274cf05d7074d409206a25e168bdf6 Author: Lexi Winter AuthorDate: 2026-01-06 04:22:20 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:50:36 +0000 powerpc: Update CPUTYPE options in make.conf Document the supported PPC/POWER CPUTYPEs in the example make.conf. Update bsd.cpu.mk to handle CPUs newer than POWER9, and remove 32-bit CPUTYPEs since we no longer support those at all. Reviewed by: imp, jhibbits Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54257 (cherry picked from commit 665ac052aa04c4dc240d67c3c2166ac63e7f86eb) --- share/examples/etc/make.conf | 7 ++++++- share/mk/bsd.cpu.mk | 18 ++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 93c611557cb6..61bc132bad57 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -47,7 +47,12 @@ # cortex-a7, cortex-a8, cortex-a9, cortex-a12, # cortex-a15, cortex-a17 # ARM64 architecture: cortex-a53, cortex-a57, cortex-a72, -# exynos-m1 +# exynos-m1 +# POWER / PowerPC architecture: +# (POWER CPUs) power5, power5x, power6, power6x, power7, power8, +# power9, power10, power11 +# (PowerPC CPUs) g5, 970, e5500 +# # # (?= allows to buildworld for a different CPUTYPE.) # diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 1225d690e908..ea1307e0f05e 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -277,29 +277,23 @@ MACHINE_CPU = sse3 . endif MACHINE_CPU += amd64 sse2 sse mmx ########## powerpc -. elif ${MACHINE_ARCH} == "powerpc" -. if ${CPUTYPE} == "e500" -MACHINE_CPU = booke softfp -. elif ${CPUTYPE} == "g4" -MACHINE_CPU = aim altivec -. else -MACHINE_CPU= aim -. endif . elif ${MACHINE_ARCH} == "powerpc64" . if ${CPUTYPE} == "e5500" MACHINE_CPU = booke -. elif ${CPUTYPE} == power7 +. elif ${CPUTYPE} == "power7" MACHINE_CPU = altivec vsx -. elif ${CPUTYPE} == power8 +. elif ${CPUTYPE} == "power8" MACHINE_CPU = altivec vsx vsx2 -. elif ${CPUTYPE} == power9 +. elif ${CPUTYPE} == "power9" || ${CPUTYPE} == "power10" || \ + ${CPUTYPE} == "power11" MACHINE_CPU = altivec vsx vsx2 vsx3 . else MACHINE_CPU = aim altivec . endif . elif ${MACHINE_ARCH} == "powerpc64le" MACHINE_CPU = aim altivec vsx vsx2 -. if ${CPUTYPE} == power9 +. if ${CPUTYPE} == "power9" || ${CPUTYPE} == "power10" || \ + ${CPUTYPE} == "power11" MACHINE_CPU += vsx3 . endif ########## riscv From nobody Sun Feb 22 01:11: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 4fJQt46bDyz6SdmV for ; Sun, 22 Feb 2026 01:11: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 4fJQt43Tq1z3xV9 for ; Sun, 22 Feb 2026 01:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZA0bEyfqjL3UcrwWYTar09uZ/iPVaZraGJwruCjGI4=; b=vEZTP4fvnz7iidNfkYjt1fsZVZCTJs+QUDgwvINMiiAPlNrDGkmUJvJrzR0J2i3ATJ2hpH NvbuuK2K+vPZR0xMUvLV/Okj9y5h0cZQJJauwp3Njg5keCKe1XIWNNvPmjF8MoSk3P8xw9 tWwd4n1vEz4MsbnKXAVZBvI/0udF4mJAOuxTIQWrNz466hCBm6FXkTc3g9omYgZBxzYLlp ESoQwNSc3hk+HvMTAOTi+EIL6HpVIO9PVMEcHxhFmcLSf6nEsaAuQ7fDMWyVzZCv8XnV/R 7JJzrw0NeAGNIuvcNuYR271olZDDKYWmc56HC28gK2IfQLq/0uOvEbRuKUjdFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722684; a=rsa-sha256; cv=none; b=g83PMSvzSeZLvs20xJ1qk1akaT1iOKnojl/NoIAYsKLucDxF342JwIJxtvNoqc3ILffuew 5lqjd2vIziIxRSms9LdAYxClXbwiAr8ZZUFl/YuxqOVz7+ONbotudoDoRzK4K8O4JgLaCg 05URY0lKW2t06TmEgejD/3jE+VCc+53OmStNiQThJlNiQHQ9eposuYPwvFl1p7dTAQLkYv +2ncb9+ciUmrzBJUCFlwNiTA0CLM2txWnjAWo7WtIK5ZLheGA4+DWmRlFWz3xUAhtmMPYy jXVCQQoKI9Yy0HD1mIBrek4Rcgx2Ya1+pvPzBIeY+8DVKWR4x+D0oW+HEDVaUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZA0bEyfqjL3UcrwWYTar09uZ/iPVaZraGJwruCjGI4=; b=dxRzOVtW86R3UpENjoXH81o0tWX+draO/6EIfM+wBbQW6xjZHUviPoqkBZIpXt+dtqaUdY OAI9u1+H9EkOqZvLyVwoc88vbD7QQIC4VEmmnepfYMX2bU0wB6AbpqArPpUlSrBSozu0qd Wrx0aFOpQnU7t4DuzEKnK2yhkOdNquUfPnN6a89Skhpof38PdhqiIWE/wh7v47b4eSuevQ tnTXwd2HSZM7eb0VxrUxYK4U/b/GkL5PRMbB/PB4XkH73hX7iRPkxWIWthIAsSEqEDk1n+ 6zYgvSjOgjFHix7nvrA4eRtyv6tvIyloWQM/+96cze35kwpp3rnPuvDD3jARog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt42mqnz7Gd for ; Sun, 22 Feb 2026 01:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 409cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 4e7fed532812 - stable/15 - freebsd-base.7: Document the optional 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: 4e7fed5328121e61347ba580387923493a1a87f0 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:19 +0000 Message-Id: <699a57b7.409cf.7f007b87@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4e7fed5328121e61347ba580387923493a1a87f0 commit 4e7fed5328121e61347ba580387923493a1a87f0 Author: Lexi Winter AuthorDate: 2025-12-05 02:43:51 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:48:45 +0000 freebsd-base.7: Document the optional set MFC after: 3 days Reviewed by: ziaee, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54065 (cherry picked from commit ce8dc5b12451e9922ab827dfe3d10abcd6e85165) --- share/man/man7/freebsd-base.7 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index be1cd8e35d42..383808579487 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd September 25, 2025 +.Dd December 4, 2025 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -130,6 +130,20 @@ and .Xr nm 1 . This set also includes native development files (headers and static libraries) for all packages. +.It optional +Optional software which is not part of either the +.Sy devel +or +.Sy minimal +sets. +.It optional-jail +The equivalent of +.Sy optional +for systems running in a +.Xr jail 8 +environment. +This set excludes system functionality which typically does not work +or is not useful in a jail. .It lib32 32-compatibility libraries, for running 32-bit applications on a 64-bit host system. @@ -137,6 +151,13 @@ This set includes both runtime libraries and development files. .It base The complete base system, excluding tests, the system source code, and debugging symbols. +Installing the +.Sy base +set is equivalent to installing +.Sy minimal , +.Sy devel +and +.Sy optional . .It base-jail The equivalent of .Sy base @@ -145,6 +166,13 @@ for systems running in a environment. This set excludes system functionality which typically does not work or is not useful in a jail. +Installing the +.Sy base-jail +set is equivalent to installing +.Sy minimal-jail , +.Sy devel +and +.Sy optional-jail . .It src The system source tree for the userland and kernel, installed in .Pa /usr/src . From nobody Sun Feb 22 01:11: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 4fJQt10bGdz6SdMK for ; Sun, 22 Feb 2026 01:11: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 4fJQt04jqsz3xMQ for ; Sun, 22 Feb 2026 01:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8dxhfjzK9q9Ii1RgVe/7hdWIqQCDBH5LdCeWmnAcuM=; b=OqQcT2bXJq+o3vzzM/OW2sk84Xa/8nsDaJSuzXP4mKuKzWPQ2+E8U11OsUT8/dprnwOzcq O1zFKgaoAYGc5b1nH12QmhyK8APsGRaG4bKnzCJgAa9s1eEgbrGO3sAiZAJPLO6GerP8ko q7ysVQaVZRyTWwWxINGZ/Vzg7f2pQVWFSQDotEIGoedugmNnElvPOo/JMYO5s1TyruospL WEsop710gPTgjmIGYuK/rUwaWbDFlJITnTaQncZoE1ElZF+qr6zkOTJ594qT3dg32yvazo m023oAWs3L34Mx7ACBStAviZYJrAMxbD6iYsOwVxtyU2shwlSNcX7UkWxfzPgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722680; a=rsa-sha256; cv=none; b=B9eQziVHUST0SjD2/wf/RufcKydAZIC9n1+WqFSjg3/BiHHcTgSY5uXLhpnZ6A1qAT4vqX yeATUgmjRYvnqjcNt4IVPzddWjqzZ39hpOl9lGtaI+a7tHZdlXZXkPNBgZuCcmryJGNS/4 6NAbWO86OLC95z0nUqfMd0zhoe3j4SrvslueoVzI+czMa2I/2f7uFUIxbE1OYDGhGYxajc 5Qn9ar3jQLHej1qK3NxGCAazQs5j77VtlM3097vJ8RSDbdURC1ST/oj9680NPvibaZrjtx 3zlku4w9KB+S6ovAlvwGNYyqKDZSqndIDerpACYBiHa7j3SbyXMMmOJpd+4OeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8dxhfjzK9q9Ii1RgVe/7hdWIqQCDBH5LdCeWmnAcuM=; b=c9z8dE5q+oUN7vENQzZRGau3rATEizOcVrRcVTPyjKsQ7xErKJvOZO1CA5YvC0kyMBSdd7 j5cTXFwspclR9S69Lc1OUAg3fryHaRQGbXNTRzGTQ1638WzonS11KSCOqlVUelKbBOSDb7 44RDBsEDuKbTbhBNl3ATnXztC+TIOYLUGsWmtaj57WNggF94nnTB15MOUJ7aAEAl1rJSq8 2mol54IYmbTWpwIa6ZKhc28pJ3JhnGQSxz8ZzLq1lbHMVP8ZNquroExtJwLyzBhasDF13f AxV3EgDzFm4aiwt9iWmq0X0gaKppPcvS91B4s4xWxpKIynjXug9p1Jx/Gg/q6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt03bqrz6Qb for ; Sun, 22 Feb 2026 01:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 34565dd970f6 - stable/15 - bridge: Allow BRDGSIFVLANSET without IFBRF_VLANFILTER List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 34565dd970f648020074af9abf6d960fa3a2e189 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:20 +0000 Message-Id: <699a57b8.3fd6c.2c409c64@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=34565dd970f648020074af9abf6d960fa3a2e189 commit 34565dd970f648020074af9abf6d960fa3a2e189 Author: Lexi Winter AuthorDate: 2026-01-03 01:13:22 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:49:46 +0000 bridge: Allow BRDGSIFVLANSET without IFBRF_VLANFILTER Currently, we disallow BRDGSIFVLANSET when IFBRF_VLANFILTER is disabled. There's no particular reason to do this, and it causes some undesirable behaviour such as not being able to remove the tagged config on a member after disabling vlanfilter on the bridge. Remove the restriction so BRDGSIFVLANSET is always accepted. PR: 292019 MFC after: 1 week Reviewed by: zlei, p.mousavizadeh_protonmail.com Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54435 (cherry picked from commit 2e92aeede85c8986bd6f4dde65d2ac2449eccf51) --- sys/net/if_bridge.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index d7911a348d87..ca15deddaf7d 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1992,9 +1992,6 @@ bridge_ioctl_sifvlanset(struct bridge_softc *sc, void *arg) struct ifbif_vlan_req *req = arg; struct bridge_iflist *bif; - if ((sc->sc_flags & IFBRF_VLANFILTER) == 0) - return (EXTERROR(EINVAL, "VLAN filtering not enabled")); - bif = bridge_lookup_member(sc, req->bv_ifname); if (bif == NULL) return (EXTERROR(ENOENT, "Interface is not a bridge member")); From nobody Sun Feb 22 01:11: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 4fJQt520Y6z6SdGv for ; Sun, 22 Feb 2026 01:11: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 4fJQt46DgLz3xPt for ; Sun, 22 Feb 2026 01:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHNXY3DO87RcjCaFDbuVdXJToXcTNSyYG4mjpklU7NA=; b=UMcYf5x0Kwq2Xi+iu8VZRRKO0/qUNrcW6QzWRthN8MfKp2bXY8J2Xz47LM1Z+Kqj/QyZyX ts/y1NFk83lCOoxYUu5o1UtKBk+Zr0uC9ltdBHHhO+tGTGFthyDcTfcwaRKjw9DAg8/NS0 BV8fe9inkWMBYsqSn2TwzPLqR9ODcKtkp4jl9XpgWtLNoAZmKRkL0Pg7qQsbbz79cDCZyO 5FHNvnWE4Bci7wuxVS3TzE6hyKI6VT2KBaVqdE+Lr2XoNtid3GAMSp8f2rck2n+rh28fZh ugVLrklevsrN/r5MP7f9nlpfcw4WDdLkM4j5D8paGIn2YISl5vlS+ifwNhxA4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722684; a=rsa-sha256; cv=none; b=BGgjxVnjUde7vQ3DWJMMd8P4zqxgg4pXcvNROpx2/ZyJZyFSpCUHmX8JKcGXJKv1faFo5O yl/QPiiVQbjWy3cLzc7ZtZA2+bGxApRzNjAHqw8nJx2HqR+ZPhYIuvInSzIHL++ATy+UfV 08PEq/Nvg1goWZu1Ai+nlC4uxKP3aRjlHBuHN8R/Tp/0cplOXnCo7xidcmquKMBXl6PD3J FIieia5YKIBZpXd+vUDADV7Sg8DFzRzzcuJVR44J3GLd/XXPOgoa8yUkG7VKZoWK/2vPh2 zZT+CjuSfI+xb7+lAeq+dJiVDvHWbn+6UTxc8p8TeATIfns+suChfM3lfi7kUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHNXY3DO87RcjCaFDbuVdXJToXcTNSyYG4mjpklU7NA=; b=W0MflVDIhg5sv+jV4zENGqYp4WvN8U20aEwbWRiF3MrzC9qaj5ddSTasgOKwXCSwQqW8+p q8fURkvby0s4RN2eWM0LUU8Kt8imHnnGU27dbmsHPu3IYYb4QWRXFcRJ8SwV8nlMNAOMHS twUk+tOwLpY+V3kbvMCl1+7t7gNvCcimfia2+VE4WK44jzKJOXxqaA1Cn6G5s2jqHGM+uo YLGQWDl2U9ZlhEBCbyBdfHvur7WB2BGBtkhNlpPe6boJYfQ9H48/QNyhN0A8HOrL5s6yz8 R6CtWYkHgACoF0cdd0gmCPRyw+9VIHwCagzg4I5vamKCVNeJrOG8HvhoGQtxKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt45qvLz6Xq for ; Sun, 22 Feb 2026 01:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 235cb4b4970f - stable/15 - Makefile.inc1: Allow safe installkernel with pkgbase List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 235cb4b4970f8591d6c911f5ca64a3e62e19b161 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:24 +0000 Message-Id: <699a57bc.40d28.45cd22ee@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=235cb4b4970f8591d6c911f5ca64a3e62e19b161 commit 235cb4b4970f8591d6c911f5ca64a3e62e19b161 Author: Lexi Winter AuthorDate: 2026-01-05 17:39:47 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:57:41 +0000 Makefile.inc1: Allow safe installkernel with pkgbase Commit 74a6bb524e5b added a check to install{world,kernel} to avoid people accidentally running this on pkgbase systems and leaving their system broken. This had two issues: (1) The warning was not sufficiently scary, leading people to think this was safe to do as long as they set DESTDIR=/. (2) The installkernel check was too strict, and prevented installing kernels that don't conflict with packaged kernels. Fix (1) by rewording the warning to be scarier, and while here, add two new variables (ALLOW_PKGBASE_INSTALL{WORLD,KERNEL}) which could be set in /etc/make.conf for people who want to break their systems by default. Fix (2) by improving the installkernel check to see if the kernel(s) we're actually installing are packaged. This means a new kernel can be installed to /boot/kernel as long as there's no packaged kernel installed there. This check understands INSTKERNNAME, so if there is a packaged kernel in /boot/kernel, the new kernel can still be installed using INSTKERNNAME=testkernel (or whatever). MFC after: 2 weeks Reported by: christos, jhb, others Reviewed by: emaste, christos (previous version) Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54346 (cherry picked from commit 89c017d068704c2bc3da9cb22f43da17a9ce8c24) --- Makefile.inc1 | 83 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 22 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 631c12543b3a..e3e0409c8e4e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1374,28 +1374,6 @@ __installcheck_DESTDIR: .PHONY .endif .endif -# -# Don't allow installworld or installkernel on a pkgbase system. This avoids -# accidentally updating a pkgbase system with install{world,kernel}, causing -# the installed system to become out of date with the package database. -# -# Skip the check if DESTDIR is defined on the assumption the user knows what -# they're doing. This means the check can be disabled for the running system -# using DESTDIR=/. -# -.if !make(distributeworld) && !defined(DESTDIR) -_installcheck_world: __installcheck_PKG -_installcheck_kernel: __installcheck_PKG -__installcheck_PKG: .PHONY -.if exists(${LOCALBASE}/sbin/pkg-static) - @if ${LOCALBASE}/sbin/pkg-static info -e ${PKG_NAME_PREFIX}-runtime; then \ - echo >&2 "ERROR: This target should not be used on a system installed from packages." ; \ - echo >&2 " To override this check, set DESTDIR=/."; \ - false; \ - fi -.endif -.endif - .if !defined(DB_FROM_SRC) # # Check for missing UIDs/GIDs. @@ -1893,6 +1871,67 @@ INSTALLEXTRAKERNELS= .endif .endif +# +# Don't allow installworld or installkernel on a pkgbase system. This avoids +# accidentally updating a pkgbase system with install{world,kernel}, causing +# the installed system to become out of date with the package database. +# +# Skip the check if DESTDIR is defined on the assumption the user knows what +# they're doing. This means the check can be disabled for the running system +# using DESTDIR=/. +# +# People who want to disable this check permanently may set two variables in +# /etc/make.conf, ALLOW_PKGBASE_INSTALLKERNEL and ALLOW_PKGBASE_INSTALLWORLD, +# to disable these checks. That doesn't stop this from breaking your system, +# it just stops make from warning about it. +# +.if !make(distributeworld) && !defined(DESTDIR) + +. if !defined(ALLOW_PKGBASE_INSTALLKERNEL) && exists(${LOCALBASE}/sbin/pkg-static) +# For installkernel, we check if this specific kernel was installed by pkg. +# This means people can continue to use installkernel for non-packaged +# kernels, which is useful for development. + +_installcheck_kernel: __installcheck_kernel_pkgbase +__installcheck_kernel_pkgbase: .PHONY +. for _kernel in ${NO_INSTALLKERNEL:D:U${INSTKERNNAME}} \ + ${INSTALLEXTRAKERNELS:S/^/${INSTKERNNAME}./} + @if ${LOCALBASE}/sbin/pkg-static which /boot/${_kernel}/kernel \ + >/dev/null 2>&1; then \ + echo >&2 "ERROR: The kernel at /boot/${_kernel} was installed from packages." ; \ + echo >&2 " A packaged kernel should never be updated using installkernel;" ; \ + echo >&2 " this will cause the package database to become out of sync with" ; \ + echo >&2 " the live system state. Either uninstall the packaged kernel," ; \ + echo >&2 " or install this kernel to a different path using INSTKERNNAME." ; \ + echo >&2 "" ; \ + echo >&2 " If you understand the risks and wish to proceed anyway, you may" ; \ + echo >&2 " set ALLOW_PKGBASE_INSTALLKERNEL=yes to override this safety check." ; \ + echo >&2 " After doing so, you should not use the pkg(8) utility until you" ; \ + echo >&2 " have resolved the inconsistency between the installed system and" ; \ + echo >&2 " the package database." ; \ + false; \ + fi +. endfor +. endif # !defined(ALLOW_PKGBASE_INSTALLKERNEL) && exists(pkg-static) + +. if !defined(ALLOW_PKGBASE_INSTALLWORLD) && exists(${LOCALBASE}/sbin/pkg-static) +_installcheck_world: __installcheck_world_pkgbase +__installcheck_world_pkgbase: .PHONY + @if ${LOCALBASE}/sbin/pkg-static info -e ${PKG_NAME_PREFIX}-runtime; then \ + echo >&2 "ERROR: This target should never be used on a system installed from packages;" ; \ + echo >&2 " doing so will cause the package database to become out of sync with" ; \ + echo >&2 " the live system state." ; \ + echo >&2 "" ; \ + echo >&2 " If you understand the risks and wish to proceed anyway, you may" ; \ + echo >&2 " set ALLOW_PKGBASE_INSTALLWORLD=yes to override this safety check." ; \ + echo >&2 " After doing so, you should not use the pkg(8) utility until you" ; \ + echo >&2 " have resolved the inconsistency between the installed system and" ; \ + echo >&2 " the package database." ; \ + false; \ + fi +. endif # !defined(ALLOW_PKGBASE_INSTALLWORLD) && exists(pkg-static) +.endif # !make(distributeworld) && !defined(DESTDIR) + # # installkernel, etc. # From nobody Sun Feb 22 03:33: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 4fJV2C2YFwz6SqgW for ; Sun, 22 Feb 2026 03:33: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 4fJV2C1bdyz3Kf3 for ; Sun, 22 Feb 2026 03:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCTks38/RSDxyXkt1SiuLBqpaUlPh3o6MD5o8BYKstc=; b=dFGzT/C64V7NCIFB4Y54BHsHhwHQd7Jy1DyQrdEzf333JhhINlZerxTK8IqhYJKzDTaW56 YwNW9DlTG7sUZelCLTsrvvdsLtgtcUlgX3DV4eyXzLIuHDa/5H3OQ+fnEp9irFgTnp5Jev /biRS3dMuoFn6v1W5K8nZAl2kECjytu3f3kfdHQHItJKWoLzUiTcvZ5spm38VPZ8uSAOL2 NU4LKcbOrMg+mFO/ZPC+isoQVVubpxtjEAVKw+dC1g1576cHfRhSftSyAAT379TSN1PeCU UO9zSaXl82X2wuS5wk/ZrlZnD/eE+UhSNJKqzwFZ4c9ibKIjwQ6bV0RcizhBbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731219; a=rsa-sha256; cv=none; b=jMqaHd6kXvlZd3cqRnJFK91UFV2CMXaCNRZKEX+0/eOgqA1Ki09iZ6DmVXOkIilJiILpG+ t1SCjilltNZPXeegmjUstp0+CRzu8W9ymdeUdTTR3AQXwFfDOV+SvQztobOIadUcgtGXg+ ReCKuxJzAns7XpRRlPQkB+d8hXj94iAATc8h0C2Brs05t0YWt6EypT4r1Xp/jfRgR8O4l/ 1ObTfIlDkL+91VVaNX+QuTTwdt+qbxvDaIAlpOVTtFAUrxn2vU3fb4FD7LTP3V6kYQ7fU7 Gu85FtwBP0hIoULjz7vjG1TrxCvjrkLjOH7yBGbj3ItxY4kNTNdq7rTk1A9L7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCTks38/RSDxyXkt1SiuLBqpaUlPh3o6MD5o8BYKstc=; b=F/Sk8wkOGD0NGsmpqQi8OKAeNkBUzbtX7Pv+Fi9GtO25ex6bYYI3nWQ1wAkwUaxFVa8gD3 qiTEnPZ3X9ex481ciddanF/zYYB4TUoVi1Gwq2/OsCrO2jJPc6GbqpPjdfFD8jzikuuxlf FZZp3SGWLZ0g24tkmdRFSaRr2aVaYUHCCGsiWFPjTqMzJzedenaPY1ucFAjMiV+lrz8quu i/6Zupu9AbLDfYlBh2g1yVfn+D3QI8K2iNLyS6v7DzJmKLmIO646ZicnMUln4tFXS6uwpa T/koc79puAcK4uUtxuDWXmxlIbAUxAqHglAXjtrukRLQGhctOSgzKwOudf5ouQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV2C0w9ZzBjh for ; Sun, 22 Feb 2026 03:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d07 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:33:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3b7db696d85a - stable/15 - libnetbsd: import the `__nothing` 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3b7db696d85a476b7735fecc7bf9a1d53d07ca02 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:33:39 +0000 Message-Id: <699a7913.21d07.3fda1377@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3b7db696d85a476b7735fecc7bf9a1d53d07ca02 commit 3b7db696d85a476b7735fecc7bf9a1d53d07ca02 Author: Enji Cooper AuthorDate: 2026-02-15 18:41:43 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:33:28 +0000 libnetbsd: import the `__nothing` macro This macro is widely used in new NetBSD tests. Please see the comment next to the imported macro for more details on its use. Obtained from: NetBSD (c26cc77b3a0b2) MFC after: 1 week (cherry picked from commit faaeb6e62ae2f7371ac3ed37aae102f8e066a4b9) --- lib/libnetbsd/sys/cdefs.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h index 8da812693961..fcc3cc6f15be 100644 --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-3-Clause * @@ -81,4 +80,18 @@ #define __BITS(__m, __n) \ ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1)) +/* + * To be used when an empty body is required like: + * + * #ifdef DEBUG + * # define dprintf(a) printf(a) + * #else + * # define dprintf(a) __nothing + * #endif + * + * We use ((void)0) instead of do {} while (0) so that it + * works on , expressions. + */ +#define __nothing (/*LINTED*/(void)0) + #endif /* _LIBNETBSD_SYS_CDEFS_H_ */ From nobody Sun Feb 22 03:34: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 4fJV2v6WMMz6Sr6R for ; Sun, 22 Feb 2026 03:34: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 4fJV2v5v3vz3Kjp for ; Sun, 22 Feb 2026 03:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VQwP6en3DbVEcFwVsQsxnJ227KB7XCBpbgQFEJwiu8=; b=nnUUMlh4bCTg/ipKKt0S5B4kQEt5iqq0tLNqW344tLtDQ3wvTztk76VYCTE1SpxKeghSUL XZyxNLv9XrgGM9NxnbyhAbJ4AOmx3PNwJFk/pq186RVmeqipkAM9clPF1WzxE5kgYa9t5+ fCXcJeJ4/Xae4t0MaI1/Hf2VH8J2tbKYPCe7ztQXyZOmVXPNgubQgq/MnsFkP3zbKPe5qb adXwbFhrGBghkiSNJ2CrUFD8bnj9fJXAXq7JzNGx65yCTfnmwN4XI6hPFTb0KApbsAfS+0 bcQPjbU1FrSxkWwmceeGWqI8aiECfsNE16Q0kGxyyTbnNj7ZXoqm4SlYX3FvLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731255; a=rsa-sha256; cv=none; b=p+LkK2iFN01AcA/V8kyzK4EuzQyX5LGW9PcFsctoJ7cm7WnFAE+nRJ6yTriFjVYNa+19b7 /3sGjZxXjw7Fzq6mbcEq3uxIB1BlwTUlPM+mMhUyKKhRyo9Upfy7e4IgEojGIcsWUpAC77 9riKIE6YqgCIDk1Pamk6z4D3R0AiFq0RnL9CtQWI+0vQ+JwMnuWRET4oZh0coKypy9Qc+a 1kG+yGGIuWKf4HK1HORh9OuvXLt5AfLqoCgUJSB7IZekjUEZbouVeFdnYhfWv0Xd4yqnxv lgI2JVDQ7IvG15XRxlC6DV+KtsjbQjM+0fch/mZQqq2IKacimSkRqRC9wzjg6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VQwP6en3DbVEcFwVsQsxnJ227KB7XCBpbgQFEJwiu8=; b=C0glHQNGq56CnpFaN8GUXJ6QJphPZOXrB0zFbdluUosxQFSLbqE0LD5pchWPPAiKILwHQ/ WsZQr6Bk7gscYactdPqdKiprlkMLIa52UYG8piuPDxPqmn/V+M4/3giReyRIprpR1CzdWb 3L48wfGP5Dt6Hh82ATo/9jtyW+xoqmdGRdJGV372bUaxU+olrxlDYW4PHhZ9WVXRvYB+Oz 2cyAGYFwJaRBCiuFJUZWy0GFOPcO+q0RQpO1/VIctqfhkC3XZrWNDKJFcIzDhmo4ThaK/J 7v12EsoRqzm8+p5bEvcGUpOYo//qc4zDqgMeHUUYcMY7m3M8qPskFLDxJoTpzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV2v5S5QzC1K for ; Sun, 22 Feb 2026 03:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:34:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 175920c9d0f7 - stable/14 - libnetbsd: import the `__nothing` 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 175920c9d0f71bf9b7beb4854836e340c0c563da Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:34:15 +0000 Message-Id: <699a7937.1fc41.506f3af6@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=175920c9d0f71bf9b7beb4854836e340c0c563da commit 175920c9d0f71bf9b7beb4854836e340c0c563da Author: Enji Cooper AuthorDate: 2026-02-15 18:41:43 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:34:11 +0000 libnetbsd: import the `__nothing` macro This macro is widely used in new NetBSD tests. Please see the comment next to the imported macro for more details on its use. Obtained from: NetBSD (c26cc77b3a0b2) MFC after: 1 week (cherry picked from commit faaeb6e62ae2f7371ac3ed37aae102f8e066a4b9) --- lib/libnetbsd/sys/cdefs.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h index 8da812693961..fcc3cc6f15be 100644 --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-3-Clause * @@ -81,4 +80,18 @@ #define __BITS(__m, __n) \ ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1)) +/* + * To be used when an empty body is required like: + * + * #ifdef DEBUG + * # define dprintf(a) printf(a) + * #else + * # define dprintf(a) __nothing + * #endif + * + * We use ((void)0) instead of do {} while (0) so that it + * works on , expressions. + */ +#define __nothing (/*LINTED*/(void)0) + #endif /* _LIBNETBSD_SYS_CDEFS_H_ */ From nobody Sun Feb 22 03:35: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 4fJV3n64lzz6Sqgq for ; Sun, 22 Feb 2026 03:35: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 4fJV3n5WSFz3L6Z for ; Sun, 22 Feb 2026 03:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zeil/UeRiSFJ6kPTeVNlz5H09U8oqIX5uBjJIgTV9E=; b=SK4XwDHEXbUPRrPxwZ+ZbiKPxMFwfV7HxQyKrp1IKCTI3kW583octkUwqE1vKV1xpjHZFG q19lEZLmn49LBfwrMKm2GpjxsAkrRfoWghXlTXAPtD+9o8daTBG/Au5a1iFq8tX5aHlO+T RigwWUnz2jUW4lulP2+4WD4xybeUfGBXOtwz1AehkbVdOS/iHRMLDCL9zlGJ0xfTMbDYOt kQcMfRanb+49vUqW/5NEJHnca6HnjVxrkav5u1bLEFUC4kTNsVCtAP4htXeJ9TmvN5uT/h asGzVeVTdsmnJBGHvy3FVg0svftfWm2IUF9kV061P9Er8Zv4A0iBHnMutnSVsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731301; a=rsa-sha256; cv=none; b=RLhAGzaBJosPT+d3ZhbZvHekfvStEE7miWMz4VBpQSbVHDxaHpskpZ8sFrYOsp23uR+d2D oRwOM1ppgxgbNZ/fXw6ixAYf/68pLPj5qYBYZjIlXfg8E3U6AugP3Geu9jfE5r59zdIoiH MNZPKRv86Z489YD3Uvg4WTED0C+j1Nx7bNmNJhlPusrvvERHrfEHBTebzUc2uz0LGwXnNT TjtKii7ayklXGm03+Xv3AFasJPouZlZe0sa/YGVUdqO2nO4OukXskxVq/tAa5RBMIE2DlH Bq7KN1mZtiy/SJfSIUZxAmxkNfk29YC9P4Gjk7P/VLeZL2VGotndNrIwnekCDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zeil/UeRiSFJ6kPTeVNlz5H09U8oqIX5uBjJIgTV9E=; b=eqROdRpqin7nZtUx197fqE9z7DQICc66omuLRRowuiMa2BphxjStLfPuKzSVpt1q8RNLyi vlU2RP6syminC44GdxYTcBCcabbEZ10kCcHkck3G2d7VZx0Mn+vf05mESbWelqH5DjCrVo qGVo2cohS9DDDDCQ0HrGQ8xR+9Q+21JYAwvDSZjjJosBo8gYpuvQuBerw4kXmbzNGTDj/9 hhOil20iuE26cm7wDzcVGdCBcJpouXT7aJWdO2+GFU4tpGCOSPZtH0Z1lPQ0/8PlQJGmt6 vEh+CDk8SVcZlqbMldE4zAsEtCxBPY4O3/94JM/6H0hGil4UNbK0zWAIwcA3Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV3n54S6zBjj for ; Sun, 22 Feb 2026 03:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21585 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:35:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: d8cd8a45c5d8 - stable/14 - t_access.c: remove unnecessary local modification List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: d8cd8a45c5d839266b6e8f9efabc009d8e87d103 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:35:01 +0000 Message-Id: <699a7965.21585.389da10c@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d8cd8a45c5d839266b6e8f9efabc009d8e87d103 commit d8cd8a45c5d839266b6e8f9efabc009d8e87d103 Author: Enji Cooper AuthorDate: 2026-02-15 19:39:10 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:34:36 +0000 t_access.c: remove unnecessary local modification FreeBSD 11.x is no longer supported; there's no reason why the `FreeBSD_version__` check is still required (now). MFC after: 1 week (cherry picked from commit 35237ff9871478a92b34ced28a75487afd3562ff) --- contrib/netbsd-tests/lib/libc/sys/t_access.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_access.c b/contrib/netbsd-tests/lib/libc/sys/t_access.c index f973aba3fb4a..9c6dabc20d4c 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_access.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_access.c @@ -31,10 +31,6 @@ #include __RCSID("$NetBSD: t_access.c,v 1.2 2017/01/10 22:36:29 christos Exp $"); -#ifdef __FreeBSD__ -#include /* For __FreeBSD_version */ -#endif - #include #include @@ -120,10 +116,6 @@ ATF_TC_HEAD(access_inval, tc) ATF_TC_BODY(access_inval, tc) { -#if defined(__FreeBSD__) && __FreeBSD_version < 1100033 - atf_tc_expect_fail("arguments to access aren't validated; see " - "bug # 181155 for more details"); -#endif errno = 0; ATF_REQUIRE(access("/usr", -1) != 0); From nobody Sun Feb 22 03:35: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 4fJV401ZsDz6SqdV for ; Sun, 22 Feb 2026 03:35: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 4fJV400v5yz3LM1 for ; Sun, 22 Feb 2026 03:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5YjHM+rnscSuy0Bp2dKdPQ84c56UzN5r5nTz65ob3M=; b=boR2qzVvLNbFuJellXH1h8UBF8S/fHT/tbbAL9YMu2e22f1+GOg28kyaon+9NtN9cYRY3v s7m+NzBh69fVNO9KoZz4FhrKKWm0ljhZ6YZElna2yJu2Uyv7IovoBPFqs9wrJMTmP7Cftw YgLIp8EIuxdN8Xx28uAur8B5zcxnemyK6YQ0cPIb/icBHrfIqmJ8MerrAoQv4szql3PD3r CV+ONHeO4D2JiD/Uo4B3zTMbGalmkEyP0HcrRK0N4r7kOfdCa/NBI3iJwMxiJPKPjvcImX nHyCcf7a8MNywLNnZKZxeDYmrFJLMWGTgwkKnNuXyeWsabB0Mcw4h7QTSKVtNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731312; a=rsa-sha256; cv=none; b=JMo6Fm5iA1eKX1kdPtD5k+bRFrzXEMqdGHW5XNlmSFuMpZmJcpu8gT0rEUJF/GGSoxntnn hS55uoHpfIGMV/Z0VlRIalbu6+//rkJJtN82BGLM3/Mq61nD8pKEzvp+F7zNHHrCCdUO0q h7AWJWc4sXW07/YkR/8dsTTAppI3wsm3rmCR5m+EP5KxeaQwv00P5v7heYgbqtXJCFjmCj jD1Hw4j/LTuuvNgoYTc8fD1xXA9JriOw04u/XLMdIx/l2PnbLl/4BRcOSli/rwl8+5nLaH xPKA98LHndkRs/V8BbAO624iOAlroLOAj8fpC67s+wDpldm4CoMw1oTXDCwRbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5YjHM+rnscSuy0Bp2dKdPQ84c56UzN5r5nTz65ob3M=; b=LpfWZHAAswZE7tBfw0UMIaWfzvW9rJTE8ncf+46c7JgOEjaJ9ol4Yl7wOtXBP6pzu0d1+O +GNgTqu9OtmAZYrHqe816oZtrTzxiE9ir64ylmm4KtGlaQyxUVKCqwoN0bFiKHFpdCtAas 7zF+1YXuUUtmx0EuVdEOIGsGg5PTfjU4cbEC913dBQ1OqfP28oXd/QXiSmOUqIjgPH3ETX rnTMxcDWnzeq3soRDpD+ykGPZyhp1ySjPoAK3RcJaqC46DQQP0g92t2YrE05C4qY3vf5i2 A9iP6FJ7NYjLCRFZcMRyQ2QgkpgZXVbD0+RG1h0kUc3RTjQccu6S4/p5Kd6B2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV400S17zBt0 for ; Sun, 22 Feb 2026 03:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcc9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:35:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: d7363dc7f22b - stable/15 - t_access.c: remove unnecessary local modification List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: d7363dc7f22b0878829c160c97166de2f6a24369 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:35:12 +0000 Message-Id: <699a7970.1fcc9.6fce5aaf@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d7363dc7f22b0878829c160c97166de2f6a24369 commit d7363dc7f22b0878829c160c97166de2f6a24369 Author: Enji Cooper AuthorDate: 2026-02-15 19:39:10 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:35:07 +0000 t_access.c: remove unnecessary local modification FreeBSD 11.x is no longer supported; there's no reason why the `FreeBSD_version__` check is still required (now). MFC after: 1 week (cherry picked from commit 35237ff9871478a92b34ced28a75487afd3562ff) --- contrib/netbsd-tests/lib/libc/sys/t_access.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_access.c b/contrib/netbsd-tests/lib/libc/sys/t_access.c index f973aba3fb4a..9c6dabc20d4c 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_access.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_access.c @@ -31,10 +31,6 @@ #include __RCSID("$NetBSD: t_access.c,v 1.2 2017/01/10 22:36:29 christos Exp $"); -#ifdef __FreeBSD__ -#include /* For __FreeBSD_version */ -#endif - #include #include @@ -120,10 +116,6 @@ ATF_TC_HEAD(access_inval, tc) ATF_TC_BODY(access_inval, tc) { -#if defined(__FreeBSD__) && __FreeBSD_version < 1100033 - atf_tc_expect_fail("arguments to access aren't validated; see " - "bug # 181155 for more details"); -#endif errno = 0; ATF_REQUIRE(access("/usr", -1) != 0); From nobody Sun Feb 22 03:36: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 4fJV5B3hWjz6Sqmr for ; Sun, 22 Feb 2026 03:36: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 4fJV5B1KxTz3LZf for ; Sun, 22 Feb 2026 03:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X4138QG5RAuefXFNDTgAGSYgrtnN5xeEzZg9UNMWBFc=; b=LDiHkt1RPVp5G6j/Pd3v7tMnz/UDVyKUu2esLkyhUrF8Y+jAIGJKffkjs6ntKMhIadJW2y p4Cq0T0Cx74GX+yKF9AZjSd9tHrNr8WWFjTWQoW7Hf4C0hsFRDl7JzSok/nM38ZcIvaoCO 5FFcDnXXx0LZ9TCUM2yfdyoiqHXIRlF6FYlJqDNl40r2/aM2C5K+4JqSYxmSVNs9QOqfDh ygOSgF+i06QqyHkr1yqofsUQWgbzA5gjqDknVS19Y8Ml+cCfRSEtB/zuQfmRRQ/RgRuhZ9 X8gLnqouQLXRyGHgUAohOrLDAeuiKoFN9DsVji1+sG1m4Dv+nkJVRnlVdEgp2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731374; a=rsa-sha256; cv=none; b=h8WEsFMcEkTd/MKXW0rwHrUpcBjN4sL8o7Q+RTFrwwgb00qZ2NL6jMuqkQeh8WjCdm6BbV N+NtlYoY1KF3VSi/YW9Dfv4zdA5IkAFpXz1iLkEeH7RgflmVZ6u94aIN/3Onem7i6LpurA Zi9Uloz26bpRKWQFa44qYa1OotE8P2ijaR55k0zHJepyCSq8CS6TBnV1s7B8xPRCBfOBm8 PlZhUAPtZIsg9WDOyWIIuW9csWX+lyF3dKd7Ue70uVFiCByWdeM8mfK3DuNbXWVFM9azL4 czLm1CYmvS9tkRwrlurHdOQFj+exFMwqtd+ZhCpgA9XNAPBLN75JW9kk3+7BoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X4138QG5RAuefXFNDTgAGSYgrtnN5xeEzZg9UNMWBFc=; b=NqzoD72iE7jyJeAzfIJkOJec9MVcwHY7sMDAUtd6dR/Ar9bW89Yc6ZuoSx/L3IrqkLJvVu V2rlNaC3h56a81nZ3l3ZkbfcceKYvMzNL+mDXxG4b45HWX/kKy2awxs1km9ApHrZCYaXua jmGLNHH5eKsUb74AFIL/MGt2TJ8Szlf1U6xq7eL/JDKV6CuS9cE4UddAW4IZALrLNiCIay sjw5g5y+UKFDckY6rRaUTzHKNJC9KjbS2+jV05Ft2CdBUSjEm426rYUIJMFIjgjeiR9iC/ NFRtVh2xdqq8mh3PjDKVB7r18Mx1wspU8/RlJTQAEx4z+TGznP6AEKpkqUSkqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV5B0ZXNzBt2 for ; Sun, 22 Feb 2026 03:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:36:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 02d896af3bca - stable/14 - t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 02d896af3bca3e2bf0432ca751ed3d4ec1ee543b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:36:14 +0000 Message-Id: <699a79ae.21cab.41c01697@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=02d896af3bca3e2bf0432ca751ed3d4ec1ee543b commit 02d896af3bca3e2bf0432ca751ed3d4ec1ee543b Author: Enji Cooper AuthorDate: 2026-02-15 18:26:52 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:35:31 +0000 t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods This particular change replaces all local modifications to the test script like so: - Use `ATF_TESTS_SH_SED_test` with a sed(1) statement in the Makefile, instead of the equivalent local modifications. - Remove the need for expecting the output of newfs_msdos to be empty. There isn't much to gain from deviating from the upstream NetBSD test--it's just another local modification that would need to be carried forward. If it's worth testing this FreeBSD-specific behavior, it should be in a FreeBSD-specific test. This makes moving new modifications to the script easier moving forward. MFC after: 1 week (cherry picked from commit 411a566d565277e47c9644d19a5efa0fe5b00179) --- contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh | 14 ++------------ sbin/newfs_msdos/tests/Makefile | 2 ++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh index 61ed927b8889..dc431166a469 100755 --- a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh +++ b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh @@ -31,21 +31,11 @@ validfat32_head() { } validfat32_body() { - if true; then - # FreeBSD - exp_err=empty - fsck=fsck_msdosfs - else - # NetBSD - exp_err=ignore - fsck=fsck_msdos - fi - - atf_check -s eq:0 -o ignore -e $exp_err \ + atf_check -s eq:0 -o ignore -e ignore \ newfs_msdos -b 512 -C 33m -F 32 msdos.img # fsck_msdos/newfs_msdos have been fixed # atf_expect_fail "PR bin/46743" - atf_check -s eq:0 -o not-match:FIXED -e empty $fsck -p msdos.img + atf_check -s eq:0 -o not-match:FIXED -e empty fsck_msdos -p msdos.img atf_expect_pass } diff --git a/sbin/newfs_msdos/tests/Makefile b/sbin/newfs_msdos/tests/Makefile index 3f112c7f4710..47c77d8289de 100644 --- a/sbin/newfs_msdos/tests/Makefile +++ b/sbin/newfs_msdos/tests/Makefile @@ -2,5 +2,7 @@ TESTSRC=${SRCTOP}/contrib/netbsd-tests/sbin/newfs_msdos NETBSD_ATF_TESTS_SH+= create +ATF_TESTS_SH_SED_create= -e 's/fsck_msdos/fsck_msdosfs/' + .include .include From nobody Sun Feb 22 03:36: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 4fJV5V0TYWz6Sr8W for ; Sun, 22 Feb 2026 03:36: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 4fJV5T55j4z3LsJ for ; Sun, 22 Feb 2026 03:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxgC2kXAEjpUGogKuNxsgqPHWgWeaukzrGGlyXFsLZk=; b=oPjpSIYPRj31NbGoO9ZwMpEG1VifpkRSh3xdG1L2OFguAs/XK9/tjEKDvxgOjNXdc8mU/Z lyK5C1oJ/WTZ+p+EG2eWQb+SOUuJiTbsyc+VfoNGy3r/7XIh0RnYSvskiP1ALxv6S8iWbl bI79Pa8IXZ0klj+C2Uit8d0yQiF+u77bOHcBsiDxo+8izEP1yEuuvgPbFpaOmtgBgo1mhi eT468Koun87naY+0x2vRwLfR0a6PuLZNJxb+q1e1oUZeRZgrR7sKvntPkUwDkOnwNdqI42 T53fBcj/+pXcnbkmpWnADy28uCasCAV78eSg0F3uf2CHstpdohtG9U53xblLqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731389; a=rsa-sha256; cv=none; b=bj/l91gzsLvPrfhU4oq6DVgalKhiyeJwKTeqg3QDOfxWpu2sMWolVr+AfdSMTEzRf5T9sf uIXyrg+zFTtmcsq+yhS2zU0LfMC9GMNsZNW44Wdb2/P+v8FcMqzMHRD5A6/sPpLsCWbY2J AxjYHIbTLIJai90rcHenIzwp0Ds0Esz5KUONpwY7XVcZN3tyTEtpFfPpBMGZrLFCVzNT5p IT3+VpqrYMBLbHA86yFUw4H002vUfd5p1hmbyV2JDt6ucZCCdsmBFYGnGh2LsaaKvtXy6H fl6LFfd0/uhd7BmnCQ4eRDmRQRsWxqb+8ofMjqhwDJElvnMbb3jnwDYHgsrRdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxgC2kXAEjpUGogKuNxsgqPHWgWeaukzrGGlyXFsLZk=; b=Y9N89U+ypm8Bsq1NT2vrsURbC+0tLz7UMFYypdx6qOY+0LyZX7BQRva4j46+gAhR6GghaI HNAgCTlmQ9TwJsUhN6IEfownJJdf8f7JDysyNlbH+R7gvx3g7+yvdQebjFEVMxjVQMOipP IWBJlbFRJp4B0O0DV0UMViQhJZ298oBmy9MsdmvlgH6+/+I7QXWkMuQLdZYYhqkjZwXt98 3COpAiDI/HoCB00liOmT0l1UGppCuctQ5ecVXGh7YTFz+ZPjLRz8XDjZcDpx3+20SuHx5W T+7JfLU6LrpEQDI7G91j33U1OmCDFXPlAUNyWmDu+amntKvedh0m3vohh9BmlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV5T4XbCzC1M for ; Sun, 22 Feb 2026 03:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21030 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:36:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 968d6ac0b83f - stable/15 - t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 968d6ac0b83f83249732401d5505882855067398 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:36:29 +0000 Message-Id: <699a79bd.21030.af30916@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=968d6ac0b83f83249732401d5505882855067398 commit 968d6ac0b83f83249732401d5505882855067398 Author: Enji Cooper AuthorDate: 2026-02-15 18:26:52 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:36:25 +0000 t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods This particular change replaces all local modifications to the test script like so: - Use `ATF_TESTS_SH_SED_test` with a sed(1) statement in the Makefile, instead of the equivalent local modifications. - Remove the need for expecting the output of newfs_msdos to be empty. There isn't much to gain from deviating from the upstream NetBSD test--it's just another local modification that would need to be carried forward. If it's worth testing this FreeBSD-specific behavior, it should be in a FreeBSD-specific test. This makes moving new modifications to the script easier moving forward. MFC after: 1 week (cherry picked from commit 411a566d565277e47c9644d19a5efa0fe5b00179) --- contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh | 14 ++------------ sbin/newfs_msdos/tests/Makefile | 2 ++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh index 61ed927b8889..dc431166a469 100755 --- a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh +++ b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh @@ -31,21 +31,11 @@ validfat32_head() { } validfat32_body() { - if true; then - # FreeBSD - exp_err=empty - fsck=fsck_msdosfs - else - # NetBSD - exp_err=ignore - fsck=fsck_msdos - fi - - atf_check -s eq:0 -o ignore -e $exp_err \ + atf_check -s eq:0 -o ignore -e ignore \ newfs_msdos -b 512 -C 33m -F 32 msdos.img # fsck_msdos/newfs_msdos have been fixed # atf_expect_fail "PR bin/46743" - atf_check -s eq:0 -o not-match:FIXED -e empty $fsck -p msdos.img + atf_check -s eq:0 -o not-match:FIXED -e empty fsck_msdos -p msdos.img atf_expect_pass } diff --git a/sbin/newfs_msdos/tests/Makefile b/sbin/newfs_msdos/tests/Makefile index 3f112c7f4710..47c77d8289de 100644 --- a/sbin/newfs_msdos/tests/Makefile +++ b/sbin/newfs_msdos/tests/Makefile @@ -2,5 +2,7 @@ TESTSRC=${SRCTOP}/contrib/netbsd-tests/sbin/newfs_msdos NETBSD_ATF_TESTS_SH+= create +ATF_TESTS_SH_SED_create= -e 's/fsck_msdos/fsck_msdosfs/' + .include .include From nobody Sun Feb 22 03:38: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 4fJV895mLyz6SrNg for ; Sun, 22 Feb 2026 03:38: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 4fJV894zg8z3MMp for ; Sun, 22 Feb 2026 03:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=130l4izaTs7M83TelE9+3CgnWJFqkYnW73C41YnpFWA=; b=K/b0OUN1qUp3usQ6Sh3LLHkL98xs3DdsF2hlTGBegd7GFGLL1Puqin/XLsPuxtIkVC5CTj XLNMmeBJW4gdeFGGbkiZ4Hfs/Yq7Q58/+oNcdQScsQRg62N8HBiVvzUI8rp0H9wzGomqR7 04N+z0TVb9Z8eUkwmuUNx9N5lxz8OZTD/zFi4znDjN/2AHJU1S/plT/WMUN41DintNMKaq Wkglhaot2OqQjzaKA6gTkEFwpLq9IQPQLd9fbJAh8hnQ+yI8RHMb0t7gCxVQXLwNm2r/n/ yiZ3xcGz2i3KJ95d74JXj0v7jjzY6pmjy8AMABc6PFv+/IBu89kO+gNet2CjNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731529; a=rsa-sha256; cv=none; b=ouod0lrpJVUAkfrcPZx/T2h+YCgn68RrMQGuYL3cDMg8jWLGJwM7VD5DAQkixMajx2Oi9i KWOSi+GnI6o7htdaHQCB5TtNNPND/bgay+96zX+bW59ZNm0O6yA5Q9F3KOc1ubX1yeZZAy 2RDgRFFBlr4LNDaXagTFq/44sb4R3U1t1fOnDeaCyKfHk4gtxkxwn37J3ikaMQchXU8c2l Xj2Uk9BF39Zmdbo6GFe/6ANf7u600Wd4H/VdgXDImRZQfw3HU3tE8IbJg9av8TghB22l74 7e9L+sgFMgwjfAXUiQBcORbGlG22fJijycLPM9n+e/J8k/SAHXiripCwSe4hWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=130l4izaTs7M83TelE9+3CgnWJFqkYnW73C41YnpFWA=; b=Hd7xtoh+d82eNStJYHKsa+uGQp9QSKAyrNz9RP45wf3vPVFqOTTPYYpJjjjoVLFdODK7qN g4xjagAASwUVIFUfmCwmV7iWgAX3z5N3jFVQn3ArRBxkLvX0dkaexvO2rw/TCzohfruM4Q gsupdZImmDqo0pYH0I2WVdijjHQsB9Wl14JL2b4rKuNAeQQQAPPJom3Ww6L1TmMx9VAcdI bigrzfaADzKfg9VzwGtu1IWt+R9muVMQc6tNXVDiOsZ0rk118h3OHCu6um39q7FSuBYJRY 9KrxbXe6luryuej47vIJRJmlcNK7C24M8/v9K5dO3BNQzjHjaWwsl93s6NKaeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV894MmHzBjr for ; Sun, 22 Feb 2026 03:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 213cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:38:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 68fd588532b8 - stable/14 - Remove bsnmpd tests when MK_BSNMP == no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 68fd588532b855598c538e3858ae392022324a66 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:38:49 +0000 Message-Id: <699a7a49.213cf.13dc3fd2@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=68fd588532b855598c538e3858ae392022324a66 commit 68fd588532b855598c538e3858ae392022324a66 Author: Enji Cooper AuthorDate: 2026-02-03 05:12:25 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:38:26 +0000 Remove bsnmpd tests when MK_BSNMP == no MFC after: 1 week (cherry picked from commit 51509500acdc5d23285a962e9c55dd9e38d2b30a) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 918a459f3171..3f8e592d9eb9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -733,10 +733,13 @@ OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt +OLD_FILES+=usr/tests/lib/libbsnmp/bsnmpd_test +OLD_FILES+=usr/tests/lib/libbsnmp/Kyuafile OLD_DIRS+=usr/include/bsnmp OLD_DIRS+=usr/share/snmp OLD_DIRS+=usr/share/snmp/defs OLD_DIRS+=usr/share/snmp/mibs +OLD_DIRS+=usr/tests/lib/libbsnmp .endif .if ${MK_CALENDAR} == no From nobody Sun Feb 22 03:38: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 4fJV8J3LP0z6SrX5 for ; Sun, 22 Feb 2026 03:38: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 4fJV8J1DFwz3MqH for ; Sun, 22 Feb 2026 03:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeJ4TiGc1iV1OE+KNwe/F1KgNqDHT7vcIj3QyNrBpgo=; b=pGMzorokyId4P4S05rBda5V8WFjNZjVcT0C60WiTex/BDW5jli0/Yiwdsl9Edjvrm0c58Z jfbj1diQimsgKrdeo0hd+SqS58cwK5utYkIQkUfkIfrkOBwzaC+nB24A3M0sGNk/9yphkz X91ckWOp8a9wde2aE9pBsBsbF75/sjmdCfAUO/ybrqmMVBCl2mgCG67F9RJbtAC84m1Ufs pWlps1GEBtJkaqi0VnGRrQT6XCWG7ETiRXKTTFM2R+1O6NV1KEyscCvFcMSOUaVd22oZlt WWWb/p2CeuCODxVVFTH2BUr9jCu9kGwONTJ79W9wp/wVw+PVb0YpEIwNpJ9BvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731536; a=rsa-sha256; cv=none; b=bwoUPjeGgzdNvAk97UKV4IcDwle/yO5YF4gVkyrViZl4Uh1LrxApkMwDk0WTZMDNRuSbbn 5YDaEkiniGWKhn9xyx6yG4J+qcxCPYv81w8SZC66WuwpHnW2q1zsxjnt//Ns9GbwtCwgJs 4O+Ihzd5XVM2FyRKtGAiH58Up4Y/aG3Zxd4CQK0uZxoDre75nIirSjchSXPnq31pBzBi5Y qpSQdSiSIlZsJRC8zICbk7ee7Vt27BZb6zdFMXexdvjuQ/Z0WkxCvUFGaeRREv4gI0MjfV jiPUgw7vTjL4Er/2CepLFyX9vaqnNXc/m0F+RlsIaJIYCa41K1SF6gL2pX0+dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeJ4TiGc1iV1OE+KNwe/F1KgNqDHT7vcIj3QyNrBpgo=; b=BEYz4dxUcMGGRoJ4D6Zk9P+v8oOpt9E6OXoJNJGX4voslNTsggpCkrTA7yQbJPJ1jfEVwi /GiIk2OZ1CXgGmnZNkXJkb+OIafP1jSljZvTpoX3FzuXASP+UgffEvTvbvuSlw78Hje2vJ hGNNACG/OETMkqVdjGGkEq+SvpcuE6PqJxv/lTw7vqzpUatDeqxOWZTi+fX7I19if7Diax hjLAaiPZd5xXNKEXoTNdB087y+Xy96JDkI1/XEiQUfZSHl05HOl/UZMiCfkmJDsyxTLr3U NwXzAorwzcdasAKWFlldvb+zIwVkXNbHHMUvTFUErfrUEkOHBQELYFR5/qnZWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV8J0pf6zBt6 for ; Sun, 22 Feb 2026 03:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f8e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:38:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3882602bacce - stable/15 - tftpd tests: clean trailing whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3882602bacce70f6406708944e09cde962a4f710 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:38:56 +0000 Message-Id: <699a7a50.1f8e4.617c0709@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3882602bacce70f6406708944e09cde962a4f710 commit 3882602bacce70f6406708944e09cde962a4f710 Author: Enji Cooper AuthorDate: 2026-02-03 05:17:54 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:37:16 +0000 tftpd tests: clean trailing whitespace No functional change intended. MFC after: 1 week (cherry picked from commit fd6217075e6a5926bdc627145b38194b6c5ba8da) --- libexec/tftpd/tests/functional.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index 791aa9190a2f..c96abe635e24 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -113,7 +113,7 @@ recv_data(uint16_t blocknum, const char *contents, size_t contents_len) RECV(hdr, msg, sizeof(msg)); \ } while (0) -/* +/* * send a command to tftpd. * @param cmd Command to send, as a char array */ @@ -140,7 +140,7 @@ send_data(uint16_t blocknum, const char *contents, size_t contents_len) send_bytes(buffer, 4 + contents_len); } -/* +/* * send a command to tftpd. * @param cmd Command to send, as a const string * (terminating NUL will be ignored) @@ -170,7 +170,7 @@ send_ack(uint16_t blocknum) */ #define OPTION_STR(name, value) name "\000" value "\000" -/* +/* * send a read request to tftpd. * @param filename filename as a string, absolute or relative * @param mode either "octet" or "netascii" @@ -184,7 +184,7 @@ send_ack(uint16_t blocknum) #define SEND_RRQ_OPT(filename, mode, options) \ SEND_STR("\0\001" filename "\0" mode "\000" options) -/* +/* * send a write request to tftpd. * @param filename filename as a string, absolute or relative * @param mode either "octet" or "netascii" @@ -355,7 +355,7 @@ setup(struct sockaddr_storage *to, uint16_t idx) } ATF_REQUIRE_EQ(pwd, getcwd(pwd, sizeof(pwd))); - + /* Must bind(2) pre-fork so it happens before the client's send(2) */ server_s = socket(protocol, SOCK_DGRAM, 0); if (server_s < 0 && errno == EAFNOSUPPORT) { @@ -678,7 +678,7 @@ TFTPD_TC_DEFINE(rrq_netascii,) { int fd; char contents[] = "foo\nbar\rbaz\n"; - /* + /* * Weirdly, RFC-764 says that CR must be followed by NUL if a line feed * is not intended */ @@ -877,7 +877,7 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,) SEND_WRQ("medium.txt", "octet"); recv_ack(0); send_data(1, (const char *)&contents[0], 512); - /* + /* * Servers "sends" an ACK packet, but network drops it. * Eventually, server should resend the last ACK */ @@ -912,7 +912,7 @@ TFTPD_TC_DEFINE(wrq_dropped_data,) SEND_WRQ("small.txt", "octet"); recv_ack(0); - /* + /* * Client "sends" a DATA packet, but network drops it. * Eventually, server should resend the last ACK */ @@ -1068,7 +1068,7 @@ TFTPD_TC_DEFINE(wrq_netascii,) { int fd; ssize_t r; - /* + /* * Weirdly, RFC-764 says that CR must be followed by NUL if a line feed * is not intended */ From nobody Sun Feb 22 03:38: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 4fJV8K4smyz6SrG4 for ; Sun, 22 Feb 2026 03:38: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 4fJV8K343tz3MnH for ; Sun, 22 Feb 2026 03:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yqwz6Y9mrpqtjDvo3HXrs+ErEmepJbvH7ZY07MCAibs=; b=uP4chxNVaNI3Aq4IXCHvHBZtt3KYmrSk4Kw/bzWeY3hRq6EE6bSovLNMLvkZ3dd7b9JTkC yS91Y05oDuprZv1mZuS4inylGA76Tk5boJArqNmIJOm6F6w8AtuDmGX9EJp3sGqFOXWvga epvKYMl69DWylozag66/OI6PWEtUW5VL3P8078/+m9Bxtku7NUnUfXIovXJmvaRrwQLwU0 oapXmBrYNEHyElaEtztchg8Q/115mi6vzJJp6+mizQUDYmxuAkQxFoFT0ciKs1cpNhzTqT iQqzT+VuFt4fYeITCOUnKrcGJM56hm+cFjtBYGNV7V/onrQ1E/I2h2SPtQ08NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731537; a=rsa-sha256; cv=none; b=ycRQQIh3bScyEwOYsHyHja9Aw+y1oJY9pkMnzGcBYfK5/E2pOaxw/wzyhBCl0P0ZDlacn9 /LBUheiqIMYQrGpdRDipQbauqDPRjiJ72xWMn71TWMDCbxbW00VA5gGG1HzLc/BrOmsK2a uRhaMSFQWXmXqLS1h0YFYdZOnyDRLxg5//pR01XMYSIUBMZDJ2uXeShH97O7RopYduHjdv 2Q+V/GCxMNw4hEYKSeH0OCEkQN6GoCJvikqjSvDDkpMDYDgmVt3FIDyfUrTg6XrL0NyUOM NPiJAUuCb4Oisk9WzQK1gWFdIhJ5KDrZDWiy89ZWjgp900d7mswHi/5KsBcBpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yqwz6Y9mrpqtjDvo3HXrs+ErEmepJbvH7ZY07MCAibs=; b=M0d+ZLGtqg/1spVKb9Xqf0A7tUR84yjfucINA6DjVaVtx8ytwyt9v2RdCiAPI/7EtwQDCt KhPWfVK/MNDVJ0YwAHOsmzR5h5FBjCyJDDoqnUp+tpN5E6HDmFYS9Hs28+FSlTubtzrNt+ +dAHRCPeT6lXvtZS7MYrUt30SzTPGmSfrKD7fpUhPkd8C8B9rtwU1Q5ExMevNHKjFFzRWs tO5Q2VmESPbx8fjjdFXG/OdKGooQkNbfFAKwkXG2KTwh91zJVhS5k3Ng/qlCgj079mwxbz B7YrKMEE92Y275ikAxLYLra3Nb7FUleOE098E+ZVZVtg/k1pEwhTmBwV8/7UNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV8K1fD1zByK for ; Sun, 22 Feb 2026 03:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20254 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:38:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 0306b707bc95 - stable/15 - usr.bin/factor: remove tests when MK_GAMES=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 0306b707bc955036f115749c288a77a5bdcc7691 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:38:57 +0000 Message-Id: <699a7a51.20254.1f824eab@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0306b707bc955036f115749c288a77a5bdcc7691 commit 0306b707bc955036f115749c288a77a5bdcc7691 Author: Enji Cooper AuthorDate: 2026-02-03 05:40:50 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:37:29 +0000 usr.bin/factor: remove tests when MK_GAMES=no factor(1) is only installed when MK_GAMES != no. Ergo, remove the tests when that's not true. MFC after: 1 week (cherry picked from commit 7baa76c30c833750007e8d8823c9f5d94f5b2925) --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a29b709e8a9d..59a811788826 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2121,6 +2121,10 @@ OLD_FILES+=usr/share/man/man6/random.6.gz OLD_FILES+=usr/share/man/man6/rot13.6.gz OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz +OLD_FILES+=usr/tests/usr.bin/factor/factor_tests +OLD_FILES+=usr/tests/usr.bin/factor/primes_tests +OLD_FILES+=usr/tests/usr.bin/factor/Kyuafile +OLD_DIRS+=usr/tests/usr.bin/factor .endif .if ${MK_GOOGLETEST} == no From nobody Sun Feb 22 03:38: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 4fJV8L3m7hz6SrNp for ; Sun, 22 Feb 2026 03:38: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 4fJV8L2y2Gz3MVw for ; Sun, 22 Feb 2026 03:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8rPw8fHGxlZWoSDXmF5SBNo8OpzQXPcSAgHDcag9v7I=; b=dROivPAukduaDcLly+8VOHFxbxCPVdG94WsYYR0hq54MD2iL9cgqGfYbRLgJ1te/qbtSyS xLUfhlyraH3cT0ddU1uNKyc6I3jG3ExorHNfn5HUle78f+skH3QA+Pq8IqPzG1ZBOkKoHQ 1CqysMKPGluFIQU3udZTbnqNN4JqC/flwKYbMcL5S25LFguAO7YWxLAPQlqKofzktyE711 t11u67Ct5fdww9j0+6mbqZzW8NnJTTz5aTBz+gh16WU/ykfqofnhboG3ADPn5NpdZPuFR/ VeiKYmCavx8UEfZBXUa1KIrKf4SEVw9D/KY04cu2vTaUzLXknKFAxK+ancZEjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731538; a=rsa-sha256; cv=none; b=NIMkPt+jBluRqZzlEsbtYR9I0S06sh/0hm4XYA/dlssv5H8QPbrNHnhkUGnyO/Lp5K8iHD tFPttx/eIjT0VGFa+vtUhkNUJWtUpsJF3zet7qjXKK8b1RSVT4aMXQv3KUPqsyiLApJqC7 I4GmoefZYIY0zBzFwWB94+1c+TOW/TrCZkjgHA4S8QQCpmgqlScUZDcd3uZpgmFNaUNi2v pBMFpj8BJ0jS2mqC0e6ezM4DO1HWnipsNLJlaZNM37ImkjmVZcAp/2U0qcje9XGjpw8aAm LR1eJ8ROWnGSg2AR3kGMMrnmwoA7c9soqyD4SftmSAjL8maFZ8r+U0YYY6x6jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8rPw8fHGxlZWoSDXmF5SBNo8OpzQXPcSAgHDcag9v7I=; b=gMtngVw6sbAapb1fr6/ivtQLCUZFMw1RBx8Qp1LdrICHPWoKLRaUzZ09GNrxCGvhXdzP5S O/Bm/pj7MzIqSWCCN1C2hLICyYRFCtTvr9Dj0rpJUiFOBnvq6NoTUvKlFSPBY1Cl14ZWBi PeMIp+XYT/66NYnH5/1yRwCBOrIBMY0+k+9YHAkKBZDfPYiu40rQmTNlXhLTCabhy5Otxp 5pOSFmyImpNEVO40mXg+TArnf1RLkx05e37wPw8T/OcMXupq0jiJV0DbgPVZAkGuQoRPZh ia3bjlNtethE/lchvFVTpbc0dU0kQcey+A5R6OWmtCfCYZqRsSjFXNsomrgQVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV8L2T6SzBjs for ; Sun, 22 Feb 2026 03:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20539 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:38:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: d6eabaeef303 - stable/15 - Remove bsnmpd tests when MK_BSNMP == no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: d6eabaeef3037c8d50fe37b437a8826d8b094c32 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:38:58 +0000 Message-Id: <699a7a52.20539.27567464@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d6eabaeef3037c8d50fe37b437a8826d8b094c32 commit d6eabaeef3037c8d50fe37b437a8826d8b094c32 Author: Enji Cooper AuthorDate: 2026-02-03 05:12:25 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:38:13 +0000 Remove bsnmpd tests when MK_BSNMP == no MFC after: 1 week (cherry picked from commit 51509500acdc5d23285a962e9c55dd9e38d2b30a) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 59a811788826..378885e9dc13 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -742,10 +742,13 @@ OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt +OLD_FILES+=usr/tests/lib/libbsnmp/bsnmpd_test +OLD_FILES+=usr/tests/lib/libbsnmp/Kyuafile OLD_DIRS+=usr/include/bsnmp OLD_DIRS+=usr/share/snmp OLD_DIRS+=usr/share/snmp/defs OLD_DIRS+=usr/share/snmp/mibs +OLD_DIRS+=usr/tests/lib/libbsnmp .endif .if ${MK_CALENDAR} == no From nobody Sun Feb 22 03:41: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 4fJVCL4pFSz6SrPN for ; Sun, 22 Feb 2026 03:41: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 4fJVCL4N0Mz3PKq for ; Sun, 22 Feb 2026 03:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVghmystwJfsOBeR2uBe0q1FT5t8fD4uXvc97PhJTjQ=; b=pG2rv/mCqQIOhoRbBfiXsQVizLs55k7hkE8SjXlQ8KAf0gCgZCwSUmpK2sfR8e2DMLkVxn E9ULbDB44AIBObsDMym6TnUgx8ulxw5cnO74YsXJr4KY6inG6qipHifZOBzzB2aAXsVXQA 9ldMEUnVmTqp3hkb91BXcYC93/9UBwGtyBKiadxEXy6PesYIQ4ly8JFosWyrjZFqRRVTWg Mm1WiRONtcHZ3Bu66F7Hg1KMZp/j6JlGtCUoVgDrOXmETDaPj3OKX70lyhIcOu13mFn8uM MoV5yU7lytHO3dKt++62N8ShBeBhaC2fomSZikxBs1m9FeaHUQTSha0xwD/mRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731694; a=rsa-sha256; cv=none; b=ZEOMKMJx2xJbnlLNtW8CfkmrRFNSPMPFeFAvj2wnvNwlZwpz54b6GQlrTVkpycXFGfecMr XX/Q66SaTi+g6SoIiUag8dLAiQqyW5707bm9fpWcuQImliH1JG1TLgfiwC/9rRBhl3Dqh+ pnXf9A0q8S8v0ryy8j0sRimes+hEp2dKu3prWtFEicthkvmp0XgDNJnH6aDpP78QXwhNRu SLOShWb6Bis9pszNaRRqw+l5foHBsy5zYQ2zUMqfIRcQVxbs0n19wXo4VT9JEbxlGso5RG VxyUv38tpnrQXsGZJXbx0kcrMSd38/QgNSeuuOgDgW6+4ng46vDrHJkNrf90KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVghmystwJfsOBeR2uBe0q1FT5t8fD4uXvc97PhJTjQ=; b=yiMvzAq592DHy5jYyhMLxa1MZoWdV8ba7rQSVOP/TyvJ2wyE5Ak4lIB/FqTQBTls9ccAJ/ 8Ke6qozJ0k5+AbYYkYvHtJfC03Ur7pBRBo0iTQcud225DXKJaD0Ttl9JZHzGodpLrqfmwg YdRx2W361b0qzf+GdYbmOpmoae3nB2wB0EZ9IdyZKAhxV1b+M9393Q+UQnh93JEAuuCebg vRUor2XEuGaA89kdFrs5JCwO30h9VrBjs8iNdBdxPY1GqXxxbUeOVTAbwHkWqf5FoIIq2Q I4EScIIf9HBb4MZdpnT4596LWbDuMeGrru/jdZMgK6V8izFPcVdGRdFjjxd/lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVCL3zNgzC3J for ; Sun, 22 Feb 2026 03:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20fd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:41:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 26632bc19460 - stable/15 - tftpd: remove tests when MK_TFTP=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 26632bc19460d4a16d3b701f17657f82fe36aacb Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:41:34 +0000 Message-Id: <699a7aee.20fd2.592690f6@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=26632bc19460d4a16d3b701f17657f82fe36aacb commit 26632bc19460d4a16d3b701f17657f82fe36aacb Author: Enji Cooper AuthorDate: 2026-02-03 05:24:33 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:39:52 +0000 tftpd: remove tests when MK_TFTP=no MFC after: 1 week (cherry picked from commit 1ccee516edb681b33182f0a57531752eb98ec838) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 378885e9dc13..06177cee6c70 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8321,6 +8321,9 @@ OLD_FILES+=usr/bin/tftp OLD_FILES+=usr/libexec/tftpd OLD_FILES+=usr/share/man/man1/tftp.1.gz OLD_FILES+=usr/share/man/man8/tftpd.8.gz +OLD_FILES+=usr/tests/libexec/tftpd/functional +OLD_FILES+=usr/tests/libexec/tftpd/Kyuafile +OLD_DIRS+=usr/tests/libexec/tftpd .endif .if ${MK_TOOLCHAIN} == no From nobody Sun Feb 22 03:41: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 4fJVCM6j5wz6SrjB for ; Sun, 22 Feb 2026 03:41: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 4fJVCM58w0z3Nsn for ; Sun, 22 Feb 2026 03:41:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uk8i2wG671CqfK2n6SGgtRk+mJM+UHW06/qNBVOf4Ls=; b=j/l5uqDSQhkuRreLRlJXX44wCBTC6ZivMZYLrUk89YQBk+J6afU+8KLdm5qNIIqLEJidzd tNf5cg/vquP19BsmRVNY2H71z5LRXXEv5WWGArCY8qMPOs4Ph9RM0DB9fwQLUekdsWgZlf sdWT/IwbPxe6ppoIQ7X5hwFPjpO2b1j9iWn60Otrus/0SlmgKTb+SaWNfNgOYXmHu2v6RH MTyIpjuP1e4j82QfqsBDzOb7tK8SUPGiutmeWEk+2OJoUYiAJBHMVQNS0leo+DPv95cRXX yPjvzlHH0WTHZbOZN8ydGkopbImyv6ykB/Hf05E9wsPQou9ZWa2Ct4EMUsczmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731695; a=rsa-sha256; cv=none; b=VRIuM0uPE8lZaF/jkoO3L86o1sS8+qKQNdrTLc2k+ESsxynxlfFw1v/0f25KOQSM4XwyXk I6IUDV/vnBysQ25AB3K2TnkIugSBv3gsRLu3qFVAu4JvCthytPPDrU8pjNgmXeHnUecjM7 zVTZ8djyy0fTuaDJRHOh8W3OD9l0f6SPP+SIn9VXSzx5t8mi2IAIrDK3sbqPprCjkFdT7W QnTUmkADCe9Tvs+WVmELwTbouSAEPSuVFqB6/45MM1bUGQDzV9Okwmi105q6nT6s8QmfEy rEb1LdTa8YNMJ7lm/wdEm5N1BEP4j6VjgzNIjofgtydhltaWZeULOE4QrxCpAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uk8i2wG671CqfK2n6SGgtRk+mJM+UHW06/qNBVOf4Ls=; b=EU8Oewb3YcocQsRMD3cImw5QRaExkFEyJDLv+vSUcuKXz4AY/N0IPnHHwzZGYjBiJ0/i1I AKBqDKK0FUO2e6dZLTkZSlGEyJERnoHCO1dYKZtxt67vDeaZNMgYP6/kPYVOhVj7q66xaE P3iO8yIxCy5MRfbNKT/75UNDDFqh3bRNREEoYYjpBc5gzSnj17g7SqhbMtgfvBRRLEuKx4 qzHOczWMbyyeAPFe+MeuNl+SHKIPYyDy6eA03FlGlOKlbepW8tuC7PRxakgNEC6VGztfm4 Kmx65N22Suz2kfsBYd6A+p6LoExQHYEGyHR/QT0+rzeLd5XT0ydcbFbWoVXpGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVCM4mWYzCDs for ; Sun, 22 Feb 2026 03:41:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22601 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:41:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 6ba1feba9777 - stable/15 - usr.bin/tftp: remove tests when MK_TFTP=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 6ba1feba9777abff77b6c2b519bbc5ff65dd7d40 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:41:35 +0000 Message-Id: <699a7aef.22601.5b019a22@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=6ba1feba9777abff77b6c2b519bbc5ff65dd7d40 commit 6ba1feba9777abff77b6c2b519bbc5ff65dd7d40 Author: Enji Cooper AuthorDate: 2026-02-03 05:44:47 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:39:52 +0000 usr.bin/tftp: remove tests when MK_TFTP=no These tests require the tftp client, which is not installed when `MK_TFTP=no`. Remove them when that's not true. MFC after: 1 week (cherry picked from commit e1f36b9db9220cf51c6c3d2d2ad230fb9490bc3e) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 06177cee6c70..7d348b0fce40 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8323,7 +8323,10 @@ OLD_FILES+=usr/share/man/man1/tftp.1.gz OLD_FILES+=usr/share/man/man8/tftpd.8.gz OLD_FILES+=usr/tests/libexec/tftpd/functional OLD_FILES+=usr/tests/libexec/tftpd/Kyuafile +OLD_FILES+=usr/tests/usr.bin/tftp/tftp_test +OLD_FILES+=usr/tests/usr.bin/tftp/Kyuafile OLD_DIRS+=usr/tests/libexec/tftpd +OLD_DIRS+=usr/tests/usr.bin/tftp .endif .if ${MK_TOOLCHAIN} == no From nobody Sun Feb 22 03:41: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 4fJVCV1g0Hz6SrKB for ; Sun, 22 Feb 2026 03:41: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 4fJVCT5p0Gz3PYB for ; Sun, 22 Feb 2026 03:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpWSo+B3CCPNZ1m5dO4JU1tlXhoaX/B1ERIICyvMWOI=; b=NBQnpzmHDSG9JIAFXiS53eaIV1F5vsa4t2jlL7HEWGmehiVzhgt3vRMt+y898aqHpxZBMW FJdBUMNY4VMTAZWKt3QNMdOcO7diAA784Pc2U7BmMCudQd/h+anz2VwqmfW0dj334SbB+s 8gfyEsb+MImuOyqJNTTg3ubiU2ha/mv5wTe2Z6b2rehpqu9U/F8Ijmeh8D59lG+gjkupeZ 9s/vZ1d5apZ6eBuZ2daAfe5MTB6LePnMVcwYmWbBDCjqwb+WpiXOkiYxX6Ddxq1tpzSRdZ 9jgCv8yMKB5E/NNgAe3AVFqE0w7YJUkuV12nxefh+cvSaqWJMeOfkNnUsbXy3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731701; a=rsa-sha256; cv=none; b=xrRD/a0EAjRg2ivrY5nkMTuqXVvYLwCpsfi3qifiXKoHQG/1L5OSbwKJojgPwp953PkcAu VC7SNsUUX9mWE/DSweMPIQ6zyE6i6Zxp2OKZsDLT9ON+OyBap5+M+n0WTE+Mzt6p1Mn/H0 FYtnkjmlhabejoBp1SigLawWaNI8x58uDqW26Amr+bFE8lp7B+3Y+5VVZmxWJFcdfdz7LB poLVUrXtGxoLsXotlTILf7DK2Jf5r2sFnV2/3FKAuu3HGZ/FFazO71LRxUn8hZjyIM7S7W V12GVh4xTHHL8EuweP5Rh94Cf6vaV+B6eYLDaW3/n6y/MjIYE/Lbnh9xYzHqHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpWSo+B3CCPNZ1m5dO4JU1tlXhoaX/B1ERIICyvMWOI=; b=UMJo0J702Ip3tDS/AK5TmqD4wKKqCPv5qA8Aj+wH8/T9q97ik+mCa2hun5n2VBG0Xijn7L 5Phcam3Lkp1Mh6mDuSHW5V6e8ql+T/AB8liDqcEFY5Qv4Vw1DpfxAY5os9pclC6gEWcxfu np7QaFxqDfqyCxMf6ap+87RKquEhtaXDmeCmm1yUgXWrL/zRV31pBnkRmYUEB6GVa4lV1R LSli2w6IHm2LVpYROg7W2sXHDdy1sCzHZL4g9+Agvft3dSo1LmQD82xDcgAqrRJ7yUN1xN q/kBGqeBJbA0MLBbxNU5SvsTHyojunRYMfn4GvIdLS6TadvbsDxDFGYagKbeAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVCT5CYyzC3M for ; Sun, 22 Feb 2026 03:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:41:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 05ce2ae289c7 - stable/14 - tftpd: remove tests when MK_TFTP=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 05ce2ae289c7b8e2c04fb3d234a99a8e131a618a Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:41:41 +0000 Message-Id: <699a7af5.21e18.4f23a558@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=05ce2ae289c7b8e2c04fb3d234a99a8e131a618a commit 05ce2ae289c7b8e2c04fb3d234a99a8e131a618a Author: Enji Cooper AuthorDate: 2026-02-03 05:24:33 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:40:16 +0000 tftpd: remove tests when MK_TFTP=no MFC after: 1 week (cherry picked from commit 1ccee516edb681b33182f0a57531752eb98ec838) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3f8e592d9eb9..e9a4a6f37f6b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8357,6 +8357,9 @@ OLD_FILES+=usr/bin/tftp OLD_FILES+=usr/libexec/tftpd OLD_FILES+=usr/share/man/man1/tftp.1.gz OLD_FILES+=usr/share/man/man8/tftpd.8.gz +OLD_FILES+=usr/tests/libexec/tftpd/functional +OLD_FILES+=usr/tests/libexec/tftpd/Kyuafile +OLD_DIRS+=usr/tests/libexec/tftpd .endif .if ${MK_TOOLCHAIN} == no From nobody Sun Feb 22 03:41: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 4fJVCW1cjXz6SrSr for ; Sun, 22 Feb 2026 03:41: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 4fJVCV6dZhz3PhS for ; Sun, 22 Feb 2026 03:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6Snk49MBICMyGSIzVxu2L7BrkHqbJAgi0iwbWuAQ/A=; b=XsZu15EexiYZ2qwUuYTUWyT2UofAoi9pAF7CCbTgeuQCSaib8Z+ObytFXR6zp6okiAOBTl kmJRWc/WSqM2/eTCIy04eBNDPE3ZpIE9+x0upJ4FaHL0eAYB5nYvV6YJZUl23fP8wNVNRi csjZQS2SwUYpdV7POpOaVK3t4He5HGHsEV1E3POZ7Zop+F85xDfLUaSS3UB5XN3OGEXzv+ zsPEQLsp9Rugjrav5sUhqcMyw6/1rnfhk6JiogXk4BN2nmMRM2H1OkUszD6qxRKNKS0qiA 2iNTynmG9LFEIm6OdxIQeo+7siLKxUWalIXfgXumqjhKjSysnlP9kh8iTcI9Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731703; a=rsa-sha256; cv=none; b=GeggiYXIRxY2OSfeCj8T5Nzaaq9tBErJjUzzsa3f1hVIxpRacDvRz6rFIPXyJ42cbMohPv UFQKR/4Xc4uNa+iZ8FHJhzE2l4kOjive+TeDrx6jH6FidKfCr2rclTQoEPT8V0FFvjeADC Ix2+NFLe+hKN0rsqHrNz6fqiYAZB8pTDL0YimKFWnkBrvcAQlQguNC8mG73mBi6Q1ROGDy fccv4YgCCoWWSUZ2U79JoGmV51d/jcuHei/BZRHivfxvevfz1qTdwU2KILhPJaUkCgKXz9 R/rFAcI+PzML4TVlu33p4tzKIIjFVccqtNm92J/EOKFNBW9ve0ehBTI3xFH3FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6Snk49MBICMyGSIzVxu2L7BrkHqbJAgi0iwbWuAQ/A=; b=GSTd5Y/BqVcehiOobKbWQ1lHFRO/l7HXsdlqT+EJuxzufpnavFapzBs2kOduIWMbA2WyEb puIL1y9adkyUMdYJMfnAAe7hugs+lUu/j/hM5XASzn4d8yF3wr+gnMDts5tdVsEbjV/b/g x00J/ieO9l2MoqNgasP7sB0zZoeIuSlIojbZsqCNRuCTdlK4I0QnYUnAPiO7R85iRCWLuB rqr/4LGSfRngLIdAqzoYOLFjLWpUG34NjmEPd9f1itdspsKnZUJqu50fvZpk9GPUa7oKyW tejupLIzE6LxtUaDe5hZl4Hwyd/N5H0r+C8cr7x9AqGqPsKT8aIne8b3tlKXlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVCV62dSzCDy for ; Sun, 22 Feb 2026 03:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:41:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3c69641a756c - stable/14 - usr.bin/tftp: remove tests when MK_TFTP=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 3c69641a756c93888c6c30ab109f8816d7a965f8 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:41:42 +0000 Message-Id: <699a7af6.21f85.77bb1380@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3c69641a756c93888c6c30ab109f8816d7a965f8 commit 3c69641a756c93888c6c30ab109f8816d7a965f8 Author: Enji Cooper AuthorDate: 2026-02-03 05:44:47 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:40:16 +0000 usr.bin/tftp: remove tests when MK_TFTP=no These tests require the tftp client, which is not installed when `MK_TFTP=no`. Remove them when that's not true. MFC after: 1 week (cherry picked from commit e1f36b9db9220cf51c6c3d2d2ad230fb9490bc3e) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e9a4a6f37f6b..52bf3224e8d9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8359,7 +8359,10 @@ OLD_FILES+=usr/share/man/man1/tftp.1.gz OLD_FILES+=usr/share/man/man8/tftpd.8.gz OLD_FILES+=usr/tests/libexec/tftpd/functional OLD_FILES+=usr/tests/libexec/tftpd/Kyuafile +OLD_FILES+=usr/tests/usr.bin/tftp/tftp_test +OLD_FILES+=usr/tests/usr.bin/tftp/Kyuafile OLD_DIRS+=usr/tests/libexec/tftpd +OLD_DIRS+=usr/tests/usr.bin/tftp .endif .if ${MK_TOOLCHAIN} == no From nobody Sun Feb 22 03:43: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 4fJVFc4S92z6Sryj for ; Sun, 22 Feb 2026 03:43: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 4fJVFW1ybtz3QqB for ; Sun, 22 Feb 2026 03:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpF+B7g7DP3G36Q32wOIqwHtzgvI4RGVPURz7BLjSyw=; b=VzhLABcgBNtOPIHpPv1f19NKFwwkcinyqy3rc5/0DiPTnPOgvVoycXgv71Jkmp63H6nu0Q DrZVZ1NN3ozZL+VEGt4+pjWG//zcXgZYJu7qFw8wJshCaa+mhmhn6LE9WvQL2QfEVfAe4K VuPkRvXGOddnGYRhI3owwdeqd8KrCv02OQHTEOtqSysjpYAL6ytd8DDuSQ+jzUOxFIkbkp dsZAS+iWRlOJfCIjXJAw1ag4jqF7caQh0NlfDcCklmRh92sktNSe0tr8cpUVQkyh5nMA8s ye2uQKAnKIQ57+efvRCCnryHa3h/g692YMy63UCPD24zNK6N2IKgIBYaaMnspQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731807; a=rsa-sha256; cv=none; b=A/lOMNLrvPIn5wzyusUeLB2TLSlhdVCfG4JMTEZHg08BasAoa/+KbXNgzWFpCrkODe3/y0 wBdq4z8N42jswECTrNRhxc7DvYvoTPOr1FJtQ7qHzqT+dbO7T9JvYYRM7efDZDJuOhOSYC z0Y4S/rtGg7MSozFUoAP5RFKeeuwRnX5MZYKCFLUzeCrnN45fmJEoZNb6n7twdxGWRrpYM /FeOMr7o1pSMnfk7itVcAbXbCjRSDHKnZ96CCKhGHwe4q4eMm02zCOqqiGxkaMUUjBzhbY QAeRgtw1TcREwxnIgcTVScgbUEjDGg1CCdJRxRSPOKDsYCR4Jfbo9U1NSnGUNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpF+B7g7DP3G36Q32wOIqwHtzgvI4RGVPURz7BLjSyw=; b=SoQO7ZGgs9qcphtP0sO5Ur+JOlZ3YLyvAXWc+3vp9YVwZOdS90geGRj9UG4QGDK/ZQX1X1 yq/OdpaFtjlfWU0iz3/K6zIRYU52LS1X8GWHZQlYb25s18KZ33/pHFOEuKI68iPmd89A4R 4Z/MVneqqYSWyKLIi3dJ6mzJY02T+lJBk10pYwXGeFYZLNGFHPcbXrPV1hALtlU0B8uBT6 /AbF3gY5xGLZ/OaBdFCWa4ApvPsP1nYNkr98rue8a8hcI4LulKEEFoEKXTwl4m8TkvwFna TBasTMqEMF1UFIvNI7EezfjcBEiIhFkN3hb+Ua9pYHqAgmznKe4qXS04Xa0XJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVFW1PN4zC09 for ; Sun, 22 Feb 2026 03:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22605 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:43:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 2033efe8bd02 - stable/14 - usr.bin/factor: remove tests when MK_GAMES=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 2033efe8bd023bfdfe7b1354ea3f2151b2de864c Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:43:27 +0000 Message-Id: <699a7b5f.22605.62c43e94@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=2033efe8bd023bfdfe7b1354ea3f2151b2de864c commit 2033efe8bd023bfdfe7b1354ea3f2151b2de864c Author: Enji Cooper AuthorDate: 2026-02-03 05:40:50 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:43:07 +0000 usr.bin/factor: remove tests when MK_GAMES=no factor(1) is only installed when MK_GAMES != no. Ergo, remove the tests when that's not true. MFC after: 1 week (cherry picked from commit 7baa76c30c833750007e8d8823c9f5d94f5b2925) --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 52bf3224e8d9..e5626cf2144f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2104,6 +2104,10 @@ OLD_FILES+=usr/share/man/man6/random.6.gz OLD_FILES+=usr/share/man/man6/rot13.6.gz OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz +OLD_FILES+=usr/tests/usr.bin/factor/factor_tests +OLD_FILES+=usr/tests/usr.bin/factor/primes_tests +OLD_FILES+=usr/tests/usr.bin/factor/Kyuafile +OLD_DIRS+=usr/tests/usr.bin/factor .endif .if ${MK_GH_BC} == no From nobody Sun Feb 22 03: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 4fJVGk3BMmz6Srl5 for ; Sun, 22 Feb 2026 03: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 4fJVGk2J4wz3Qp4 for ; Sun, 22 Feb 2026 03: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=1771731870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xE9kMcTmvq1/mhKAfIKRDB4sYEp2JcyaRt28rqqzLXU=; b=Zj9qMSKo9n8k+Xzy8DU2dHvxmmC3mto5NexEBSvwIypgAb5RV3nghtafOwdxax4V+9ZSyx T7LVl4Iny2NqfeLvvJQyYXSe5GyLaEypuIF8O1brj921bbUNTswmwCMIXi59/TEq9FO7h0 wwBndhIAZ6X6To2CbvhDrXcTLXvAh7VK7Hh5ZztRQsU6O9NBXtZtpOs2J8XqZncfRU4Lyq 6LPAiyO8ti2bSFL+sR2S5UJtWb8Fw2WhXIiYa3OPoYNZmStbabpXyvONGUD/EzemGW1G5y NFHjbL/goi23VS7E/PxlEOmmA0tqpG4/ReVU8hvaqAF3c+jrAx4ueiIr+i5CJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731870; a=rsa-sha256; cv=none; b=x+PqvNPv03Debvd91TBs3nCiDiqUmuUIZHUqa28pY0mZ+mNbqBjkepk/43Fz3tyVlTzDqN KBiqE8OkT9GNOwJJZROw4aZrGHyaaTRNjicTlJ2nzyJfgWY8sxcud1hikpVKwAxS1VAb3G dnqCzWidfXyBlQKsyPJmN51db32lz8a7+B7Q11Vpf2NxWIRMnvbhNAEg0T2L9cLFJYhUXZ DpFoOhe4Mpwlp3ZJwfVX++I9zCf1fz/fbZDyOGqvUvNcax9TA0iJ7FDPp32Tk+oNL3a9EZ QPNezK3htO9n01tWkuIlISPJd1hDWjq8tSw2zF1KL/ASG29WRr1+D0qcR0P/AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xE9kMcTmvq1/mhKAfIKRDB4sYEp2JcyaRt28rqqzLXU=; b=cY/u8SrAebw43yqEXqM6WxQ+a8wlVyUeTHdYdnSLXT0Et9gERTanXv6xX7A1nNyF0H4z5t nyM30hmfz4Q5NB2xCdghUGn0W7TjKqFXUoHvcM6r/zSB4VTFnKtgX+YPjVP6s4wfpEfbHN w/3+I6ya7cq63ANU+d0ICB4IA3IqNpBgep3WXT5QDtaltmx0Q6c7iRqiSPKvoxel/U/jAA cMv7xlX1hISwp9Y2G4bP/sVWPWTCoQUKOSE+mYS0Y/uWdScjBkjLzzuAE1KheSkxkub0RM NxBXgb1c/0UjfN5qYXU3BuVPGPYM1to4M2I5PQ6JzwPj/mVhtaNJf1R6wek8jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVGk1vZbzBwK for ; Sun, 22 Feb 2026 03:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 7111f124b8f8 - stable/15 - clang-format: adjust to sort C++ headers per style(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 7111f124b8f8398b64db9280c5d090c7e45bef9b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:44:30 +0000 Message-Id: <699a7b9e.21f8e.7862b5a0@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7111f124b8f8398b64db9280c5d090c7e45bef9b commit 7111f124b8f8398b64db9280c5d090c7e45bef9b Author: Enji Cooper AuthorDate: 2026-01-31 04:14:07 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:44:24 +0000 clang-format: adjust to sort C++ headers per style(9) Many standard C++ headers do not have the .h file extension: some, such as `iostream`, lack it; others have a .hpp file extension. Moreover, some projects (like ATF/Kyua) also contain .ipp files, which are C++ "interface" files. Relax the regular expression to ensure that non-traditional C "system" headers, C++ headers, etc, with angle brackets are sorted before "local" headers. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54401 (cherry picked from commit ab9b04736945537743eb0624ead7a4fa4b960783) --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 3d436fa0b35d..efe9f1202bde 100644 --- a/.clang-format +++ b/.clang-format @@ -151,10 +151,10 @@ IncludeCategories: - Regex: '^<(fs|nfs(|client|server)|ufs)/' Priority: 8 SortPriority: 80 - - Regex: '^<[^/].*\.h' + - Regex: '^<[^/].*' Priority: 9 SortPriority: 90 - - Regex: '^\".*\.h\"' + - Regex: '^\".*\"' Priority: 10 SortPriority: 100 # LLVM's header include ordering style is almost the exact opposite of ours. From nobody Sun Feb 22 03:44: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 4fJVHD0M8Gz6Ss4l for ; Sun, 22 Feb 2026 03:44: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 4fJVHC6sdgz3RC5 for ; Sun, 22 Feb 2026 03:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aU9n31YESTwZZInGs91C5Cod2lxO9qxAN3vuUG9D98Y=; b=Hbiz34AJtYpE3pxY1/xLQwlxD61Jj8y4P8MPndGCNhtFnJTka9yAzyQ1ozawN9GihFZJ6X 7OK5adtzu4OEaQGtGzCJA467WNr2uxo6yn3fouHRTtT+TyNALtwwVhdt0II8XwtQN0g2SJ 2PQM7VIeNXvLMWe6Jn8r5hnnGz/SDvDQGTWLd8N0fFMDKE9AWpBcoBEg9LVaoOlGzXGFFP wC14Ylt7uhhfkW+CLAzUjRE0suZInRK1dubBGJwWm35C8C9x4/SkHkUQOUYO+QWMSm3bbY iPQTdI4/fLQbP8AVBpFlIx1OTUhxMTCqrf9vXlqgaCbHasf0LAnytyDVUZYjUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731896; a=rsa-sha256; cv=none; b=XYSGuncmzMczPyRjIyl13VKAV7bP+2/KDMAJfUvhO8/MDVzNdK+M7mI/q3VNdpAS6qpcjE 0oP+cdsqdixNgO/7dZLYgQfH08xB8HLCwZHOVjZXUDpSpXkutq1ei8yeDatf2ffzKdb3/U So6kd18FHHjY1t0RKIrc7Sb8X8spKytsPwtPqBorf53N+J1qXCzRPHoFdp250M599DcJ/W hKSdGoq3yXcdAh/l8NI/PHxaE8S7vduJ6aOF8cnRaYOQXT2i3PF354K3YNxIj7qug3Vorw 4TfKJFeVMIz1+9bQSXKA2QARAFHKAcCL07MypBWwZ9pE3DcZ0q5kPRdfjuNavA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aU9n31YESTwZZInGs91C5Cod2lxO9qxAN3vuUG9D98Y=; b=PT9OISqcU2MVJ+P0n47O85LM7fConvesvtbvJIP25cArfFjLxT7k7RptG6pdv+b9qVmHWh xN/UCUSme9JynBVtgXSYS0orPxmjNCDudRoemtnO8UyFoyfkOEjWU5cZQNtTeMa1LElXbo IgG3cv+fagc91M6xtiXeXyd4ZNCdvOBst54HZEDMFcRoluksAYC/E7fSVGNeTQppa6jyZc GpZEtN+gt03LQ8nZOGhsJ0awIoz149CvPt0UESZphqezdHQU7n7mDKbSfCYbR9LKVdukzP dqNv+aUMACD/wv+ZM6JTwJEuceqN1WLw5X5Rd2YKfoGbIV/xaGPai7/4kFc2EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVHC6MtdzBtj for ; Sun, 22 Feb 2026 03:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21eec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:44:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: c9aaf2032da8 - stable/14 - clang-format: adjust to sort C++ headers per style(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: c9aaf2032da826f704ed88460e44b71a4fa5c22e Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:44:55 +0000 Message-Id: <699a7bb7.21eec.5762aa36@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c9aaf2032da826f704ed88460e44b71a4fa5c22e commit c9aaf2032da826f704ed88460e44b71a4fa5c22e Author: Enji Cooper AuthorDate: 2026-01-31 04:14:07 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:44:47 +0000 clang-format: adjust to sort C++ headers per style(9) Many standard C++ headers do not have the .h file extension: some, such as `iostream`, lack it; others have a .hpp file extension. Moreover, some projects (like ATF/Kyua) also contain .ipp files, which are C++ "interface" files. Relax the regular expression to ensure that non-traditional C "system" headers, C++ headers, etc, with angle brackets are sorted before "local" headers. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54401 (cherry picked from commit ab9b04736945537743eb0624ead7a4fa4b960783) --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 3d436fa0b35d..efe9f1202bde 100644 --- a/.clang-format +++ b/.clang-format @@ -151,10 +151,10 @@ IncludeCategories: - Regex: '^<(fs|nfs(|client|server)|ufs)/' Priority: 8 SortPriority: 80 - - Regex: '^<[^/].*\.h' + - Regex: '^<[^/].*' Priority: 9 SortPriority: 90 - - Regex: '^\".*\.h\"' + - Regex: '^\".*\"' Priority: 10 SortPriority: 100 # LLVM's header include ordering style is almost the exact opposite of ours. From nobody Sun Feb 22 03:47: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 4fJVKz6wHDz6SrsF for ; Sun, 22 Feb 2026 03:47: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 4fJVKz62mbz3Rb1 for ; Sun, 22 Feb 2026 03:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiqwWYqdqAWgrzEMqKuaEDPbY0Jp264CJ/HlZNPzx3E=; b=qhhLm/fRF3I/V6rWqbdsW6+mI27CshOcSx23L4v/LgVO4dwuUrtkGiDLfjwvHidk7a0xUL gYW/vR4lZNGgmpyuka+a92by3X2L7Zr6JyDT3/7DQNWN0sEC/Bf+Lhv3kLD56/3rwIhQku F81Z9l1OrOl2I1Gk1AmNi7kypuBDMEXdau+xbpFZANUik2+r5F/AV+UIjspPMiCVESI1+Z cPWd8980UeMU4JDxnlVkS8/PW7NNUCxMGj2rfpsw8SV5FsuNbt6aZMnX97B7Jn1uv3awDl 8225NMd/l14cf8oYxx2J03UomSnhcPpMCDFMJA8vEBdM+IIjgm+AthI/oR34Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732039; a=rsa-sha256; cv=none; b=jd7izIBpBFoxdpKfinrZYErogTPgZkPVOpMEutTwlYATNP14yakI3UnfEM47D/e/y1+/ud lqmQqStafvJ/VDDSe99P9Ih6kFbxReyOiamZgq4tMZ7lpqok2i0rRFmMkm+9ubf14fFvZR ePrfmNLsYThbkhgl9KrSwWqkNB7KnYfiOWLO+0hOeSW+tGQ34YTljuQKfj4nwjaoqJgzu3 O5kb3oPnZCYEP4DVpON1lJ0sdHVgU+ceS/oBaUkA9b85d1hj1JbGKRaaUKuHfnu4nig7Fy dL76tawl38UfaDp71yM+mspBr+xjYGvEYNEtCCQRXrm+r2T2vZKhEoDNIewMPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiqwWYqdqAWgrzEMqKuaEDPbY0Jp264CJ/HlZNPzx3E=; b=XzDzrEYb78jbGsSAZ0S138pj2xcRvNKJVa521yIPt9O5V4hVrRgMFtZ2BwupsrBNBvBSid nHOxKJUFF+CXcdxUi5/RcimIB1Zlg0SO/3NXeJkrfobZc4xPzmwaaXIzqxaISo6624Dcwr lgHmJPmlb9sEHEM1lk1g2LONTxY1x1TFTG8PxiN8QbUE1lXJPoocxywH1RfqNp6QEnSdSw oTpxJ8so2pcL4eSt9u9BZa+QdGuEuTtHht2cXKmn9m5NZwJB2Jfh3sNjE7b/3JQ8fWCeXm U4DTjyyEFiIPONzHZV3q98uqoA99wPkhurbOPuTDcQ2Ws8URYaIZhOihv7qJdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVKz5Zd7zCFW for ; Sun, 22 Feb 2026 03:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22340 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:47:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 227baf32d263 - stable/14 - GoogleTest: import 1.17.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 227baf32d26360137492b108aba06c6a54c0949b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:47:19 +0000 Message-Id: <699a7c47.22340.21c4eae3@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=227baf32d26360137492b108aba06c6a54c0949b commit 227baf32d26360137492b108aba06c6a54c0949b Author: Enji Cooper AuthorDate: 2026-01-29 01:24:01 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:45:57 +0000 GoogleTest: import 1.17.0 The changes between the two versions can be found in this diff of the two release tags: https://github.com/google/googletest/compare/v1.15.2...v1.17.0 One notable change is that GoogleTest 1.17.0 now requires C++-17 to build. MFC after: 1 week Merge commit '3a4c29b5bed4ea20266ad9371fbfdc6bca088f92' (cherry picked from commit 46333229c6a0187ebf231805682ee0bceed704d1) --- contrib/googletest/.github/workflows/gtest-ci.yml | 43 --- contrib/googletest/.gitignore | 1 + contrib/googletest/.travis.yml | 81 ---- contrib/googletest/BUILD.bazel | 40 +- contrib/googletest/CMakeLists.txt | 4 +- contrib/googletest/MODULE.bazel | 49 +-- contrib/googletest/README.md | 15 +- contrib/googletest/WORKSPACE | 49 ++- contrib/googletest/ci/linux-presubmit.sh | 76 ++-- contrib/googletest/ci/macos-presubmit.sh | 11 +- contrib/googletest/ci/windows-presubmit.bat | 38 +- contrib/googletest/docs/advanced.md | 120 +++--- contrib/googletest/docs/faq.md | 13 - contrib/googletest/docs/gmock_cook_book.md | 73 +++- contrib/googletest/docs/primer.md | 4 +- contrib/googletest/docs/quickstart-bazel.md | 53 ++- contrib/googletest/docs/reference/actions.md | 3 +- contrib/googletest/docs/reference/assertions.md | 11 +- contrib/googletest/docs/reference/matchers.md | 11 +- contrib/googletest/docs/reference/testing.md | 99 ++++- contrib/googletest/fake_fuchsia_sdk.bzl | 36 +- .../googlemock/include/gmock/gmock-actions.h | 119 +++++- .../googlemock/include/gmock/gmock-matchers.h | 419 +++++++++++++++++---- .../googlemock/include/gmock/gmock-more-actions.h | 16 +- .../googlemock/include/gmock/gmock-spec-builders.h | 10 +- .../include/gmock/internal/gmock-internal-utils.h | 5 - .../googlemock/include/gmock/internal/gmock-port.h | 1 + .../googlemock/src/gmock-cardinalities.cc | 8 +- .../googlemock/test/gmock-actions_test.cc | 78 +++- .../googlemock/test/gmock-function-mocker_test.cc | 4 +- .../test/gmock-matchers-arithmetic_test.cc | 237 ++++++++++-- .../test/gmock-matchers-comparisons_test.cc | 136 ++++++- .../test/gmock-matchers-containers_test.cc | 336 ++++++++++++++++- .../googlemock/test/gmock-matchers-misc_test.cc | 105 ++++-- .../googlemock/test/gmock-more-actions_test.cc | 49 ++- .../googletest/googlemock/test/gmock-pp_test.cc | 2 +- .../googlemock/test/gmock-spec-builders_test.cc | 7 +- .../googletest/googlemock/test/gmock_link_test.h | 2 +- contrib/googletest/googletest/README.md | 6 +- .../googletest/cmake/internal_utils.cmake | 2 +- .../include/gtest/gtest-assertion-result.h | 7 + .../googletest/include/gtest/gtest-matchers.h | 6 +- .../googletest/include/gtest/gtest-param-test.h | 134 +++++-- .../googletest/include/gtest/gtest-printers.h | 39 ++ .../googletest/include/gtest/gtest-typed-test.h | 126 +++---- .../googletest/googletest/include/gtest/gtest.h | 4 +- .../include/gtest/internal/gtest-internal.h | 84 ++--- .../include/gtest/internal/gtest-param-util.h | 62 ++- .../googletest/include/gtest/internal/gtest-port.h | 82 +--- .../googletest/googletest/src/gtest-internal-inl.h | 4 + contrib/googletest/googletest/src/gtest.cc | 191 ++++++++-- contrib/googletest/googletest/test/BUILD.bazel | 68 +++- .../googletest/test/googletest-filter-unittest.py | 19 + .../test/googletest-json-output-unittest.py | 111 +++++- .../googletest/test/googletest-param-test-test.cc | 70 ++++ .../googletest/test/googletest-printers-test.cc | 32 +- .../test/googletest-setuptestsuite-test_.cc | 4 +- .../googletest/googletest/test/gtest_unittest.cc | 56 ++- .../googletest/test/gtest_xml_output_unittest.py | 93 +++-- .../googletest/test/gtest_xml_output_unittest_.cc | 22 +- contrib/googletest/googletest_deps.bzl | 14 +- 61 files changed, 2684 insertions(+), 916 deletions(-) diff --git a/contrib/googletest/.github/workflows/gtest-ci.yml b/contrib/googletest/.github/workflows/gtest-ci.yml deleted file mode 100644 index 03a8cc5e287b..000000000000 --- a/contrib/googletest/.github/workflows/gtest-ci.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: ci - -on: - push: - pull_request: - -env: - BAZEL_CXXOPTS: -std=c++14 - -jobs: - Linux: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Tests - run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... - - macOS: - runs-on: macos-latest - steps: - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Tests - run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... - - - Windows: - runs-on: windows-latest - steps: - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Tests - run: bazel test --cxxopt=/std:c++14 --features=external_include_paths --test_output=errors ... diff --git a/contrib/googletest/.gitignore b/contrib/googletest/.gitignore index fede02f65093..f0df39db1d7e 100644 --- a/contrib/googletest/.gitignore +++ b/contrib/googletest/.gitignore @@ -8,6 +8,7 @@ bazel-genfiles bazel-googletest bazel-out bazel-testlogs +MODULE.bazel.lock # python *.pyc diff --git a/contrib/googletest/.travis.yml b/contrib/googletest/.travis.yml deleted file mode 100644 index 4e7413a4f9a3..000000000000 --- a/contrib/googletest/.travis.yml +++ /dev/null @@ -1,81 +0,0 @@ -# Build matrix / environment variable are explained on: -# https://docs.travis-ci.com/user/customizing-the-build/ -# This file can be validated on: -# http://lint.travis-ci.org/ - -sudo: false -language: cpp - -# Define the matrix explicitly, manually expanding the combinations of (os, compiler, env). -# It is more tedious, but grants us far more flexibility. -matrix: - include: - - os: linux - compiler: gcc - sudo : true - install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-bazel.sh - - os: linux - compiler: clang - sudo : true - install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-bazel.sh - - os: linux - group: deprecated-2017Q4 - compiler: gcc - install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-autotools.sh - - os: linux - group: deprecated-2017Q4 - compiler: gcc - env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 - - os: linux - group: deprecated-2017Q4 - compiler: clang - env: BUILD_TYPE=Debug VERBOSE=1 - - os: linux - group: deprecated-2017Q4 - compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - - os: linux - compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - - os: osx - compiler: gcc - env: BUILD_TYPE=Debug VERBOSE=1 - - os: osx - compiler: gcc - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - - os: osx - compiler: clang - env: BUILD_TYPE=Debug VERBOSE=1 - if: type != pull_request - - os: osx - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - if: type != pull_request - -# These are the install and build (script) phases for the most common entries in the matrix. They could be included -# in each entry in the matrix, but that is just repetitive. -install: - - ./ci/install-${TRAVIS_OS_NAME}.sh - - . ./ci/env-${TRAVIS_OS_NAME}.sh - - ./ci/log-config.sh - -script: ./ci/travis.sh - -# For sudo=false builds this section installs the necessary dependencies. -addons: - apt: - # List of whitelisted in travis packages for ubuntu-precise can be found here: - # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise - # List of whitelisted in travis apt-sources: - # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - packages: - - g++-4.9 - - clang-3.9 - -notifications: - email: false diff --git a/contrib/googletest/BUILD.bazel b/contrib/googletest/BUILD.bazel index e407ae29f44c..53501454ce4f 100644 --- a/contrib/googletest/BUILD.bazel +++ b/contrib/googletest/BUILD.bazel @@ -83,6 +83,10 @@ cc_library( ) # Google Test including Google Mock + +# For an actual test, use `gtest` and also `gtest_main` if you depend on gtest's +# main(). For a library, use `gtest_for_library` instead if the library can be +# testonly. cc_library( name = "gtest", srcs = glob( @@ -138,19 +142,19 @@ cc_library( }), deps = select({ ":has_absl": [ - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/debugging:failure_signal_handler", - "@com_google_absl//absl/debugging:stacktrace", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/flags:parse", - "@com_google_absl//absl/flags:reflection", - "@com_google_absl//absl/flags:usage", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:any", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", - "@com_googlesource_code_re2//:re2", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/debugging:failure_signal_handler", + "@abseil-cpp//absl/debugging:stacktrace", + "@abseil-cpp//absl/debugging:symbolize", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/flags:parse", + "@abseil-cpp//absl/flags:reflection", + "@abseil-cpp//absl/flags:usage", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:any", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:variant", + "@re2//:re2", ], "//conditions:default": [], }) + select({ @@ -167,6 +171,16 @@ cc_library( }), ) +# `gtest`, but testonly. See guidance on `gtest` for when to use this. +alias( + name = "gtest_for_library", + actual = ":gtest", + testonly = True, +) + +# Implements main() for tests using gtest. Prefer to depend on `gtest` as well +# to ensure compliance with the layering_check Bazel feature where only the +# direct hdrs values are available. cc_library( name = "gtest_main", srcs = ["googlemock/src/gmock_main.cc"], diff --git a/contrib/googletest/CMakeLists.txt b/contrib/googletest/CMakeLists.txt index 512e5c3d480f..0567ae7daa32 100644 --- a/contrib/googletest/CMakeLists.txt +++ b/contrib/googletest/CMakeLists.txt @@ -1,10 +1,10 @@ # Note: CMake support is community-based. The maintainers do not use CMake # internally. -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(googletest-distribution) -set(GOOGLETEST_VERSION 1.15.2) +set(GOOGLETEST_VERSION 1.17.0) if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/contrib/googletest/MODULE.bazel b/contrib/googletest/MODULE.bazel index 61d5e2223512..5cb0b156f40c 100644 --- a/contrib/googletest/MODULE.bazel +++ b/contrib/googletest/MODULE.bazel @@ -32,38 +32,45 @@ module( name = "googletest", - version = "1.15.2", + version = "1.17.0", compatibility_level = 1, ) # Only direct dependencies need to be listed below. # Please keep the versions in sync with the versions in the WORKSPACE file. -bazel_dep(name = "abseil-cpp", - version = "20240116.2", - repo_name = "com_google_absl") - -bazel_dep(name = "platforms", - version = "0.0.10") - -bazel_dep(name = "re2", - repo_name = "com_googlesource_code_re2", - version = "2024-07-02") +bazel_dep( + name = "abseil-cpp", + version = "20250127.1", +) +bazel_dep( + name = "platforms", + version = "0.0.11", +) +bazel_dep( + name = "re2", + version = "2024-07-02.bcr.1", +) -bazel_dep(name = "rules_python", - version = "0.34.0", - dev_dependency = True) +bazel_dep( + name = "rules_python", + version = "1.3.0", + dev_dependency = True, +) # https://rules-python.readthedocs.io/en/stable/toolchains.html#library-modules-with-dev-only-python-usage python = use_extension( "@rules_python//python/extensions:python.bzl", "python", - dev_dependency = True + dev_dependency = True, +) +python.toolchain( + ignore_root_user_error = True, + is_default = True, + python_version = "3.12", ) -python.toolchain(python_version = "3.12", - is_default = True, - ignore_root_user_error = True) - -fake_fuchsia_sdk = use_repo_rule("//:fake_fuchsia_sdk.bzl", "fake_fuchsia_sdk") -fake_fuchsia_sdk(name = "fuchsia_sdk") +# See fake_fuchsia_sdk.bzl for instructions on how to override this with a real SDK, if needed. +fuchsia_sdk = use_extension("//:fake_fuchsia_sdk.bzl", "fuchsia_sdk") +fuchsia_sdk.create_fake() +use_repo(fuchsia_sdk, "fuchsia_sdk") diff --git a/contrib/googletest/README.md b/contrib/googletest/README.md index f50c670534d5..598cf31242b7 100644 --- a/contrib/googletest/README.md +++ b/contrib/googletest/README.md @@ -2,27 +2,18 @@ ### Announcements -#### Live at Head - -GoogleTest now follows the -[Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support). -We recommend -[updating to the latest commit in the `main` branch as often as possible](https://github.com/abseil/abseil-cpp/blob/master/FAQ.md#what-is-live-at-head-and-how-do-i-do-it). -We do publish occasional semantic versions, tagged with -`v${major}.${minor}.${patch}` (e.g. `v1.15.0`). - #### Documentation Updates Our documentation is now live on GitHub Pages at https://google.github.io/googletest/. We recommend browsing the documentation on GitHub Pages rather than directly in the repository. -#### Release 1.15.0 +#### Release 1.17.0 -[Release 1.15.0](https://github.com/google/googletest/releases/tag/v1.15.0) is +[Release 1.17.0](https://github.com/google/googletest/releases/tag/v1.17.0) is now available. -The 1.15.x branch requires at least C++14. +The 1.17.x branch [requires at least C++17]((https://opensource.google/documentation/policies/cplusplus-support#c_language_standard). #### Continuous Integration diff --git a/contrib/googletest/WORKSPACE b/contrib/googletest/WORKSPACE index 218e6c2e8c2b..0ae5dee92baf 100644 --- a/contrib/googletest/WORKSPACE +++ b/contrib/googletest/WORKSPACE @@ -1,4 +1,34 @@ -workspace(name = "com_google_googletest") +# Copyright 2024 Google Inc. +# All Rights Reserved. +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * 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. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "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 COPYRIGHT +# OWNER OR CONTRIBUTORS 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. + +workspace(name = "googletest") load("//:googletest_deps.bzl", "googletest_deps") googletest_deps() @@ -6,13 +36,12 @@ googletest_deps() load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "rules_python", - sha256 = "d71d2c67e0bce986e1c5a7731b4693226867c45bfe0b7c5e0067228a536fc580", - strip_prefix = "rules_python-0.29.0", - urls = ["https://github.com/bazelbuild/rules_python/releases/download/0.29.0/rules_python-0.29.0.tar.gz"], + name = "rules_python", + sha256 = "2cc26bbd53854ceb76dd42a834b1002cd4ba7f8df35440cf03482e045affc244", + strip_prefix = "rules_python-1.3.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.3.0/rules_python-1.3.0.tar.gz", ) - -# https://github.com/bazelbuild/rules_python/releases/tag/0.29.0 +# https://github.com/bazelbuild/rules_python/releases/tag/1.1.0 load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() @@ -25,8 +54,8 @@ http_archive( http_archive( name = "platforms", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", ], - sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee", + sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f", ) diff --git a/contrib/googletest/ci/linux-presubmit.sh b/contrib/googletest/ci/linux-presubmit.sh index 6d2b3fb573a0..6491e79844b8 100644 --- a/contrib/googletest/ci/linux-presubmit.sh +++ b/contrib/googletest/ci/linux-presubmit.sh @@ -31,51 +31,68 @@ set -euox pipefail -readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20240523" -readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20230120" +readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20241218" +readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250205" if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" fi if [[ -z ${STD:-} ]]; then - STD="c++14 c++17 c++20" + STD="c++17 c++20" fi -# Test the CMake build -for cc in /usr/local/bin/gcc /opt/llvm/clang/bin/clang; do - for cmake_off_on in OFF ON; do - time docker run \ - --volume="${GTEST_ROOT}:/src:ro" \ - --tmpfs="/build:exec" \ - --workdir="/build" \ - --rm \ - --env="CC=${cc}" \ - --env=CXXFLAGS="-Werror -Wdeprecated" \ - ${LINUX_LATEST_CONTAINER} \ - /bin/bash -c " - cmake /src \ - -DCMAKE_CXX_STANDARD=14 \ - -Dgtest_build_samples=ON \ - -Dgtest_build_tests=ON \ - -Dgmock_build_tests=ON \ - -Dcxx_no_exception=${cmake_off_on} \ - -Dcxx_no_rtti=${cmake_off_on} && \ - make -j$(nproc) && \ - ctest -j$(nproc) --output-on-failure" - done +# Test CMake + GCC +for cmake_off_on in OFF ON; do + time docker run \ + --volume="${GTEST_ROOT}:/src:ro" \ + --tmpfs="/build:exec" \ + --workdir="/build" \ + --rm \ + --env="CC=/usr/local/bin/gcc" \ + --env=CXXFLAGS="-Werror -Wdeprecated" \ + ${LINUX_LATEST_CONTAINER} \ + /bin/bash -c " + cmake /src \ + -DCMAKE_CXX_STANDARD=17 \ + -Dgtest_build_samples=ON \ + -Dgtest_build_tests=ON \ + -Dgmock_build_tests=ON \ + -Dcxx_no_exception=${cmake_off_on} \ + -Dcxx_no_rtti=${cmake_off_on} && \ + make -j$(nproc) && \ + ctest -j$(nproc) --output-on-failure" +done + +# Test CMake + Clang +for cmake_off_on in OFF ON; do + time docker run \ + --volume="${GTEST_ROOT}:/src:ro" \ + --tmpfs="/build:exec" \ + --workdir="/build" \ + --rm \ + --env="CC=/opt/llvm/clang/bin/clang" \ + --env=CXXFLAGS="-Werror -Wdeprecated --gcc-toolchain=/usr/local" \ + ${LINUX_LATEST_CONTAINER} \ + /bin/bash -c " + cmake /src \ + -DCMAKE_CXX_STANDARD=17 \ + -Dgtest_build_samples=ON \ + -Dgtest_build_tests=ON \ + -Dgmock_build_tests=ON \ + -Dcxx_no_exception=${cmake_off_on} \ + -Dcxx_no_rtti=${cmake_off_on} && \ + make -j$(nproc) && \ + ctest -j$(nproc) --output-on-failure" done # Do one test with an older version of GCC -# TODO(googletest-team): This currently uses Bazel 5. When upgrading to a -# version of Bazel that supports Bzlmod, add --enable_bzlmod=false to keep test -# coverage for the old WORKSPACE dependency management. time docker run \ --volume="${GTEST_ROOT}:/src:ro" \ --workdir="/src" \ --rm \ --env="CC=/usr/local/bin/gcc" \ - --env="BAZEL_CXXOPTS=-std=c++14" \ + --env="BAZEL_CXXOPTS=-std=c++17" \ ${LINUX_GCC_FLOOR_CONTAINER} \ /usr/local/bin/bazel test ... \ --copt="-Wall" \ @@ -83,6 +100,7 @@ time docker run \ --copt="-Wuninitialized" \ --copt="-Wundef" \ --copt="-Wno-error=pragmas" \ + --enable_bzlmod=false \ --features=external_include_paths \ --keep_going \ --show_timestamps \ diff --git a/contrib/googletest/ci/macos-presubmit.sh b/contrib/googletest/ci/macos-presubmit.sh index 70eaa74fb490..5370ed60d3d8 100644 --- a/contrib/googletest/ci/macos-presubmit.sh +++ b/contrib/googletest/ci/macos-presubmit.sh @@ -31,6 +31,9 @@ set -euox pipefail +# Use Xcode 16.0 +sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer + if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" fi @@ -40,20 +43,20 @@ for cmake_off_on in OFF ON; do BUILD_DIR=$(mktemp -d build_dir.XXXXXXXX) cd ${BUILD_DIR} time cmake ${GTEST_ROOT} \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -Dgtest_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ -Dcxx_no_exception=${cmake_off_on} \ -Dcxx_no_rtti=${cmake_off_on} - time make + time make -j$(nproc) time ctest -j$(nproc) --output-on-failure done # Test the Bazel build # If we are running on Kokoro, check for a versioned Bazel binary. -KOKORO_GFILE_BAZEL_BIN="bazel-7.0.0-darwin-x86_64" +KOKORO_GFILE_BAZEL_BIN="bazel-8.0.0-darwin-x86_64" if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" chmod +x ${BAZEL_BIN} @@ -67,7 +70,7 @@ for absl in 0 1; do --copt="-Wall" \ --copt="-Werror" \ --copt="-Wundef" \ - --cxxopt="-std=c++14" \ + --cxxopt="-std=c++17" \ --define="absl=${absl}" \ --enable_bzlmod=true \ --features=external_include_paths \ diff --git a/contrib/googletest/ci/windows-presubmit.bat b/contrib/googletest/ci/windows-presubmit.bat index 1adc1a16ffa8..e2664c538da6 100644 --- a/contrib/googletest/ci/windows-presubmit.bat +++ b/contrib/googletest/ci/windows-presubmit.bat @@ -1,6 +1,6 @@ SETLOCAL ENABLEDELAYEDEXPANSION -SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-7.0.0-windows-x86_64.exe +SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-8.0.0-windows-x86_64.exe SET PATH=C:\Python34;%PATH% SET BAZEL_PYTHON=C:\python34\python.exe @@ -11,21 +11,18 @@ SET CTEST_OUTPUT_ON_FAILURE=1 SET CMAKE_BUILD_PARALLEL_LEVEL=16 SET CTEST_PARALLEL_LEVEL=16 -IF EXIST git\googletest ( - CD git\googletest -) ELSE IF EXIST github\googletest ( - CD github\googletest -) - +SET GTEST_ROOT=%~dp0\.. IF %errorlevel% neq 0 EXIT /B 1 :: ---------------------------------------------------------------------------- :: CMake -MKDIR cmake_msvc2022 -CD cmake_msvc2022 +SET CMAKE_BUILD_PATH=cmake_msvc2022 +MKDIR %CMAKE_BUILD_PATH% +CD %CMAKE_BUILD_PATH% -%CMAKE_BIN% .. ^ +%CMAKE_BIN% %GTEST_ROOT% ^ -G "Visual Studio 17 2022" ^ + -DCMAKE_CXX_STANDARD=17 ^ -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^ -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^ -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^ @@ -40,8 +37,8 @@ IF %errorlevel% neq 0 EXIT /B 1 %CTEST_BIN% -C Debug --timeout 600 IF %errorlevel% neq 0 EXIT /B 1 -CD .. -RMDIR /S /Q cmake_msvc2022 +CD %GTEST_ROOT% +RMDIR /S /Q %CMAKE_BUILD_PATH% :: ---------------------------------------------------------------------------- :: Bazel @@ -50,11 +47,26 @@ RMDIR /S /Q cmake_msvc2022 :: because of Windows limitations on path length. :: --output_user_root=C:\tmp causes Bazel to use a shorter path. SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community + +:: C++17 +%BAZEL_EXE% ^ + --output_user_root=C:\tmp ^ + test ... ^ + --compilation_mode=dbg ^ + --copt=/std:c++17 ^ + --copt=/WX ^ + --enable_bzlmod=true ^ + --keep_going ^ + --test_output=errors ^ + --test_tag_filters=-no_test_msvc2017 +IF %errorlevel% neq 0 EXIT /B 1 + +:: C++20 %BAZEL_EXE% ^ --output_user_root=C:\tmp ^ test ... ^ --compilation_mode=dbg ^ - --copt=/std:c++14 ^ + --copt=/std:c++20 ^ --copt=/WX ^ --enable_bzlmod=true ^ --keep_going ^ diff --git a/contrib/googletest/docs/advanced.md b/contrib/googletest/docs/advanced.md index 240588a83b4e..9b1220a1e09a 100644 --- a/contrib/googletest/docs/advanced.md +++ b/contrib/googletest/docs/advanced.md @@ -286,7 +286,7 @@ For example: ```c++ TEST(SkipTest, DoesSkip) { GTEST_SKIP() << "Skipping single test"; - EXPECT_EQ(0, 1); // Won't fail; it won't be executed + FAIL(); // Won't fail; it won't be executed } class SkipFixture : public ::testing::Test { @@ -298,7 +298,7 @@ class SkipFixture : public ::testing::Test { // Tests for SkipFixture won't be executed. TEST_F(SkipFixture, SkipsOneTest) { - EXPECT_EQ(5, 7); // Won't fail + FAIL(); // Won't fail; it won't be executed } ``` @@ -405,6 +405,51 @@ EXPECT_TRUE(IsCorrectPointIntVector(point_ints)) For more details regarding `AbslStringify()` and its integration with other libraries, see go/abslstringify. +## Regular Expression Syntax + +When built with Bazel and using Abseil, GoogleTest uses the +[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX +systems (Linux, Cygwin, Mac), GoogleTest uses the +[POSIX extended regular expression](https://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) +syntax. To learn about POSIX syntax, you may want to read this +[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended). + +On Windows, GoogleTest uses its own simple regular expression implementation. It +lacks many features. For example, we don't support union (`"x|y"`), grouping +(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among +others. Below is what we do support (`A` denotes a literal character, period +(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular +expressions.): + +Expression | Meaning +---------- | -------------------------------------------------------------- +`c` | matches any literal character `c` +`\\d` | matches any decimal digit +`\\D` | matches any character that's not a decimal digit +`\\f` | matches `\f` +`\\n` | matches `\n` +`\\r` | matches `\r` +`\\s` | matches any ASCII whitespace, including `\n` +`\\S` | matches any character that's not a whitespace +`\\t` | matches `\t` +`\\v` | matches `\v` +`\\w` | matches any letter, `_`, or decimal digit +`\\W` | matches any character that `\\w` doesn't match +`\\c` | matches any literal character `c`, which must be a punctuation +`.` | matches any single character except `\n` +`A?` | matches 0 or 1 occurrences of `A` +`A*` | matches 0 or many occurrences of `A` +`A+` | matches 1 or many occurrences of `A` +`^` | matches the beginning of a string (not that of each line) +`$` | matches the end of a string (not that of each line) +`xy` | matches `x` followed by `y` + +To help you determine which capability is available on your system, GoogleTest +defines macros to govern which regular expression it is using. The macros are: +`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death +tests to work in all cases, you can either `#if` on these macros or use the more +limited syntax only. + ## Death Tests In many applications, there are assertions that can cause application failure if @@ -416,7 +461,7 @@ corruption, security holes, or worse. Hence it is vitally important to test that such assertion statements work as expected. Since these precondition checks cause the processes to die, we call such tests -_death tests_. More generally, any test that checks that a program terminates +*death tests*. More generally, any test that checks that a program terminates (except by throwing an exception) in an expected fashion is also a death test. Note that if a piece of code throws an exception, we don't consider it "death" @@ -462,6 +507,12 @@ verifies that: exit with exit code 0, and * calling `KillProcess()` kills the process with signal `SIGKILL`. +{: .callout .warning} +Warning: If your death test contains mocks and is expecting a specific exit +code, then you must allow the mock objects to be leaked via `Mock::AllowLeak`. +This is because the mock leak detector will exit with its own error code if it +detects a leak. + The test function body may contain other assertions and statements as well, if necessary. @@ -503,51 +554,6 @@ TEST_F(FooDeathTest, DoesThat) { } ``` -### Regular Expression Syntax - -When built with Bazel and using Abseil, GoogleTest uses the -[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX -systems (Linux, Cygwin, Mac), GoogleTest uses the -[POSIX extended regular expression](https://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax. To learn about POSIX syntax, you may want to read this -[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended). - -On Windows, GoogleTest uses its own simple regular expression implementation. It -lacks many features. For example, we don't support union (`"x|y"`), grouping -(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among -others. Below is what we do support (`A` denotes a literal character, period -(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular -expressions.): - -Expression | Meaning ----------- | -------------------------------------------------------------- -`c` | matches any literal character `c` -`\\d` | matches any decimal digit -`\\D` | matches any character that's not a decimal digit -`\\f` | matches `\f` -`\\n` | matches `\n` -`\\r` | matches `\r` -`\\s` | matches any ASCII whitespace, including `\n` -`\\S` | matches any character that's not a whitespace -`\\t` | matches `\t` -`\\v` | matches `\v` -`\\w` | matches any letter, `_`, or decimal digit -`\\W` | matches any character that `\\w` doesn't match -`\\c` | matches any literal character `c`, which must be a punctuation -`.` | matches any single character except `\n` -`A?` | matches 0 or 1 occurrences of `A` -`A*` | matches 0 or many occurrences of `A` -`A+` | matches 1 or many occurrences of `A` -`^` | matches the beginning of a string (not that of each line) -`$` | matches the end of a string (not that of each line) -`xy` | matches `x` followed by `y` - -To help you determine which capability is available on your system, GoogleTest -defines macros to govern which regular expression it is using. The macros are: -`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death -tests to work in all cases, you can either `#if` on these macros or use the more -limited syntax only. - ### How It Works See [Death Assertions](reference/assertions.md#death) in the Assertions @@ -727,7 +733,7 @@ Some tips on using `SCOPED_TRACE`: ### Propagating Fatal Failures A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the _current function_, not the entire test. For +when they fail they only abort the *current function*, not the entire test. For example, the following test will segfault: ```c++ @@ -1923,6 +1929,20 @@ the `--gtest_also_run_disabled_tests` flag or set the You can combine this with the `--gtest_filter` flag to further select which disabled tests to run. +### Enforcing Having At Least One Test Case + +A not uncommon programmer mistake is to write a test program that has no test +case linked in. This can happen, for example, when you put test case definitions +in a library and the library is not marked as "always link". + +To catch such mistakes, run the test program with the +`--gtest_fail_if_no_test_linked` flag or set the `GTEST_FAIL_IF_NO_TEST_LINKED` +environment variable to a value other than `0`. Now the program will fail if no +test case is linked in. + +Note that *any* test case linked in makes the program valid for the purpose of +this check. In particular, even a disabled test case suffices. + ### Repeating the Tests Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it @@ -2382,7 +2402,7 @@ IMPORTANT: The exact format of the JSON document is subject to change. #### Detecting Test Premature Exit -Google Test implements the _premature-exit-file_ protocol for test runners to +Google Test implements the *premature-exit-file* protocol for test runners to catch any kind of unexpected exits of test programs. Upon start, Google Test creates the file which will be automatically deleted after all work has been finished. Then, the test runner can check if this file exists. In case the file diff --git a/contrib/googletest/docs/faq.md b/contrib/googletest/docs/faq.md index c7d10b5006ba..4e958384673a 100644 --- a/contrib/googletest/docs/faq.md +++ b/contrib/googletest/docs/faq.md @@ -511,19 +511,6 @@ However, there are cases where you have to define your own: list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) -## Why does ASSERT_DEATH complain about previous threads that were already joined? - -With the Linux pthread library, there is no turning back once you cross the line -from a single thread to multiple threads. The first time you create a thread, a -manager thread is created in addition, so you get 3, not 2, threads. Later when -the thread you create joins the main thread, the thread count decrements by 1, -but the manager thread will never be killed, so you still have 2 threads, which -means you cannot safely run a death test. - -The new NPTL thread library doesn't suffer from this problem, as it doesn't -create a manager thread. However, if you don't control which machine your test -runs on, you shouldn't depend on this. - ## Why does GoogleTest require the entire test suite, instead of individual tests, to be named `*DeathTest` when it uses `ASSERT_DEATH`? GoogleTest does not interleave tests from different test suites. That is, it diff --git a/contrib/googletest/docs/gmock_cook_book.md b/contrib/googletest/docs/gmock_cook_book.md index f1b10b472d27..9e59b4cf438c 100644 --- a/contrib/googletest/docs/gmock_cook_book.md +++ b/contrib/googletest/docs/gmock_cook_book.md @@ -177,7 +177,7 @@ class StackInterface { template class MockStack : public StackInterface { ... - MOCK_METHOD(int, GetSize, (), (override)); + MOCK_METHOD(int, GetSize, (), (const, override)); MOCK_METHOD(void, Push, (const Elem& x), (override)); }; ``` @@ -936,8 +936,8 @@ casts a matcher `m` to type `Matcher`. To ensure safety, gMock checks that floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and -3. When `U` is a reference, `T` must also be a reference (as the underlying - matcher may be interested in the address of the `U` value). +3. When `U` is a non-const reference, `T` must also be a reference (as the + underlying matcher may be interested in the address of the `U` value). The code won't compile if any of these conditions isn't met. @@ -3387,9 +3387,9 @@ With this definition, the above assertion will give a better message: #### Using EXPECT_ Statements in Matchers -You can also use `EXPECT_...` (and `ASSERT_...`) statements inside custom -matcher definitions. In many cases, this allows you to write your matcher more -concisely while still providing an informative error message. For example: +You can also use `EXPECT_...` statements inside custom matcher definitions. In +many cases, this allows you to write your matcher more concisely while still +providing an informative error message. For example: ```cpp MATCHER(IsDivisibleBy7, "") { @@ -3419,14 +3419,14 @@ itself, as gMock already prints it for you. #### Argument Types -The type of the value being matched (`arg_type`) is determined by the -context in which you use the matcher and is supplied to you by the compiler, so -you don't need to worry about declaring it (nor can you). This allows the -matcher to be polymorphic. For example, `IsDivisibleBy7()` can be used to match -any type where the value of `(arg % 7) == 0` can be implicitly converted to a *** 5170 LINES SKIPPED *** From nobody Sun Feb 22 03:47: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 4fJVL11qr9z6Ss77 for ; Sun, 22 Feb 2026 03:47: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 4fJVL06tHVz3RM2 for ; Sun, 22 Feb 2026 03:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+3aNQ4DiCNF5bctl1SgEGaS1qbDxt16M8B1lv+u/jI=; b=uvb3pS4ETqq8/17iBM2o8M/eeNI5Mi9fVsxFKjoH46neuaKgtPFSKaljajYCr2srA9W/gj NQMAu9Ga27rpNI7IJFfkmm3mdnoHpWYeUs8pzNOLsyX1cQxdRu50VjDQy4wSQBrbbyp3Gv Yhd1YJrkGfNvGYDCcirSreQ/vxobvr4KIqsVGeniw1qQM0NiN+DFWrGQoib8petFkJX/aR mLgsi6KeG+/vs/dh/R1rjcg9ZRqgpG1JoiuRCbSgswELiZrl5bzVuvsZ1IToNKh84hvg8T 2LCfxDPn1fM4F7ARZqrsPj7tpltllam5QPJpERjQPxSV3pOx5uHYJpzQZa9pXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732041; a=rsa-sha256; cv=none; b=rqXtn/k6DThOF3zyi5/LSp6LAW/sTOfijCRm+lM4/h1VgezNOxxqY6I2B+Bq99af0a4Fqj us4wbPkFJRLTBpgNNQP12WpVatE0yFiaA2w8+d5iNaokmvEfs0yk5naqijqopn/cZ03qN4 cNhSxxcdkpvYKZ2geImHVGG4RbQQwNfImxqTLZrAFZs2G2/jR4KUQ+TMsIVHZRMQVcczuq el7a0FBGvgtSV3dneFwpBvV/glaDXJT8GXoY6Pa7vpT8Q1v9Or/tJHaG5rjaB/Ltz7bv0i 6xtTE9cgmZ8QTqcPj3Ge9NC4FukOVqx7o4Q6V23I+EgroAE5SvbrIl8US5MTbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+3aNQ4DiCNF5bctl1SgEGaS1qbDxt16M8B1lv+u/jI=; b=ECmtTknrhgaHvYd671/l5F1x3IDOPgBmHR48LhAn+Ae2kaAdjLaA2Azp+oMhyR8dUlJ7k1 rdv+bksz3me1IjBoUmgKfdZI2BoSFsYrHTKfbqcdeeHIzMb6SP/dbDHFJe6d7tAy7Um3Su AlBJW95GsgVLVd0pHyjgaUYQUIGwjBxprpHobn5FZv/hXu35s/Yy+xhgeV+HuDV/D6wx6s dPzrCYbwaZmeFyFAE7Gv2YJIYmB2OJeviICAv1L9JMmFdKobBElfnubvBuekA8/AnChwnw 8Yy40in41TtTFa2iMcywFk49KDnx4q3jlb6hiGUz83zTSIxyMknYdZ0gBhHcJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVL06NbLzC0H for ; Sun, 22 Feb 2026 03:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21753 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:47:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 5a9164c4539d - stable/14 - gtest.cc: declare fail_if_no_test_linked 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a9164c4539dfea8e1120673b5da038c65b53958 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:47:20 +0000 Message-Id: <699a7c48.21753.357ae452@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=5a9164c4539dfea8e1120673b5da038c65b53958 commit 5a9164c4539dfea8e1120673b5da038c65b53958 Author: Enji Cooper AuthorDate: 2026-01-29 01:22:42 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:45:57 +0000 gtest.cc: declare fail_if_no_test_linked flag Clang's -Wmissing-variable-declarations flags this as an issue since the flag is only used in `gtest.cc`. Declare the flag beforehand to ensure that the variable scope is properly limited to `gtest.cc`. MFC after: 1 week MFC with: 46333229c6a0187ebf231805682ee0bceed704d1 Ref: https://github.com/google/googletest/pull/4898 (cherry picked from commit 3926ae98adfe4b2f1dd957cab353ba7ca11ce709) --- contrib/googletest/googletest/src/gtest.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/googletest/googletest/src/gtest.cc b/contrib/googletest/googletest/src/gtest.cc index 09af15179f1f..0e32774bc6d1 100644 --- a/contrib/googletest/googletest/src/gtest.cc +++ b/contrib/googletest/googletest/src/gtest.cc @@ -263,6 +263,7 @@ GTEST_DEFINE_bool_( testing::GetDefaultFailFast()), "True if and only if a test failure should stop further test execution."); +GTEST_DECLARE_bool_(fail_if_no_test_linked); GTEST_DEFINE_bool_( fail_if_no_test_linked, testing::internal::BoolFromGTestEnv("fail_if_no_test_linked", false), From nobody Sun Feb 22 03:54: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 4fJVVn0Txmz6SsLR for ; Sun, 22 Feb 2026 03:54: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 4fJVVn03V0z3SjV for ; Sun, 22 Feb 2026 03:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kk0j2birYFVTVvEHfi5ieZU+itTIuTfpAzwf7BDHvEI=; b=LeW1hVpMgJERwbIXet7dva0SbH3nJkI2zN87Svx4FBkE7th5Wcs3T3XkJrZkjwt0JgP/Bu vSZWtRue+QFry2ekHgFg+YdW65lbMLOW0efl0tpHi6VjbVKVJzqqVe2ABMXTqu01WGdGZC 2BS03881lbr/dSs8mE4DsRhN7MOhvfJgg51ZvKM7MuFLbdPb13B3dzInDQxkds5tk099HI cULj2CIzz2P/+MsdPW4JxNR9FKcMAMKvrutI86G1xf2R35ROGqIk7YfWMCEGlNMAahqj3G CSk/2vnL+UVjgZlae18MwKILoG2F8S7CNGSlltEJDa3uVdKkYFf1zin15FUjVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732497; a=rsa-sha256; cv=none; b=Gyq3nIBFzYUz2vy0dzV7ewX743smQzk6g2TckB1+xjMO8ns0IStpmqISJULVOwEo4oOmE9 inxQakx/xO3IUnaq8iN/QxLN32GhqUhbHGEkbQZuaQD9hiJ0BkG3cF3drQ1P/JB6MqbjFO B/tqsU0ON7i/J/WeHs4zJhkjJSr6sSsvsGIc/Wn9eIgwhxWBB0hl0QyOUYqDyrqhfBlVgH yXZuyW4tlmJ/5l7hgohx0i8dKU1bL6sCqcMEQD2cKY6461XwypgsjZrr8PPZgRKm6rBat0 2mzb27VE7TCUECU5Hwtay5jrFX4UKZHIpiqqQLstWNTHWpdjiH8xyXSfXXmowA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kk0j2birYFVTVvEHfi5ieZU+itTIuTfpAzwf7BDHvEI=; b=XBegYeDMt2NeJiQ7IHM9qLkjx/kn6X/6CtO6+MqRKjJoeCK7rkvZonmVH9+U25YhpL24dI 8WAZBHZc8uhOGt/YR8I+Ss+SYVqqXERKCR0KUX3Zodcljfkwzg2CjRg0OKd+g3M8mqc4sk 6l8aPLF1aWcm6W1jYABEYqoJDk0x0E4kUpTkO/39t/8Ozbb7cJsui9yD7w/0AIH2PKV189 4i4LFoLrFRX2O08qlnIgpYUEvcA1jJMNmGF8pAbgUThXyYYbx6qgQygozvHF3DWv1YvDBF FdqkZcGs2ZE9tp7pqVOp0HSOb7PDCrGm6ngn5zlOA45GajUmtEjtXNmWS+YC1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVVm6k4XzCGG for ; Sun, 22 Feb 2026 03:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:54:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 1bebef5c953a - stable/14 - Bump CXXSTD to C++17 with GoogleTest tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 1bebef5c953a007244e16a9ba58a10e6137442b8 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:54:56 +0000 Message-Id: <699a7e10.21cda.562e3786@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1bebef5c953a007244e16a9ba58a10e6137442b8 commit 1bebef5c953a007244e16a9ba58a10e6137442b8 Author: Enji Cooper AuthorDate: 2026-02-22 03:51:59 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:53:27 +0000 Bump CXXSTD to C++17 with GoogleTest tests This change bumps the CXXSTD to C++17 with GoogleTest 1.17.0 requires C++17 to function and 6527682ab7058e5023a was never MFCed. This unbreaks the build on stable/14. This is a direct commit to stable/14. Fixes: 227baf32d ("GoogleTest: import 1.17.0") --- share/mk/googletest.test.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk index 05415775448b..af28c5d05ecf 100644 --- a/share/mk/googletest.test.inc.mk +++ b/share/mk/googletest.test.inc.mk @@ -9,6 +9,6 @@ GTESTS_CXXFLAGS+= -frtti # libgmock's, etc, headers. CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private -CXXSTD?= c++14 +CXXSTD?= c++17 NO_WTHREAD_SAFETY= From nobody Sun Feb 22 03:59:14 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJVbl20vwz6Sss8 for ; Sun, 22 Feb 2026 03:59: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 4fJVbk6zWqz3T9M for ; Sun, 22 Feb 2026 03:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJ6A5OM4cBDCrBoVuh6NrL9Sv+2/sPpCYobL+Q7J4zw=; b=I8xD1dYFP4RlrbS7ruQufAcmqP9n8kxjQmRXsPkgftp7br6OVE7gUyvRHcAY5kd5lGpLvu 74UlWEeOYZaDiSYxQDC1RNRGir5gXrin/o8VhtDa3avHHj+KuCOjnOHpkgrVtP9hvIWycU MnhEJx5tDa8cWyr9hT3nfTitE0HAMwbLLOM1VX75r0X8UKAJoExVyuEJxyauK6+u5g5i2T KhOfCj4ZSwZ603fVya+shDOfSdUlg+3Qy0Ds30MrImwUKSUhyLpLI7VReYyUCfqE0YF+4z DuW311oK+UuXL4tu3Gg4y3tbJTcVy84AEIj03dDzdS8g3eOISieHxGrTYbnGaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732754; a=rsa-sha256; cv=none; b=x3L/RdxGGLit8PUXssq2mcNgVur9WnlvB1cFw4uH+9nhhChq/vosI1yX/tOON9ZjXNDD9a uTSckQsDIIeTB6vTIWE17OcqxAtNkh0crqYL9wfmsYEb3IucWxpmjZnMIEaLF/e53wnPw/ mXymHcCtxqY7kO0qqur2Q6n6BOF4jEJINdx+yvjQ/pspl6+VX59VPOqm1Ue3/XrzSDEIZK Zpc7D/RasX2ZpVZV8sfjsnqErpQjvXgquzr1uRTv6acVrB/cQdqaZfDQaYL1AP6AzqVgIm az5xlx9gcp5XgXgfoLeOwUUKpbody4YuobmU63dAQ4XqXA0AuEBDWeNF5lebOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJ6A5OM4cBDCrBoVuh6NrL9Sv+2/sPpCYobL+Q7J4zw=; b=hDMGxso5cDgbC7hcARetOWOqKF8O+jCp/jFTWVoW01NnUfO2hVgpoI0T+8g/ISTvUFvfa/ qMpBRzbAQ1gJKh6xEByxmVCnbBOAAGpTCqlLzygRlkC3XtgFY8Ygca+330L3V2gsi/X03v 2TBm/i2PUuCPo6rZ0I3CmCjDSTUZ3fp7r2F0IhP9SOUHMjcUJRSr7yFZL3eq0gyxfGlO0V jsU8sh6FCXZdo4pJMppY43yjYCePM4cF6pqLtqRRGA9eV9IE6Xz5i3O+O+XwWp/Wamb6Fv OpsWphaZCqBH4k8mmuQuZCh3rpQlAjy2I0CG+lmR0Sdwtb3iX53xSwaEog+uJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVbk63qLzCJt for ; Sun, 22 Feb 2026 03:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 237a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:59:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 0029027156f4 - stable/15 - GoogleTest: import 1.17.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0029027156f419fc60839ed87863eedccabfde5c Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:59:14 +0000 Message-Id: <699a7f12.237a8.5e17861a@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0029027156f419fc60839ed87863eedccabfde5c commit 0029027156f419fc60839ed87863eedccabfde5c Author: Enji Cooper AuthorDate: 2026-01-29 01:24:01 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:45:50 +0000 GoogleTest: import 1.17.0 The changes between the two versions can be found in this diff of the two release tags: https://github.com/google/googletest/compare/v1.15.2...v1.17.0 One notable change is that GoogleTest 1.17.0 now requires C++-17 to build. MFC after: 1 week Merge commit '3a4c29b5bed4ea20266ad9371fbfdc6bca088f92' (cherry picked from commit 46333229c6a0187ebf231805682ee0bceed704d1) --- contrib/googletest/.github/workflows/gtest-ci.yml | 43 --- contrib/googletest/.gitignore | 1 + contrib/googletest/.travis.yml | 81 ---- contrib/googletest/BUILD.bazel | 40 +- contrib/googletest/CMakeLists.txt | 4 +- contrib/googletest/MODULE.bazel | 49 +-- contrib/googletest/README.md | 15 +- contrib/googletest/WORKSPACE | 49 ++- contrib/googletest/ci/linux-presubmit.sh | 76 ++-- contrib/googletest/ci/macos-presubmit.sh | 11 +- contrib/googletest/ci/windows-presubmit.bat | 38 +- contrib/googletest/docs/advanced.md | 120 +++--- contrib/googletest/docs/faq.md | 13 - contrib/googletest/docs/gmock_cook_book.md | 73 +++- contrib/googletest/docs/primer.md | 4 +- contrib/googletest/docs/quickstart-bazel.md | 53 ++- contrib/googletest/docs/reference/actions.md | 3 +- contrib/googletest/docs/reference/assertions.md | 11 +- contrib/googletest/docs/reference/matchers.md | 11 +- contrib/googletest/docs/reference/testing.md | 99 ++++- contrib/googletest/fake_fuchsia_sdk.bzl | 36 +- .../googlemock/include/gmock/gmock-actions.h | 119 +++++- .../googlemock/include/gmock/gmock-matchers.h | 419 +++++++++++++++++---- .../googlemock/include/gmock/gmock-more-actions.h | 16 +- .../googlemock/include/gmock/gmock-spec-builders.h | 10 +- .../include/gmock/internal/gmock-internal-utils.h | 5 - .../googlemock/include/gmock/internal/gmock-port.h | 1 + .../googlemock/src/gmock-cardinalities.cc | 8 +- .../googlemock/test/gmock-actions_test.cc | 78 +++- .../googlemock/test/gmock-function-mocker_test.cc | 4 +- .../test/gmock-matchers-arithmetic_test.cc | 237 ++++++++++-- .../test/gmock-matchers-comparisons_test.cc | 136 ++++++- .../test/gmock-matchers-containers_test.cc | 336 ++++++++++++++++- .../googlemock/test/gmock-matchers-misc_test.cc | 105 ++++-- .../googlemock/test/gmock-more-actions_test.cc | 49 ++- .../googletest/googlemock/test/gmock-pp_test.cc | 2 +- .../googlemock/test/gmock-spec-builders_test.cc | 7 +- .../googletest/googlemock/test/gmock_link_test.h | 2 +- contrib/googletest/googletest/README.md | 6 +- .../googletest/cmake/internal_utils.cmake | 2 +- .../include/gtest/gtest-assertion-result.h | 7 + .../googletest/include/gtest/gtest-matchers.h | 6 +- .../googletest/include/gtest/gtest-param-test.h | 134 +++++-- .../googletest/include/gtest/gtest-printers.h | 39 ++ .../googletest/include/gtest/gtest-typed-test.h | 126 +++---- .../googletest/googletest/include/gtest/gtest.h | 4 +- .../include/gtest/internal/gtest-internal.h | 84 ++--- .../include/gtest/internal/gtest-param-util.h | 62 ++- .../googletest/include/gtest/internal/gtest-port.h | 82 +--- .../googletest/googletest/src/gtest-internal-inl.h | 4 + contrib/googletest/googletest/src/gtest.cc | 191 ++++++++-- contrib/googletest/googletest/test/BUILD.bazel | 68 +++- .../googletest/test/googletest-filter-unittest.py | 19 + .../test/googletest-json-output-unittest.py | 111 +++++- .../googletest/test/googletest-param-test-test.cc | 70 ++++ .../googletest/test/googletest-printers-test.cc | 32 +- .../test/googletest-setuptestsuite-test_.cc | 4 +- .../googletest/googletest/test/gtest_unittest.cc | 56 ++- .../googletest/test/gtest_xml_output_unittest.py | 93 +++-- .../googletest/test/gtest_xml_output_unittest_.cc | 22 +- contrib/googletest/googletest_deps.bzl | 14 +- 61 files changed, 2684 insertions(+), 916 deletions(-) diff --git a/contrib/googletest/.github/workflows/gtest-ci.yml b/contrib/googletest/.github/workflows/gtest-ci.yml deleted file mode 100644 index 03a8cc5e287b..000000000000 --- a/contrib/googletest/.github/workflows/gtest-ci.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: ci - -on: - push: - pull_request: - -env: - BAZEL_CXXOPTS: -std=c++14 - -jobs: - Linux: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Tests - run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... - - macOS: - runs-on: macos-latest - steps: - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Tests - run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... - - - Windows: - runs-on: windows-latest - steps: - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Tests - run: bazel test --cxxopt=/std:c++14 --features=external_include_paths --test_output=errors ... diff --git a/contrib/googletest/.gitignore b/contrib/googletest/.gitignore index fede02f65093..f0df39db1d7e 100644 --- a/contrib/googletest/.gitignore +++ b/contrib/googletest/.gitignore @@ -8,6 +8,7 @@ bazel-genfiles bazel-googletest bazel-out bazel-testlogs +MODULE.bazel.lock # python *.pyc diff --git a/contrib/googletest/.travis.yml b/contrib/googletest/.travis.yml deleted file mode 100644 index 4e7413a4f9a3..000000000000 --- a/contrib/googletest/.travis.yml +++ /dev/null @@ -1,81 +0,0 @@ -# Build matrix / environment variable are explained on: -# https://docs.travis-ci.com/user/customizing-the-build/ -# This file can be validated on: -# http://lint.travis-ci.org/ - -sudo: false -language: cpp - -# Define the matrix explicitly, manually expanding the combinations of (os, compiler, env). -# It is more tedious, but grants us far more flexibility. -matrix: - include: - - os: linux - compiler: gcc - sudo : true - install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-bazel.sh - - os: linux - compiler: clang - sudo : true - install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-bazel.sh - - os: linux - group: deprecated-2017Q4 - compiler: gcc - install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-autotools.sh - - os: linux - group: deprecated-2017Q4 - compiler: gcc - env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 - - os: linux - group: deprecated-2017Q4 - compiler: clang - env: BUILD_TYPE=Debug VERBOSE=1 - - os: linux - group: deprecated-2017Q4 - compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - - os: linux - compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - - os: osx - compiler: gcc - env: BUILD_TYPE=Debug VERBOSE=1 - - os: osx - compiler: gcc - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - - os: osx - compiler: clang - env: BUILD_TYPE=Debug VERBOSE=1 - if: type != pull_request - - os: osx - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - if: type != pull_request - -# These are the install and build (script) phases for the most common entries in the matrix. They could be included -# in each entry in the matrix, but that is just repetitive. -install: - - ./ci/install-${TRAVIS_OS_NAME}.sh - - . ./ci/env-${TRAVIS_OS_NAME}.sh - - ./ci/log-config.sh - -script: ./ci/travis.sh - -# For sudo=false builds this section installs the necessary dependencies. -addons: - apt: - # List of whitelisted in travis packages for ubuntu-precise can be found here: - # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise - # List of whitelisted in travis apt-sources: - # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - packages: - - g++-4.9 - - clang-3.9 - -notifications: - email: false diff --git a/contrib/googletest/BUILD.bazel b/contrib/googletest/BUILD.bazel index e407ae29f44c..53501454ce4f 100644 --- a/contrib/googletest/BUILD.bazel +++ b/contrib/googletest/BUILD.bazel @@ -83,6 +83,10 @@ cc_library( ) # Google Test including Google Mock + +# For an actual test, use `gtest` and also `gtest_main` if you depend on gtest's +# main(). For a library, use `gtest_for_library` instead if the library can be +# testonly. cc_library( name = "gtest", srcs = glob( @@ -138,19 +142,19 @@ cc_library( }), deps = select({ ":has_absl": [ - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/debugging:failure_signal_handler", - "@com_google_absl//absl/debugging:stacktrace", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/flags:parse", - "@com_google_absl//absl/flags:reflection", - "@com_google_absl//absl/flags:usage", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:any", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", - "@com_googlesource_code_re2//:re2", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/debugging:failure_signal_handler", + "@abseil-cpp//absl/debugging:stacktrace", + "@abseil-cpp//absl/debugging:symbolize", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/flags:parse", + "@abseil-cpp//absl/flags:reflection", + "@abseil-cpp//absl/flags:usage", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:any", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:variant", + "@re2//:re2", ], "//conditions:default": [], }) + select({ @@ -167,6 +171,16 @@ cc_library( }), ) +# `gtest`, but testonly. See guidance on `gtest` for when to use this. +alias( + name = "gtest_for_library", + actual = ":gtest", + testonly = True, +) + +# Implements main() for tests using gtest. Prefer to depend on `gtest` as well +# to ensure compliance with the layering_check Bazel feature where only the +# direct hdrs values are available. cc_library( name = "gtest_main", srcs = ["googlemock/src/gmock_main.cc"], diff --git a/contrib/googletest/CMakeLists.txt b/contrib/googletest/CMakeLists.txt index 512e5c3d480f..0567ae7daa32 100644 --- a/contrib/googletest/CMakeLists.txt +++ b/contrib/googletest/CMakeLists.txt @@ -1,10 +1,10 @@ # Note: CMake support is community-based. The maintainers do not use CMake # internally. -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(googletest-distribution) -set(GOOGLETEST_VERSION 1.15.2) +set(GOOGLETEST_VERSION 1.17.0) if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/contrib/googletest/MODULE.bazel b/contrib/googletest/MODULE.bazel index 61d5e2223512..5cb0b156f40c 100644 --- a/contrib/googletest/MODULE.bazel +++ b/contrib/googletest/MODULE.bazel @@ -32,38 +32,45 @@ module( name = "googletest", - version = "1.15.2", + version = "1.17.0", compatibility_level = 1, ) # Only direct dependencies need to be listed below. # Please keep the versions in sync with the versions in the WORKSPACE file. -bazel_dep(name = "abseil-cpp", - version = "20240116.2", - repo_name = "com_google_absl") - -bazel_dep(name = "platforms", - version = "0.0.10") - -bazel_dep(name = "re2", - repo_name = "com_googlesource_code_re2", - version = "2024-07-02") +bazel_dep( + name = "abseil-cpp", + version = "20250127.1", +) +bazel_dep( + name = "platforms", + version = "0.0.11", +) +bazel_dep( + name = "re2", + version = "2024-07-02.bcr.1", +) -bazel_dep(name = "rules_python", - version = "0.34.0", - dev_dependency = True) +bazel_dep( + name = "rules_python", + version = "1.3.0", + dev_dependency = True, +) # https://rules-python.readthedocs.io/en/stable/toolchains.html#library-modules-with-dev-only-python-usage python = use_extension( "@rules_python//python/extensions:python.bzl", "python", - dev_dependency = True + dev_dependency = True, +) +python.toolchain( + ignore_root_user_error = True, + is_default = True, + python_version = "3.12", ) -python.toolchain(python_version = "3.12", - is_default = True, - ignore_root_user_error = True) - -fake_fuchsia_sdk = use_repo_rule("//:fake_fuchsia_sdk.bzl", "fake_fuchsia_sdk") -fake_fuchsia_sdk(name = "fuchsia_sdk") +# See fake_fuchsia_sdk.bzl for instructions on how to override this with a real SDK, if needed. +fuchsia_sdk = use_extension("//:fake_fuchsia_sdk.bzl", "fuchsia_sdk") +fuchsia_sdk.create_fake() +use_repo(fuchsia_sdk, "fuchsia_sdk") diff --git a/contrib/googletest/README.md b/contrib/googletest/README.md index f50c670534d5..598cf31242b7 100644 --- a/contrib/googletest/README.md +++ b/contrib/googletest/README.md @@ -2,27 +2,18 @@ ### Announcements -#### Live at Head - -GoogleTest now follows the -[Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support). -We recommend -[updating to the latest commit in the `main` branch as often as possible](https://github.com/abseil/abseil-cpp/blob/master/FAQ.md#what-is-live-at-head-and-how-do-i-do-it). -We do publish occasional semantic versions, tagged with -`v${major}.${minor}.${patch}` (e.g. `v1.15.0`). - #### Documentation Updates Our documentation is now live on GitHub Pages at https://google.github.io/googletest/. We recommend browsing the documentation on GitHub Pages rather than directly in the repository. -#### Release 1.15.0 +#### Release 1.17.0 -[Release 1.15.0](https://github.com/google/googletest/releases/tag/v1.15.0) is +[Release 1.17.0](https://github.com/google/googletest/releases/tag/v1.17.0) is now available. -The 1.15.x branch requires at least C++14. +The 1.17.x branch [requires at least C++17]((https://opensource.google/documentation/policies/cplusplus-support#c_language_standard). #### Continuous Integration diff --git a/contrib/googletest/WORKSPACE b/contrib/googletest/WORKSPACE index 218e6c2e8c2b..0ae5dee92baf 100644 --- a/contrib/googletest/WORKSPACE +++ b/contrib/googletest/WORKSPACE @@ -1,4 +1,34 @@ -workspace(name = "com_google_googletest") +# Copyright 2024 Google Inc. +# All Rights Reserved. +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * 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. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "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 COPYRIGHT +# OWNER OR CONTRIBUTORS 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. + +workspace(name = "googletest") load("//:googletest_deps.bzl", "googletest_deps") googletest_deps() @@ -6,13 +36,12 @@ googletest_deps() load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "rules_python", - sha256 = "d71d2c67e0bce986e1c5a7731b4693226867c45bfe0b7c5e0067228a536fc580", - strip_prefix = "rules_python-0.29.0", - urls = ["https://github.com/bazelbuild/rules_python/releases/download/0.29.0/rules_python-0.29.0.tar.gz"], + name = "rules_python", + sha256 = "2cc26bbd53854ceb76dd42a834b1002cd4ba7f8df35440cf03482e045affc244", + strip_prefix = "rules_python-1.3.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.3.0/rules_python-1.3.0.tar.gz", ) - -# https://github.com/bazelbuild/rules_python/releases/tag/0.29.0 +# https://github.com/bazelbuild/rules_python/releases/tag/1.1.0 load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() @@ -25,8 +54,8 @@ http_archive( http_archive( name = "platforms", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", ], - sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee", + sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f", ) diff --git a/contrib/googletest/ci/linux-presubmit.sh b/contrib/googletest/ci/linux-presubmit.sh index 6d2b3fb573a0..6491e79844b8 100644 --- a/contrib/googletest/ci/linux-presubmit.sh +++ b/contrib/googletest/ci/linux-presubmit.sh @@ -31,51 +31,68 @@ set -euox pipefail -readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20240523" -readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20230120" +readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20241218" +readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250205" if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" fi if [[ -z ${STD:-} ]]; then - STD="c++14 c++17 c++20" + STD="c++17 c++20" fi -# Test the CMake build -for cc in /usr/local/bin/gcc /opt/llvm/clang/bin/clang; do - for cmake_off_on in OFF ON; do - time docker run \ - --volume="${GTEST_ROOT}:/src:ro" \ - --tmpfs="/build:exec" \ - --workdir="/build" \ - --rm \ - --env="CC=${cc}" \ - --env=CXXFLAGS="-Werror -Wdeprecated" \ - ${LINUX_LATEST_CONTAINER} \ - /bin/bash -c " - cmake /src \ - -DCMAKE_CXX_STANDARD=14 \ - -Dgtest_build_samples=ON \ - -Dgtest_build_tests=ON \ - -Dgmock_build_tests=ON \ - -Dcxx_no_exception=${cmake_off_on} \ - -Dcxx_no_rtti=${cmake_off_on} && \ - make -j$(nproc) && \ - ctest -j$(nproc) --output-on-failure" - done +# Test CMake + GCC +for cmake_off_on in OFF ON; do + time docker run \ + --volume="${GTEST_ROOT}:/src:ro" \ + --tmpfs="/build:exec" \ + --workdir="/build" \ + --rm \ + --env="CC=/usr/local/bin/gcc" \ + --env=CXXFLAGS="-Werror -Wdeprecated" \ + ${LINUX_LATEST_CONTAINER} \ + /bin/bash -c " + cmake /src \ + -DCMAKE_CXX_STANDARD=17 \ + -Dgtest_build_samples=ON \ + -Dgtest_build_tests=ON \ + -Dgmock_build_tests=ON \ + -Dcxx_no_exception=${cmake_off_on} \ + -Dcxx_no_rtti=${cmake_off_on} && \ + make -j$(nproc) && \ + ctest -j$(nproc) --output-on-failure" +done + +# Test CMake + Clang +for cmake_off_on in OFF ON; do + time docker run \ + --volume="${GTEST_ROOT}:/src:ro" \ + --tmpfs="/build:exec" \ + --workdir="/build" \ + --rm \ + --env="CC=/opt/llvm/clang/bin/clang" \ + --env=CXXFLAGS="-Werror -Wdeprecated --gcc-toolchain=/usr/local" \ + ${LINUX_LATEST_CONTAINER} \ + /bin/bash -c " + cmake /src \ + -DCMAKE_CXX_STANDARD=17 \ + -Dgtest_build_samples=ON \ + -Dgtest_build_tests=ON \ + -Dgmock_build_tests=ON \ + -Dcxx_no_exception=${cmake_off_on} \ + -Dcxx_no_rtti=${cmake_off_on} && \ + make -j$(nproc) && \ + ctest -j$(nproc) --output-on-failure" done # Do one test with an older version of GCC -# TODO(googletest-team): This currently uses Bazel 5. When upgrading to a -# version of Bazel that supports Bzlmod, add --enable_bzlmod=false to keep test -# coverage for the old WORKSPACE dependency management. time docker run \ --volume="${GTEST_ROOT}:/src:ro" \ --workdir="/src" \ --rm \ --env="CC=/usr/local/bin/gcc" \ - --env="BAZEL_CXXOPTS=-std=c++14" \ + --env="BAZEL_CXXOPTS=-std=c++17" \ ${LINUX_GCC_FLOOR_CONTAINER} \ /usr/local/bin/bazel test ... \ --copt="-Wall" \ @@ -83,6 +100,7 @@ time docker run \ --copt="-Wuninitialized" \ --copt="-Wundef" \ --copt="-Wno-error=pragmas" \ + --enable_bzlmod=false \ --features=external_include_paths \ --keep_going \ --show_timestamps \ diff --git a/contrib/googletest/ci/macos-presubmit.sh b/contrib/googletest/ci/macos-presubmit.sh index 70eaa74fb490..5370ed60d3d8 100644 --- a/contrib/googletest/ci/macos-presubmit.sh +++ b/contrib/googletest/ci/macos-presubmit.sh @@ -31,6 +31,9 @@ set -euox pipefail +# Use Xcode 16.0 +sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer + if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" fi @@ -40,20 +43,20 @@ for cmake_off_on in OFF ON; do BUILD_DIR=$(mktemp -d build_dir.XXXXXXXX) cd ${BUILD_DIR} time cmake ${GTEST_ROOT} \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -Dgtest_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ -Dcxx_no_exception=${cmake_off_on} \ -Dcxx_no_rtti=${cmake_off_on} - time make + time make -j$(nproc) time ctest -j$(nproc) --output-on-failure done # Test the Bazel build # If we are running on Kokoro, check for a versioned Bazel binary. -KOKORO_GFILE_BAZEL_BIN="bazel-7.0.0-darwin-x86_64" +KOKORO_GFILE_BAZEL_BIN="bazel-8.0.0-darwin-x86_64" if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" chmod +x ${BAZEL_BIN} @@ -67,7 +70,7 @@ for absl in 0 1; do --copt="-Wall" \ --copt="-Werror" \ --copt="-Wundef" \ - --cxxopt="-std=c++14" \ + --cxxopt="-std=c++17" \ --define="absl=${absl}" \ --enable_bzlmod=true \ --features=external_include_paths \ diff --git a/contrib/googletest/ci/windows-presubmit.bat b/contrib/googletest/ci/windows-presubmit.bat index 1adc1a16ffa8..e2664c538da6 100644 --- a/contrib/googletest/ci/windows-presubmit.bat +++ b/contrib/googletest/ci/windows-presubmit.bat @@ -1,6 +1,6 @@ SETLOCAL ENABLEDELAYEDEXPANSION -SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-7.0.0-windows-x86_64.exe +SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-8.0.0-windows-x86_64.exe SET PATH=C:\Python34;%PATH% SET BAZEL_PYTHON=C:\python34\python.exe @@ -11,21 +11,18 @@ SET CTEST_OUTPUT_ON_FAILURE=1 SET CMAKE_BUILD_PARALLEL_LEVEL=16 SET CTEST_PARALLEL_LEVEL=16 -IF EXIST git\googletest ( - CD git\googletest -) ELSE IF EXIST github\googletest ( - CD github\googletest -) - +SET GTEST_ROOT=%~dp0\.. IF %errorlevel% neq 0 EXIT /B 1 :: ---------------------------------------------------------------------------- :: CMake -MKDIR cmake_msvc2022 -CD cmake_msvc2022 +SET CMAKE_BUILD_PATH=cmake_msvc2022 +MKDIR %CMAKE_BUILD_PATH% +CD %CMAKE_BUILD_PATH% -%CMAKE_BIN% .. ^ +%CMAKE_BIN% %GTEST_ROOT% ^ -G "Visual Studio 17 2022" ^ + -DCMAKE_CXX_STANDARD=17 ^ -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^ -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^ -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^ @@ -40,8 +37,8 @@ IF %errorlevel% neq 0 EXIT /B 1 %CTEST_BIN% -C Debug --timeout 600 IF %errorlevel% neq 0 EXIT /B 1 -CD .. -RMDIR /S /Q cmake_msvc2022 +CD %GTEST_ROOT% +RMDIR /S /Q %CMAKE_BUILD_PATH% :: ---------------------------------------------------------------------------- :: Bazel @@ -50,11 +47,26 @@ RMDIR /S /Q cmake_msvc2022 :: because of Windows limitations on path length. :: --output_user_root=C:\tmp causes Bazel to use a shorter path. SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community + +:: C++17 +%BAZEL_EXE% ^ + --output_user_root=C:\tmp ^ + test ... ^ + --compilation_mode=dbg ^ + --copt=/std:c++17 ^ + --copt=/WX ^ + --enable_bzlmod=true ^ + --keep_going ^ + --test_output=errors ^ + --test_tag_filters=-no_test_msvc2017 +IF %errorlevel% neq 0 EXIT /B 1 + +:: C++20 %BAZEL_EXE% ^ --output_user_root=C:\tmp ^ test ... ^ --compilation_mode=dbg ^ - --copt=/std:c++14 ^ + --copt=/std:c++20 ^ --copt=/WX ^ --enable_bzlmod=true ^ --keep_going ^ diff --git a/contrib/googletest/docs/advanced.md b/contrib/googletest/docs/advanced.md index 240588a83b4e..9b1220a1e09a 100644 --- a/contrib/googletest/docs/advanced.md +++ b/contrib/googletest/docs/advanced.md @@ -286,7 +286,7 @@ For example: ```c++ TEST(SkipTest, DoesSkip) { GTEST_SKIP() << "Skipping single test"; - EXPECT_EQ(0, 1); // Won't fail; it won't be executed + FAIL(); // Won't fail; it won't be executed } class SkipFixture : public ::testing::Test { @@ -298,7 +298,7 @@ class SkipFixture : public ::testing::Test { // Tests for SkipFixture won't be executed. TEST_F(SkipFixture, SkipsOneTest) { - EXPECT_EQ(5, 7); // Won't fail + FAIL(); // Won't fail; it won't be executed } ``` @@ -405,6 +405,51 @@ EXPECT_TRUE(IsCorrectPointIntVector(point_ints)) For more details regarding `AbslStringify()` and its integration with other libraries, see go/abslstringify. +## Regular Expression Syntax + +When built with Bazel and using Abseil, GoogleTest uses the +[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX +systems (Linux, Cygwin, Mac), GoogleTest uses the +[POSIX extended regular expression](https://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) +syntax. To learn about POSIX syntax, you may want to read this +[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended). + +On Windows, GoogleTest uses its own simple regular expression implementation. It +lacks many features. For example, we don't support union (`"x|y"`), grouping +(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among +others. Below is what we do support (`A` denotes a literal character, period +(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular +expressions.): + +Expression | Meaning +---------- | -------------------------------------------------------------- +`c` | matches any literal character `c` +`\\d` | matches any decimal digit +`\\D` | matches any character that's not a decimal digit +`\\f` | matches `\f` +`\\n` | matches `\n` +`\\r` | matches `\r` +`\\s` | matches any ASCII whitespace, including `\n` +`\\S` | matches any character that's not a whitespace +`\\t` | matches `\t` +`\\v` | matches `\v` +`\\w` | matches any letter, `_`, or decimal digit +`\\W` | matches any character that `\\w` doesn't match +`\\c` | matches any literal character `c`, which must be a punctuation +`.` | matches any single character except `\n` +`A?` | matches 0 or 1 occurrences of `A` +`A*` | matches 0 or many occurrences of `A` +`A+` | matches 1 or many occurrences of `A` +`^` | matches the beginning of a string (not that of each line) +`$` | matches the end of a string (not that of each line) +`xy` | matches `x` followed by `y` + +To help you determine which capability is available on your system, GoogleTest +defines macros to govern which regular expression it is using. The macros are: +`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death +tests to work in all cases, you can either `#if` on these macros or use the more +limited syntax only. + ## Death Tests In many applications, there are assertions that can cause application failure if @@ -416,7 +461,7 @@ corruption, security holes, or worse. Hence it is vitally important to test that such assertion statements work as expected. Since these precondition checks cause the processes to die, we call such tests -_death tests_. More generally, any test that checks that a program terminates +*death tests*. More generally, any test that checks that a program terminates (except by throwing an exception) in an expected fashion is also a death test. Note that if a piece of code throws an exception, we don't consider it "death" @@ -462,6 +507,12 @@ verifies that: exit with exit code 0, and * calling `KillProcess()` kills the process with signal `SIGKILL`. +{: .callout .warning} +Warning: If your death test contains mocks and is expecting a specific exit +code, then you must allow the mock objects to be leaked via `Mock::AllowLeak`. +This is because the mock leak detector will exit with its own error code if it +detects a leak. + The test function body may contain other assertions and statements as well, if necessary. @@ -503,51 +554,6 @@ TEST_F(FooDeathTest, DoesThat) { } ``` -### Regular Expression Syntax - -When built with Bazel and using Abseil, GoogleTest uses the -[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX -systems (Linux, Cygwin, Mac), GoogleTest uses the -[POSIX extended regular expression](https://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax. To learn about POSIX syntax, you may want to read this -[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended). - -On Windows, GoogleTest uses its own simple regular expression implementation. It -lacks many features. For example, we don't support union (`"x|y"`), grouping -(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among -others. Below is what we do support (`A` denotes a literal character, period -(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular -expressions.): - -Expression | Meaning ----------- | -------------------------------------------------------------- -`c` | matches any literal character `c` -`\\d` | matches any decimal digit -`\\D` | matches any character that's not a decimal digit -`\\f` | matches `\f` -`\\n` | matches `\n` -`\\r` | matches `\r` -`\\s` | matches any ASCII whitespace, including `\n` -`\\S` | matches any character that's not a whitespace -`\\t` | matches `\t` -`\\v` | matches `\v` -`\\w` | matches any letter, `_`, or decimal digit -`\\W` | matches any character that `\\w` doesn't match -`\\c` | matches any literal character `c`, which must be a punctuation -`.` | matches any single character except `\n` -`A?` | matches 0 or 1 occurrences of `A` -`A*` | matches 0 or many occurrences of `A` -`A+` | matches 1 or many occurrences of `A` -`^` | matches the beginning of a string (not that of each line) -`$` | matches the end of a string (not that of each line) -`xy` | matches `x` followed by `y` - -To help you determine which capability is available on your system, GoogleTest -defines macros to govern which regular expression it is using. The macros are: -`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death -tests to work in all cases, you can either `#if` on these macros or use the more -limited syntax only. - ### How It Works See [Death Assertions](reference/assertions.md#death) in the Assertions @@ -727,7 +733,7 @@ Some tips on using `SCOPED_TRACE`: ### Propagating Fatal Failures A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the _current function_, not the entire test. For +when they fail they only abort the *current function*, not the entire test. For example, the following test will segfault: ```c++ @@ -1923,6 +1929,20 @@ the `--gtest_also_run_disabled_tests` flag or set the You can combine this with the `--gtest_filter` flag to further select which disabled tests to run. +### Enforcing Having At Least One Test Case + +A not uncommon programmer mistake is to write a test program that has no test +case linked in. This can happen, for example, when you put test case definitions +in a library and the library is not marked as "always link". + +To catch such mistakes, run the test program with the +`--gtest_fail_if_no_test_linked` flag or set the `GTEST_FAIL_IF_NO_TEST_LINKED` +environment variable to a value other than `0`. Now the program will fail if no +test case is linked in. + +Note that *any* test case linked in makes the program valid for the purpose of +this check. In particular, even a disabled test case suffices. + ### Repeating the Tests Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it @@ -2382,7 +2402,7 @@ IMPORTANT: The exact format of the JSON document is subject to change. #### Detecting Test Premature Exit -Google Test implements the _premature-exit-file_ protocol for test runners to +Google Test implements the *premature-exit-file* protocol for test runners to catch any kind of unexpected exits of test programs. Upon start, Google Test creates the file which will be automatically deleted after all work has been finished. Then, the test runner can check if this file exists. In case the file diff --git a/contrib/googletest/docs/faq.md b/contrib/googletest/docs/faq.md index c7d10b5006ba..4e958384673a 100644 --- a/contrib/googletest/docs/faq.md +++ b/contrib/googletest/docs/faq.md @@ -511,19 +511,6 @@ However, there are cases where you have to define your own: list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) -## Why does ASSERT_DEATH complain about previous threads that were already joined? - -With the Linux pthread library, there is no turning back once you cross the line -from a single thread to multiple threads. The first time you create a thread, a -manager thread is created in addition, so you get 3, not 2, threads. Later when -the thread you create joins the main thread, the thread count decrements by 1, -but the manager thread will never be killed, so you still have 2 threads, which -means you cannot safely run a death test. - -The new NPTL thread library doesn't suffer from this problem, as it doesn't -create a manager thread. However, if you don't control which machine your test -runs on, you shouldn't depend on this. - ## Why does GoogleTest require the entire test suite, instead of individual tests, to be named `*DeathTest` when it uses `ASSERT_DEATH`? GoogleTest does not interleave tests from different test suites. That is, it diff --git a/contrib/googletest/docs/gmock_cook_book.md b/contrib/googletest/docs/gmock_cook_book.md index f1b10b472d27..9e59b4cf438c 100644 --- a/contrib/googletest/docs/gmock_cook_book.md +++ b/contrib/googletest/docs/gmock_cook_book.md @@ -177,7 +177,7 @@ class StackInterface { template class MockStack : public StackInterface { ... - MOCK_METHOD(int, GetSize, (), (override)); + MOCK_METHOD(int, GetSize, (), (const, override)); MOCK_METHOD(void, Push, (const Elem& x), (override)); }; ``` @@ -936,8 +936,8 @@ casts a matcher `m` to type `Matcher`. To ensure safety, gMock checks that floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and -3. When `U` is a reference, `T` must also be a reference (as the underlying - matcher may be interested in the address of the `U` value). +3. When `U` is a non-const reference, `T` must also be a reference (as the + underlying matcher may be interested in the address of the `U` value). The code won't compile if any of these conditions isn't met. @@ -3387,9 +3387,9 @@ With this definition, the above assertion will give a better message: #### Using EXPECT_ Statements in Matchers -You can also use `EXPECT_...` (and `ASSERT_...`) statements inside custom -matcher definitions. In many cases, this allows you to write your matcher more -concisely while still providing an informative error message. For example: +You can also use `EXPECT_...` statements inside custom matcher definitions. In +many cases, this allows you to write your matcher more concisely while still +providing an informative error message. For example: ```cpp MATCHER(IsDivisibleBy7, "") { @@ -3419,14 +3419,14 @@ itself, as gMock already prints it for you. #### Argument Types -The type of the value being matched (`arg_type`) is determined by the -context in which you use the matcher and is supplied to you by the compiler, so -you don't need to worry about declaring it (nor can you). This allows the -matcher to be polymorphic. For example, `IsDivisibleBy7()` can be used to match -any type where the value of `(arg % 7) == 0` can be implicitly converted to a *** 5170 LINES SKIPPED *** From nobody Sun Feb 22 03:59: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 4fJVbm1D60z6SsvK for ; Sun, 22 Feb 2026 03:59: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 4fJVbm00YTz3TCK for ; Sun, 22 Feb 2026 03:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIKhzMadXAtXLoxYipmakWSDBfRaDDiT9PwdVZ7QBbk=; b=cOgm4I9nbUtgdcYxuZRhwJAy2CoHceKguLBuoqlzYGy9qnnIBeHfQ8QUsLUjuw5kA/+RZh cCI3Gcr3qC2vs7eSVQwApdEwQZql3f+aCp+noAky5+J4td3LAOWjuah2AeFbhDKc4saf1i 4vEANEYCFykX0yU2Sx7VPjfdVXEI+KMiAr3BtraqhbcpxCvI354tBk6qXemNl43ATH253z LlDl3GGDQ0OUzCfYRlI364rPG61yrPX6+pzbqVkLjEYWfgSPScgcG5mG+sOvw6lL/xaaDE PP75IZAKkx53xXpsYAGFrWQirJHHucEb6DgXcBtnFnfymA0To79FiZItM/96Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732756; a=rsa-sha256; cv=none; b=ObgyaF8a5IO0zT4EBS6fRHbcHh4gb1kThbL6EPHSnBpd3f0X1kedMYyRMPkS3esT6JZ1LY cnYH/lMUyq+isxt0eUj4GcF3tC+MU1SOddAxUFAJpu526dysvMOxjjKVkPtBNpyV1K+NYA Lb7CmEmIDgZ1ln1vVx4PYNJycBvlq9syIskfKytAVvxVXAWYJrH88+seDV5aBBD+EiDvSY M0zwMa/HOGtB5tBU3tX5ED5tzSPxbZBC8scvv4M0UzkOTFGKE8DVIkzff6AtQNHeW2yVUm uIwv7dn5uA72BF50uMx4J78gTq6Cp5YDksSyFvrh3E9bRaFinYEcPAOSE4VDZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIKhzMadXAtXLoxYipmakWSDBfRaDDiT9PwdVZ7QBbk=; b=pEuh+JmycLtLiwmobAj6HNUwke0RPfYJaGZfZocjbDE4qWgTxctTm065UxJnLYPGdIVNf+ nz4aeU0hGY/0W96z7vl47bkYuaznL0hug9yuC4N/pT1uD+5xf+1ekNF62iB4TunKHBJiAG lG6IegPD8P4InZqg7tHGUAQfbXBTzHDmOwdFRpDUqxNsFV8caJav1Jcd4elV57IthF9hOH ZK0uT8btPH7XhuAnvEBVo8TIzFpzwV076eoWoixHdeBrH/rDFl7TDMaatZkeqByBwaozuW leRt23GM/zvN4/xmQ0Bxpv9vOCBxrSpY8wK1aeibZVKgW4+dqfVrCZFEseGGQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVbl6dyFzBl5 for ; Sun, 22 Feb 2026 03:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 237ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:59:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3342ea347c6f - stable/15 - gtest.cc: declare fail_if_no_test_linked 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3342ea347c6fea46d3c5cc7b1f5ae8f89307f150 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:59:15 +0000 Message-Id: <699a7f13.237ac.359d5175@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3342ea347c6fea46d3c5cc7b1f5ae8f89307f150 commit 3342ea347c6fea46d3c5cc7b1f5ae8f89307f150 Author: Enji Cooper AuthorDate: 2026-01-29 01:22:42 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:45:50 +0000 gtest.cc: declare fail_if_no_test_linked flag Clang's -Wmissing-variable-declarations flags this as an issue since the flag is only used in `gtest.cc`. Declare the flag beforehand to ensure that the variable scope is properly limited to `gtest.cc`. MFC after: 1 week MFC with: 46333229c6a0187ebf231805682ee0bceed704d1 Ref: https://github.com/google/googletest/pull/4898 (cherry picked from commit 3926ae98adfe4b2f1dd957cab353ba7ca11ce709) --- contrib/googletest/googletest/src/gtest.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/googletest/googletest/src/gtest.cc b/contrib/googletest/googletest/src/gtest.cc index 09af15179f1f..0e32774bc6d1 100644 --- a/contrib/googletest/googletest/src/gtest.cc +++ b/contrib/googletest/googletest/src/gtest.cc @@ -263,6 +263,7 @@ GTEST_DEFINE_bool_( testing::GetDefaultFailFast()), "True if and only if a test failure should stop further test execution."); +GTEST_DECLARE_bool_(fail_if_no_test_linked); GTEST_DEFINE_bool_( fail_if_no_test_linked, testing::internal::BoolFromGTestEnv("fail_if_no_test_linked", false), From nobody Sun Feb 22 03:59: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 4fJVbn4Ftkz6SskM for ; Sun, 22 Feb 2026 03:59: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 4fJVbn2TpVz3TQX for ; Sun, 22 Feb 2026 03:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mlSRqedr23mNhdE5qXl39W67D5gbcxQkHa6pLiancEk=; b=Q+ps5wBqAyczST7ZH9C4SmP58YhcyGILWrcfU7uRs/DekDgxhz/Uxba0gYAalLJXY71BNk a83gQBSnAxnjCxb3hKQ5qe/1WH5xKrimG/VwEUkTb3mKbcN/sTRLpsF/1c+QTevwEL4UYq MFVFm0IkP4qKhwws079ToZK/1XEe3QutkJ8zeYldz6j2OT+rldADJdDCgcS51upJNv4UO2 mQIR6YFZl5uynVuBiiQL01u4YdHwdcG2UXRLkOgi0chSVQ3xqDXqm52aDtYPrLZqmTozN2 0vVnNgMT3XJbe+PX8fc9uCwAR2yBRnD2npTLH0SJ1lnziJoQkiJmzFEkdP7UAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732757; a=rsa-sha256; cv=none; b=XZk2EXRRkAbeP7DpESRVFuGgGN7Ep8LjFmd6tpTwMLcY0rTRNPTlNwBdws6E+k1dHs/UCl dFnfps+wWWXZ/GVORqamDngIMtdAlisua0NR3Vybhn9lf7l5PKLb8CqYGryn/vO57l8B5m J4tl352EyciFa2Q8rKQTUTp/fCmkL9sZjpiylmHhUG08gLsJRm4gIwx1Stmz5b6XCrj55k NxzLqPoafRL3RvI9B4nV/DW45OFr5NaMD8KEL1jfPkKe0/yMlz2epcMzk1ZDFXMejMoBv0 Kbe+AhbE/meEWk1Y+GroX/dFIXKBB512ddKB+XG9DzQ1UWpg3RcN1M3UAlRFjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mlSRqedr23mNhdE5qXl39W67D5gbcxQkHa6pLiancEk=; b=oOBbdugNXggKu2tR1hXJAujyTPd5/M2OLgZcxD3XMHGWbPd62ClRSU7LZLL582eBj8khoQ tHu8z6X0rEXDw1bAirueTT4mdGEegRjQpSsvSS8SCgitZVsUi55tecMHRS2OKVFmxazn4T ENwv50k6aB6sR+7ZGvz1u+RWzNp7zPpzVhk+oeaUjNHjubytoyxc+/ihp5j9lgN+KT3THG vlQbK41tqpBohH1ndWtSYblvcZ0DxgNUcjIrKx/WAbiySe6WXrUn33ob0LMrjzRwfsCBsk ZNQAtD3dmwgyre2FOWbPL9LhcdF/ECZyHFBMZ3bz4eu9gs3U3TtQNZrYMJ5NxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVbn0JdSzCR9 for ; Sun, 22 Feb 2026 03:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22ca2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:59:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3eddfdd42321 - stable/15 - Add ASMC_DEBUG make option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3eddfdd42321bec39635747122acad9625602df3 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:59:17 +0000 Message-Id: <699a7f15.22ca2.4835624a@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3eddfdd42321bec39635747122acad9625602df3 commit 3eddfdd42321bec39635747122acad9625602df3 Author: Enji Cooper AuthorDate: 2026-01-04 08:27:57 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:57:56 +0000 Add ASMC_DEBUG make option This allows folks to enable debug statements in asmc(4) using kernel configs via the `options ASMC_DEBUG` directive. While here, remove a duplicate `device vt_efifb` directive in `NOTES` as it's already handled in the `GENERIC` config MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54511 (cherry picked from commit f224591746bdaf14ad5f63de4738a3146cc2f55f) --- sys/amd64/conf/NOTES | 7 ++++--- sys/conf/options.amd64 | 3 +++ sys/dev/asmc/asmc.c | 20 +++++++++++--------- sys/modules/asmc/Makefile | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index e0a9e1b77d93..50637d4adeb7 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -43,9 +43,6 @@ cpu HAMMER # aka K8, aka Opteron & Athlon64 # Optional devices: # -# vt(4) drivers. -device vt_efifb # EFI framebuffer - # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as @@ -116,6 +113,10 @@ device efidev # EFI RTC device efirtc +# Apple System Management Controller (SMC) +device asmc +options ASMC_DEBUG # Enable asmc(4)-specific debug logic. + # # Intel QuickAssist driver with OpenCrypto support # diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index df18abfa8e1e..a3a735731438 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -68,3 +68,6 @@ MPTABLE_LINUX_BUG_COMPAT # x86 specific uart options UART_NS8250_EARLY_PORT opt_uart.h + +# Enable asmc(4)-specific debug logic. +ASMC_DEBUG opt_asmc.h diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5a1074abde83..da040b1e434a 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -34,6 +34,8 @@ * Inspired by the Linux applesmc driver. */ +#include "opt_asmc.h" + #include #include #include @@ -83,7 +85,7 @@ static void asmc_sms_calibrate(device_t dev); static int asmc_sms_intrfast(void *arg); static void asmc_sms_printintr(device_t dev, uint8_t); static void asmc_sms_task(void *arg, int pending); -#ifdef DEBUG +#ifdef ASMC_DEBUG void asmc_dumpall(device_t); static int asmc_key_dump(device_t, int); #endif @@ -515,7 +517,7 @@ static driver_t asmc_driver = { */ #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASMC") -#ifdef DEBUG +#ifdef ASMC_DEBUG #define ASMC_DPRINTF(str) device_printf(dev, str) #else #define ASMC_DPRINTF(str) @@ -828,7 +830,7 @@ asmc_resume(device_t dev) return (0); } -#ifdef DEBUG +#ifdef ASMC_DEBUG void asmc_dumpall(device_t dev) { int i; @@ -930,7 +932,7 @@ nosms: device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf)); } -#ifdef DEBUG +#ifdef ASMC_DEBUG asmc_dumpall(dev); #endif @@ -965,19 +967,19 @@ asmc_wait_ack(device_t dev, uint8_t val, int amount) static int asmc_wait(device_t dev, uint8_t val) { -#ifdef DEBUG +#ifdef ASMC_DEBUG struct asmc_softc *sc; #endif if (asmc_wait_ack(dev, val, 1000) == 0) return (0); -#ifdef DEBUG +#ifdef ASMC_DEBUG sc = device_get_softc(dev); #endif val = val & ASMC_STATUS_MASK; -#ifdef DEBUG +#ifdef ASMC_DEBUG device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, val, ASMC_CMDPORT_READ(sc)); #endif @@ -1000,7 +1002,7 @@ asmc_command(device_t dev, uint8_t command) { } } -#ifdef DEBUG +#ifdef ASMC_DEBUG device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, command, ASMC_CMDPORT_READ(sc)); #endif @@ -1046,7 +1048,7 @@ out: return (error); } -#ifdef DEBUG +#ifdef ASMC_DEBUG static int asmc_key_dump(device_t dev, int number) { diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile index f1b4a981ad24..4ba45a4625d8 100644 --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc -SRCS= asmc.c opt_acpi.h acpi_if.h bus_if.h device_if.h +SRCS= asmc.c opt_acpi.h opt_asmc.h acpi_if.h bus_if.h device_if.h .include From nobody Sun Feb 22 03:59: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 4fJVbp4Rrqz6Ssms for ; Sun, 22 Feb 2026 03:59: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 4fJVbp1Z84z3T9g for ; Sun, 22 Feb 2026 03:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732758; 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=mXXEfpM7AFyoCDaBjgFIFk8r3SKFfQujU3EC62UT7Q0=; b=oMPvci4tj1zI2qoJetr7kQwGGXlPv/DyoP4C7zLXU6yafYtjWJHC40ArGT7EgmlJRbkwSE nHqxP6M3aM5VnKU9Wf9W3iKKPdCZxwpj0Ox5InhQQqcBZqToGRIOFPnSg3z2DvchsuBLjR n1d/47nHtlnCCDQoowc/8UsxU1+Mk95Qka++km/ip3vhn9JtRSG+D/6jhWecqVlqRYytTF cz8K2HwjrZfNTJpqyz+gubliQZMkbMoyZNoE4HND+IuDJECVid8WXsdhQJ4OxN4YJyE5+V JmmWPGCQvxZh+gnCT96EIjEdZagKynCW8ML9xLlLqDs2maPJbnSswJWdRMk6fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771732758; a=rsa-sha256; cv=none; b=pZpVncwY8goPferalTAGKYIqzHjI/Sf+s/kIZRmpdo0PXpmE0mM4AHg5uEPBNHLLI2ap2I engQ/b/eTAhCFURN55CYRE3+Ips25mmhpgDQ0hQ9y/hI/EyWCcu3NTACwrDUw9wzOWNjoA 8fQgnyyGIW2xmNoTQ3kNBpqVw94XnhrlpicnXt3MEgBUDuoBO+zf813AJkOzWtphc5Hiha rSBFpJCv7HzhO5upj2JnPTl+6M4I3Pf3oQQRgGrigURJDJ838AZ+umKnI3UBR0mMo1JZa5 NS9gP31KEfcMSBsuTzrgbO35cjTqxR/XMCTJBfn1kCA5NTSSDwBmbefBsTUUbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771732758; 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=mXXEfpM7AFyoCDaBjgFIFk8r3SKFfQujU3EC62UT7Q0=; b=anLnzx7YwULANm9SG2h9YVSla7mn0uEXTxL/fh7VHevxVcx0Z6Vy6owwL5hlzLmWpoIS4M sQQLuODtTSReN7oDEO1AdcR74SboCl5Iv4ixsSOgDn56FRpILyr+pJ+C/AwstqhBe9ediJ 0y9X0b8ddCYa3vFn5P1EpDeKRCyAtH49bB9Jpidnc8QJycpUlEANh5uqVmWz2AprIcvZPC z4egACCMdORV32UfvknMBmStKeswFIe3I4bZWqfS5CVs9lYh0ux9raPwn91tBTDkQAhky5 azOEA1iA0kiIgKLs2al+GWwGF+2Q4wUPJDCVttSNj+nEfQmtZFgRrWDmhcUlyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVbp14qpzCJw for ; Sun, 22 Feb 2026 03:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2274f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:59:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Enji Cooper Subject: git: e6c36b2af483 - stable/15 - sys/x86/NOTES: Add vt_efifb List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: e6c36b2af483cbadd48490791fc2c64212c99e6f Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:59:18 +0000 Message-Id: <699a7f16.2274f.21fae0c3@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e6c36b2af483cbadd48490791fc2c64212c99e6f commit e6c36b2af483cbadd48490791fc2c64212c99e6f Author: Olivier Certner AuthorDate: 2026-01-09 16:23:59 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:57:56 +0000 sys/x86/NOTES: Add vt_efifb Contrary to what is stated in commit f224591746bd ("Add ASMC_DEBUG make option"), the various NOTES files should list all available options. Since vt_efifb is supported also on i386, add it back to x86/NOTES instead of amd64/NOTES. Fixes: f224591746bd ("Add ASMC_DEBUG make option") Sponsored by: The FreeBSD Foundation (cherry picked from commit 67599eef01f5417715f673ec81fc1467917c7a10) --- sys/x86/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index 643105096be2..2c8efa3726dc 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -329,6 +329,7 @@ options VGA_DEBUG # vt(4) drivers. device vt_vga # VGA device vt_vbefb # VBE framebuffer +device vt_efifb # EFI framebuffer # Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA. device s3pci From nobody Sun Feb 22 04:06: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 4fJVln5Ffmz6StK4 for ; Sun, 22 Feb 2026 04:06: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 4fJVln49lNz3Vxh for ; Sun, 22 Feb 2026 04:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733173; 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=nYklUgaze4lMKk3Jz7+tgsd5H3BhBK5biO4I3skNwfA=; b=vnj0IK+3u+bnlYmn4MHCJIjdtVUNelg2PLBtBlxBtcO4ndxbNY1+9aBBpsOFpVNXoEnBaS DHVHmR9E11rDfAG5mG5pisCxUM1ymePTpoN1dYBQPiTPc02rWj6BqrPuw8JgUHLBF7OSBU TB8m6FulFsrr8Pr4/TsT/rkuNON0C6EKLEtqY84RLTM/rVnKnqC942TcDxYV9FJmwPYXke S5UpBkOkTuSOcH3Z24/KqN11DrjMo4KVD7Or5dKzrfQz5U3HzXmQ3evNrol4m8/ylm01YH iatr3xIjd6ZljMN8Z04sW7obmKQQAWlQZS5bRfS2wIsssgIBg7OL1JkObsA7Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733173; a=rsa-sha256; cv=none; b=o29IlJ5FFIScAcJH32g49gKXMTL7GEHGTt04NBqKcRU1ivB+XLhiWPCayl9BctZLOx59Hf 8hrWFnbxkGPZWDvpWpM0wLTrJCFX9PXeCKVtVnqsVzDhHUfPhhkEY9mMcojXkqA3N+IcUz Ar7+jPdPHPADMI72UYZObU76JKkvs4nnHb0epXBx5sMjJNc7cP4o09tNEaAxhiQ0d9+7CL yk2zowGpm6D4qvHnYIjInJ0BPU/V3PADSybijs98kAI8Sz6aDbC4z03eTieXvCBke88hNp KDm9cS4YIHnt5sBJrEUWDHPPLI61uNafUvX0XhOjFVQDJvRaB+yHvgENZMv1fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733173; 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=nYklUgaze4lMKk3Jz7+tgsd5H3BhBK5biO4I3skNwfA=; b=SsfKVkN4QYezfWGFiSa3pR7E5TZEk1H+9c3TBlr3yiQJ5u3L38KC4VOhc2++Hf2LID7GFr XtrZG0uX8lfn/5mQ8BMtnXBKhgqIl5YErZqkqcD6S5lRXq6Yp9mbZH5h9ibxn5uETeEy/G P9m09WzE4JgitIYAqz7YDqxHroqSrgsve+GfPsn4KhzciK4AZ+6ErJ6iWdtEZwUQdM15ot 0J8h5HyrMe6dGr1M5pLg6FZ/qGXmxcEc3S3CQtvEEva8BzNCG4e4s0lxAgmlu829r8nPd1 Dl3oRLT/DNg7zJj6sccOx0iI86dDx/v2/uEduJkeRDijdK6hBf3NNC6gTRvjYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVln3SBbzCnW for ; Sun, 22 Feb 2026 04:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22dd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:06:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: afa1058ff70a - stable/15 - asmc: improve asmc_dumpall to read actual SMC key count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: afa1058ff70a1850759802ff03124fb4e6772a0e Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:06:13 +0000 Message-Id: <699a80b5.22dd1.5e205063@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=afa1058ff70a1850759802ff03124fb4e6772a0e commit afa1058ff70a1850759802ff03124fb4e6772a0e Author: Abdelkader Boudih AuthorDate: 2026-01-03 18:33:11 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:05:39 +0000 asmc: improve asmc_dumpall to read actual SMC key count The asmc_dumpall debug function previously used a hardcoded loop limit of 0x100 (256) keys with a "XXX magic number" comment. This change improves asmc_dumpall to: * Read the actual number of keys from the ASMC_NKEYS SMC key * Print the key count being dumped for better debugging output * Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1) This provides more accurate debug output and removes the magic number. Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT): * Rebuild kernel with DEBUG enabled in asmc driver * Boot with new kernel * Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count) * Verify all 297 keys are dumped Differential Revision: https://reviews.freebsd.org/D54436 Reviewed by: markj, adrian (cherry picked from commit 2a7c4685b7693bfa15e2bd4d5e82905a368b0030) --- sys/dev/asmc/asmc.c | 25 +++++++++++++++++-------- sys/dev/asmc/asmcvar.h | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index da040b1e434a..5d3b97a065c9 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -833,10 +833,16 @@ asmc_resume(device_t dev) #ifdef ASMC_DEBUG void asmc_dumpall(device_t dev) { + struct asmc_softc *sc = device_get_softc(dev); int i; - /* XXX magic number */ - for (i=0; i < 0x100; i++) + if (sc->sc_nkeys == 0) { + device_printf(dev, "asmc_dumpall: key count not available\n"); + return; + } + + device_printf(dev, "asmc_dumpall: dumping %d keys\n", sc->sc_nkeys); + for (i = 0; i < sc->sc_nkeys; i++) asmc_key_dump(dev, i); } #endif @@ -924,12 +930,15 @@ nosms: sc->sc_nfan = ASMC_MAXFANS; } - if (bootverbose) { - /* - * The number of keys is a 32 bit buffer - */ - asmc_key_read(dev, ASMC_NKEYS, buf, 4); - device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf)); + /* + * Read and cache the number of SMC keys (32 bit buffer) + */ + if (asmc_key_read(dev, ASMC_NKEYS, buf, 4) == 0) { + sc->sc_nkeys = be32dec(buf); + if (bootverbose) + device_printf(dev, "number of keys: %d\n", sc->sc_nkeys); + } else { + sc->sc_nkeys = 0; } #ifdef ASMC_DEBUG diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d40dc1e7c8ff..b6d8686d9670 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -33,6 +33,7 @@ struct asmc_softc { device_t sc_dev; struct mtx sc_mtx; int sc_nfan; + int sc_nkeys; int16_t sms_rest_x; int16_t sms_rest_y; int16_t sms_rest_z; From nobody Sun Feb 22 04:06: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 4fJVlq16F7z6StPf for ; Sun, 22 Feb 2026 04:06: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 4fJVlp74xFz3Vvd for ; Sun, 22 Feb 2026 04:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733175; 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=J4KolGx0yqnHLZOIUE48vv5HMQiLPiwsPgWglyLcMtA=; b=YAbH0QNr8NsfOlrQ2i9bk6P+goR85XdTbQTTSVNvh/zEjod9P3icCuBiTU46nsSEWwk2KN 7bZ7jbngDeUdOVXPE0iFN1IjVrUJNCuOpMmGrNFkTzMYoa/tIhLjdS80qatr+b8yI8nshy 7J2pe9X+JztfHiUQPC1B1MQWuLOyf+3DXaQCpd7fIQZF1tXs/3UXrwjBqJf2jp3ztJpe00 pPBzGfci5gI5Xjw+G57oEC1OKRCFU6Iwb1TqDiU0DPSAYc3bbXJd9yYR5K1c1I2Mir9bjS UXuT/YcyGhGotiMTxzko5vYuhBzjWU57Fs1HRYyHpkPjG8vJ6R4mLDtghVS2zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733175; a=rsa-sha256; cv=none; b=iaoeNByCnciK2LY+clw8m6ce5XHopFoNa3wLBjDHMAZ6FapsYWSTJKlJM02LgpuOCYyOtK OogHI+NSizCbaW2iH97ctGlVOfyQv+cPhPas9hEb/96cFYNpuOqMTkF5aa0ZbaXXyRtrus 5hSGsAx6hc3nSJJv2qBrgG/boP2j+gqqiVFoDhxdsGKAfS4nXTVdNjC6y/qkY0r8Ke8yg1 Aqlld4LJZT8mUkjJKZeZ3pjI3deTatZMI1PqL3AvbalW5+J0B+mCtahWoN4gUA3Vzjb1SV RESm9uZEy06aioKj5s4sVQRU1rjG7NCU3T/GcMtwwCTk3DdGvcnaiaA+WDPILQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733175; 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=J4KolGx0yqnHLZOIUE48vv5HMQiLPiwsPgWglyLcMtA=; b=jONWeeSDAgvCrOjZJnaAyAmDgkDbzxGCN9VSjB2Y+blq4y6f2GqnA9TqKoGKMHrcOToJqo OuEmzN4H82qjHZCUkhaecbd/ZHfljvrMbvu3dxOzFYxVqd1OEn2gwJYi1qJzUX/RyxGesn pR/3K6A+jW0UOtdBQAvYEMSB/lW9S+dcX5SJUbTQUlZicWs9DEeiXxlbopY/eVc7n/sxiA JSzJ07G87JEGsFLqhJqmld045W0BRIE2EXhLLESO+JAkIq2awHo2HDNhLZy+g+521LnbPT mdrHlMg01fNRZauQKa9NvS/Ob/vTcd0TBvvxrfiikmGJoiX5Hf8rpnkJMspECA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVlp4DwvzCGm for ; Sun, 22 Feb 2026 04:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24832 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:06:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 5111a75444bb - stable/15 - asmc: Add support for MacBookPro11,5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5111a75444bba987e353c35ad4b3cbfa5af96afa Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:06:14 +0000 Message-Id: <699a80b6.24832.588bb6d4@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=5111a75444bba987e353c35ad4b3cbfa5af96afa commit 5111a75444bba987e353c35ad4b3cbfa5af96afa Author: Abdelkader Boudih AuthorDate: 2026-01-14 03:13:46 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:05:46 +0000 asmc: Add support for MacBookPro11,5 Add support for the MacBookPro11,5 (Mid 2015, 15-inch with AMD Radeon R9 M370X GPU) to the Apple SMC driver. Debug testing revealed this model lacks several SMC keys present on MacBookPro11,4 (IBLC, ICMC, IC2C), that model-specific sensor definitions. Differential Revision: https://reviews.freebsd.org/D54665 Reviewed by: adrian (cherry picked from commit c498eaa2f9090d7bdc6456181d8bf74869288bbb) --- sys/dev/asmc/asmc.c | 7 +++++++ sys/dev/asmc/asmcvar.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5d3b97a065c9..5b2a901328d3 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -287,6 +287,13 @@ static const struct asmc_model asmc_models[] = { ASMC_MBP114_TEMPS, ASMC_MBP114_TEMPNAMES, ASMC_MBP114_TEMPDESCS }, + { + "MacBookPro11,5", + "Apple SMC MacBook Pro Retina Core i7 (mid 2015, 15-inch, AMD GPU)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, + ASMC_MBP115_TEMPS, ASMC_MBP115_TEMPNAMES, ASMC_MBP115_TEMPDESCS + }, + /* The Mac Mini has no SMS */ { "Macmini1,1", "Apple SMC Mac Mini", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index b6d8686d9670..102bee8a15b7 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -467,6 +467,41 @@ struct asmc_softc { "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } +/* MacBookPro11,5 - same as 11,4 but without IBLC, ICMC, and IC2C keys */ +#define ASMC_MBP115_TEMPS { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", \ + "IC3C", "ILDC", "IAPC", "IHSC", \ + "TC0P", "TP0P", "TM0P", \ + "Ta0P", "Th2H", "Th1H", "TW0P", "Ts0P", \ + "Ts1P", "TB0T", "TB1T", "TB2T", "TH0A", "TH0B", \ + "TC1C", "TC2C", "TC3C", "TC4C", "TCXC", \ + "TCGC", "TPCD", "TCSA", "VC0C", "VD0R", \ + "VP0R", "ALSL", "F0Ac", "F1Ac", "PCPC", \ + "PCPG", "PCPT", "PSTR", "PDTR", NULL } + + +#define ASMC_MBP115_TEMPNAMES { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", \ + "IC3C", "ILDC", "IAPC", "IHSC", \ + "TC0P", "TP0P", "TM0P", \ + "Ta0P", "Th2H", "Th1H", "TW0P", "Ts0P", \ + "Ts1P", "TB0T", "TB1T", "TB2T", "TH0A", "TH0B", \ + "TC1C", "TC2C", "TC3C", "TC4C", "TCXC", \ + "TCGC", "TPCD", "TCSA", "VC0C", "VD0R", \ + "VP0R", "ALSL", "F0Ac", "F1Ac", "PCPC", \ + "PCPG", "PCPT", "PSTR", "PDTR" } + +#define ASMC_MBP115_TEMPDESCS { "CPU High (CPU, I/O)", "DC In", "SSD", "Charger (BMON)", "CPU", \ + "Other 3.3V", "Other 5V", "Memory", "Platform Controller Hub Core", \ + "CPU DDR", "LCD Panel", "Airport", "Thunderbolt", \ + "CPU Proximity", "Platform Controller Hub", "Memory Proximity", "Air Flow Proximity", \ + "Left Fin Stack", "Right Fin Stack", "Airport Proximity", "Palm Rest", "Palm Rest Actuator", \ + "Battery Max", "Battery Sensor 1", "Battery Sensor 2", "SSD A", "SSD B", \ + "CPU Core 1", "CPU Core 2", "CPU Core 3", "CPU Core 4", "CPU PECI Die", \ + "Intel GPU", "Platform Controller Hub PECI", "CPU System Agent Core", "CPU VCore", "DC In", \ + "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ + "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } + #define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ From nobody Sun Feb 22 04:06: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 4fJVmW0cprz6StGw for ; Sun, 22 Feb 2026 04:06: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 4fJVmV4l5sz3Wft for ; Sun, 22 Feb 2026 04:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733210; 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=qIgGB3Li1d73DdxWGF9l3azPGm2XGVm1eXhHrxx8y84=; b=d+RXQRk3GG/pXzjfZllP5Vn2Sq6J+1ylkCJtQD63tSkWV/w6H/CpCxH+NNZntYIE4m/MO7 pUDKVm+Xi4D4q6DcuMLGdc+imswUQ4aA4kv+FYKlNQwSBtIQRwRqMaIsDyn1j+9vwiBzg4 Wp/ldJHA8b2kxFIPH6FpXlOYj+Ig7B5jgf3FVXd2mZRFqarEDgAyyoL/sNJ4R48gPGU4J6 UVOV+a2DRFyYgi7BPfNXOfc1jhKOOsLiX+eU0v+Zugie+gVR32T4FFa03AggRzdV0x5OFc GVn/w7iwxgyUTXqnwN+oqL/G4OTEGq5Y5XZ0ml1ej0eJUJSPgW+yPRDow8y9nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733210; a=rsa-sha256; cv=none; b=glDq6+ytDMIUnDAci5Uce3PqtFBThSJXStJWxz2OG4IYWWfxESCeHO07Q1j504b4JxXIsn nQslJs0UU7fcSC9kgHd+7iCo2EbZTQ6UUvZFmMi18JH2z60y3uZkRTdhu92JpNhZKaizI8 RBDZfrKII0esfsUrEcUGEDrlxDlV4lhrGAavDyqCMgyXoZgCmuwzVEKjuukNre7BfCfSt2 30i9cVhZzyc2t2zUy2U10KPWRPODcUzLq/tTHW6aJulTibgUAbxRC7KG4qC6BttJ5vIpJP edkke2IAI5bELWcqN3vI5XDomCthQUBQts0JyVoDUhNn7J/j+GcpQJKkACByFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733210; 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=qIgGB3Li1d73DdxWGF9l3azPGm2XGVm1eXhHrxx8y84=; b=RG6K3ucweKIocXTFRSLN1LDYku5595KjqNkYid5E4v9tCQnQSmZ3BwKSVOXn9xXxLOM94q b1bZF8tX7PYfkT9mqjQ7xlSZUhf4aABx5n2dmi2bxCgkXJ7s/LXxVBP7Ffh1nSYGtNWe44 9TSqiwdn/k6XpUiwItSyeowPARo2S9m1D4B4ZGXjPo4vj5yqfdQ89jR83OluoR94mXmCrH v2SlFJs0XrwJubUMGj9YKmMeq86eIB0lo+7pnWCL/Idzdid+xhTJ3sZMzeWGpPgx4wJzdC iAZ7QQ7/XOBJ6En40KzhjsRO47aHLoBkJIovjEnNQyw9eQxcbMY7yKy4gBjmVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVmV4H1XzCYQ for ; Sun, 22 Feb 2026 04:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22dd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:06:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 26f41f8e5ebe - stable/14 - asmc: improve asmc_dumpall to read actual SMC key count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 26f41f8e5ebee7faf2fb9a65baa18bb41ad63564 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:06:50 +0000 Message-Id: <699a80da.22dd6.73b9dee@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=26f41f8e5ebee7faf2fb9a65baa18bb41ad63564 commit 26f41f8e5ebee7faf2fb9a65baa18bb41ad63564 Author: Abdelkader Boudih AuthorDate: 2026-01-03 18:33:11 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:04:06 +0000 asmc: improve asmc_dumpall to read actual SMC key count The asmc_dumpall debug function previously used a hardcoded loop limit of 0x100 (256) keys with a "XXX magic number" comment. This change improves asmc_dumpall to: * Read the actual number of keys from the ASMC_NKEYS SMC key * Print the key count being dumped for better debugging output * Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1) This provides more accurate debug output and removes the magic number. Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT): * Rebuild kernel with DEBUG enabled in asmc driver * Boot with new kernel * Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count) * Verify all 297 keys are dumped Differential Revision: https://reviews.freebsd.org/D54436 Reviewed by: markj, adrian (cherry picked from commit 2a7c4685b7693bfa15e2bd4d5e82905a368b0030) --- sys/dev/asmc/asmc.c | 25 +++++++++++++++++-------- sys/dev/asmc/asmcvar.h | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 3c63e959fc9f..e4b1afa9619d 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -806,10 +806,16 @@ asmc_resume(device_t dev) #ifdef DEBUG void asmc_dumpall(device_t dev) { + struct asmc_softc *sc = device_get_softc(dev); int i; - /* XXX magic number */ - for (i=0; i < 0x100; i++) + if (sc->sc_nkeys == 0) { + device_printf(dev, "asmc_dumpall: key count not available\n"); + return; + } + + device_printf(dev, "asmc_dumpall: dumping %d keys\n", sc->sc_nkeys); + for (i = 0; i < sc->sc_nkeys; i++) asmc_key_dump(dev, i); } #endif @@ -897,12 +903,15 @@ nosms: sc->sc_nfan = ASMC_MAXFANS; } - if (bootverbose) { - /* - * The number of keys is a 32 bit buffer - */ - asmc_key_read(dev, ASMC_NKEYS, buf, 4); - device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf)); + /* + * Read and cache the number of SMC keys (32 bit buffer) + */ + if (asmc_key_read(dev, ASMC_NKEYS, buf, 4) == 0) { + sc->sc_nkeys = be32dec(buf); + if (bootverbose) + device_printf(dev, "number of keys: %d\n", sc->sc_nkeys); + } else { + sc->sc_nkeys = 0; } #ifdef DEBUG diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 73a8fc449c2c..b2fa62f8b6af 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -33,6 +33,7 @@ struct asmc_softc { device_t sc_dev; struct mtx sc_mtx; int sc_nfan; + int sc_nkeys; int16_t sms_rest_x; int16_t sms_rest_y; int16_t sms_rest_z; From nobody Sun Feb 22 04:06: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 4fJVmX1Yv8z6StPt for ; Sun, 22 Feb 2026 04:06: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 4fJVmW5ZbJz3X04 for ; Sun, 22 Feb 2026 04:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733211; 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=5UN38qZPaTo0BjugoWJzMyqk2iukOix67BCUC6fPOMY=; b=pwr/i6/iOqplOGj66/XnWCzqf0YEPWL1aKUAijovrIkGDWpauY0Ef3cgwAfpLcLjy8qn5d tDkjmcewfpfwncLehgsJ9h+o72pbE0oxoE9utMleb8gFLqideWCTBMJzSY9I5rBPbD9k7B 3Ic27wlzhwUP9a4QS+z6/8AC9324OEl4iuI6FH4wDbr535lWXa4ccsj3AObt6JyFbwtoTy FrePwxbL7jd2Qg0lHZWj8bXh3Ju0STVcJKFvdd6706m4Xut8XztKDkcHlwhb8bbfNp2JmU tlHUcZ12gnve8O30Q4YanwIGkqMzUh5kIvKwNGuzQw9t8+NDS2t21Q0hz/cKfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733211; a=rsa-sha256; cv=none; b=qjx/bbSXuxckUzYgTpfSmWbu0zV4TN57L8cSr496tmp7q3XmAJu/0i+cpqopyxD1BoIAI2 9OM672wpvboIzzzwuOHnmWU7NYATNsN/w8csq3ThLum1Ff/f8qmIxLnFE/LD/69HkSw1OS hF+V9m5MN813Fi7oD0iMO44F/L0pb1WeKyzuyS4HLUE/mRvqeKi4jLx1m2S53Fn0uxmNti CVe85+q3OBr2SEykEjzQxkrFaYPvDWUouDrfh1ljc4BTabo0lxvv3cG6G0wzarTIbKyc7P 2t8DfZ9DATgH+b8ILBiFQyM/M6+csWtTbHREordWPDebzm2fWr02CVyXux+dqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733211; 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=5UN38qZPaTo0BjugoWJzMyqk2iukOix67BCUC6fPOMY=; b=vZMFlKsMQWpEw3/xo4SbJGW0v/4DhD9QnjbcS7uiTnAvzprfem3g+h8wrflfG17nEbUHWh RL5lW8gqLUw8XpakMubsII4dhwaQsyU76VILZchHACRowjCX7ifpeUjjFtCUGMRRc1tqPW sT6XH41TpWmvvKQsZ5ZHkLT+J5W43K27BmAUpCr+7TX3B9g6BegFOH/SUu8OjqdBZP4gE+ 71iagF8aB1jC1gMMBb4210oASabeZLRJBIlgdNM1dOYvQbzOjL8v+ETC7uLtsjOHUWKgYo e23bqVVpD6QC5gqMUgyp+AK78CDTJrOW6cGwdoGZm9PYFuE/iWzktYjIdeBgHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVmW53zzzClJ for ; Sun, 22 Feb 2026 04:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23123 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:06:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: f0d2b3799722 - stable/14 - asmc: add per-fan manual mode control via sysctl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f0d2b37997227cd580abadefbb1cd71fcaef9c6e Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:06:51 +0000 Message-Id: <699a80db.23123.5c33e07b@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f0d2b37997227cd580abadefbb1cd71fcaef9c6e commit f0d2b37997227cd580abadefbb1cd71fcaef9c6e Author: Abdelkader Boudih AuthorDate: 2026-01-05 18:03:23 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:04:06 +0000 asmc: add per-fan manual mode control via sysctl Add per-fan manual mode control via dev.asmc.0.fan.N.manual sysctl. Apple SMCs support manual fan control via the FS! SMC key, a 16-bit bitmask where each bit controls one fan (0=auto, 1=manual). This change adds a new sysctl per fan: dev.asmc.0.fan.N.manual (0=auto, 1=manual) When set to manual mode (1), the fan runs at the speed set via dev.asmc.0.fan.N.targetspeed instead of automatic thermal control. When set to auto mode (0), the SMC controls fan speed automatically. The FS! key was already defined in asmcvar.h but not accessible. This exposes it for debugging, testing, and advanced fan control. Implementation uses read-modify-write to allow independent control of each fan without affecting others. Reviewed by: adrian, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54437 (cherry picked from commit 1ecac45cfc5f0886907c34ec0da2c1b32618665d) --- sys/dev/asmc/asmc.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index e4b1afa9619d..aabbc3fbd0b0 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -98,6 +98,7 @@ static int asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS); +static int asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS); static int asmc_temp_sysctl(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS); @@ -639,6 +640,13 @@ asmc_attach(device_t dev) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, dev, j, model->smc_fan_targetspeed, "I", "Fan target speed in RPM"); + + SYSCTL_ADD_PROC(sysctlctx, + SYSCTL_CHILDREN(sc->sc_fan_tree[i]), + OID_AUTO, "manual", + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + dev, j, asmc_mb_sysctl_fanmanual, "I", + "Fan manual mode (0=auto, 1=manual)"); } /* @@ -1330,6 +1338,53 @@ asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS) return (error); } +static int +asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) +{ + device_t dev = (device_t) arg1; + int fan = arg2; + int error; + int32_t v; + uint8_t buf[2]; + uint16_t val; + + /* Read current FS! bitmask (asmc_key_read locks internally) */ + error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + if (error != 0) + return (error); + + /* Extract manual bit for this fan (big-endian) */ + val = (buf[0] << 8) | buf[1]; + v = (val >> fan) & 0x01; + + /* Let sysctl handle the value */ + error = sysctl_handle_int(oidp, &v, 0, req); + + if (error == 0 && req->newptr != NULL) { + /* Validate input (0 = auto, 1 = manual) */ + if (v != 0 && v != 1) + return (EINVAL); + /* Read-modify-write of FS! bitmask */ + error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + if (error == 0) { + val = (buf[0] << 8) | buf[1]; + + /* Modify single bit */ + if (v) + val |= (1 << fan); /* Set to manual */ + else + val &= ~(1 << fan); /* Set to auto */ + + /* Write back */ + buf[0] = val >> 8; + buf[1] = val & 0xff; + error = asmc_key_write(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + } + } + + return (error); +} + /* * Temperature functions. */ From nobody Sun Feb 22 04:06: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 4fJVmY164Tz6StM8 for ; Sun, 22 Feb 2026 04:06: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 4fJVmX6wtLz3WgN for ; Sun, 22 Feb 2026 04:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733213; 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=c6SVp2jjQ7ubFD7zQ5+thqoDK/X6kxovn2JaetbgEGg=; b=uFwmzstY/b565xK3nDitGHQcQhif4CMPvADAZRyRJYv6nEV8OMhSPNvVk6F1l7JNiraMpS iqkeLfgvzuQ+yfISY3BB/bvc/dWkFcNbpoavKPt0HQ8ytLIEby4Vo+hdeAbOn1SeVuxgw1 sARByoj8m2QESsdc9EP6y2p5/Rk/850B815r//xR5DUHuBGHwb6+3J5Fr6UDmPEy1B8qLG PuKvyw0pOS12NFWGEbUl8mjhidGAugOHTJAp8VHitLwFHIMR+Jw2PBH8CLahwQCn+hc33i 2Ph+5DhzuSFo/ieXtsYqMUP4A4bdnpGQszFm673bK2HKitMJjnGDLMNfPT8A1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733213; a=rsa-sha256; cv=none; b=Xj9bopMhkH72UvJ/EXhMryfhbUa4rCChhT19lov2xyQm+KuJng7bu/iBBcRwedSKuizpn3 duOWtFvjyyw/H9mDOj3bjxxqk6ax/SU8qktrbjCaed2CLH3gJbmgOQ4JKeiQrBQ/bT50es kFn9RpmNZOeqxhPgiAVvzAF5zcLvYX3C7KeGytgEyyMMtLB8LKYk3dPD8bovzp/HIH9GVa Og+ALklLlOb1mayr87SeKD/h7l0fomLSo6IRhsWbk0nQa1hhUSBltn/ugMGvbjqjfhqKc0 MuoBbeBotWe/tFRifQRtA2TeixF5WiQY4le3tzu9tdFqBRKNfJd77bt/momjvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733213; 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=c6SVp2jjQ7ubFD7zQ5+thqoDK/X6kxovn2JaetbgEGg=; b=ABDe5dGAMlKbDQ1kg2gSZZ20gEfuNo32oXtUyz16QCxU3WFl6ywfbRPKURHD1ayzaThhWL +Yk1hvuL4bXhG7MWSN//hlzRubv65RaktWZcy9D+aq4p6aD2g40v49oipbULDqSdj9r/xK MGEbPpMshn3haIE86U72ngBlVo0y6KXJ2rPtotu1CTCFwROicwh6lHWAcUaFXH2BJyNClu Pfg2+qZVI1O5s7AGbRvDbTUSoOF+LI5pZU3RknmcugZJY9/PdscQQF4vyZ0IVRS7Z4l6T9 M+Zwp39apesFvsSYAaNBlpGJfAdyelJoABR9PfgeHmkgDG3AQ3cioY0f8pV9mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVmX5rynzCYS for ; Sun, 22 Feb 2026 04:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24183 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:06:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 75045de2ba9c - stable/14 - asmc: Add support for MacBookPro11,5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75045de2ba9ceb5a0aac534f477e5e9fc49d3e2b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:06:52 +0000 Message-Id: <699a80dc.24183.22dfd22f@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=75045de2ba9ceb5a0aac534f477e5e9fc49d3e2b commit 75045de2ba9ceb5a0aac534f477e5e9fc49d3e2b Author: Abdelkader Boudih AuthorDate: 2026-01-14 03:13:46 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:04:50 +0000 asmc: Add support for MacBookPro11,5 Add support for the MacBookPro11,5 (Mid 2015, 15-inch with AMD Radeon R9 M370X GPU) to the Apple SMC driver. Debug testing revealed this model lacks several SMC keys present on MacBookPro11,4 (IBLC, ICMC, IC2C), that model-specific sensor definitions. Differential Revision: https://reviews.freebsd.org/D54665 Reviewed by: adrian (cherry picked from commit c498eaa2f9090d7bdc6456181d8bf74869288bbb) --- sys/dev/asmc/asmc.c | 7 +++++++ sys/dev/asmc/asmcvar.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index aabbc3fbd0b0..c0fb342709a1 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -286,6 +286,13 @@ static const struct asmc_model asmc_models[] = { ASMC_MBP114_TEMPS, ASMC_MBP114_TEMPNAMES, ASMC_MBP114_TEMPDESCS }, + { + "MacBookPro11,5", + "Apple SMC MacBook Pro Retina Core i7 (mid 2015, 15-inch, AMD GPU)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, + ASMC_MBP115_TEMPS, ASMC_MBP115_TEMPNAMES, ASMC_MBP115_TEMPDESCS + }, + /* The Mac Mini has no SMS */ { "Macmini1,1", "Apple SMC Mac Mini", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index b2fa62f8b6af..c5ef84519742 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -467,6 +467,41 @@ struct asmc_softc { "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } +/* MacBookPro11,5 - same as 11,4 but without IBLC, ICMC, and IC2C keys */ +#define ASMC_MBP115_TEMPS { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", \ + "IC3C", "ILDC", "IAPC", "IHSC", \ + "TC0P", "TP0P", "TM0P", \ + "Ta0P", "Th2H", "Th1H", "TW0P", "Ts0P", \ + "Ts1P", "TB0T", "TB1T", "TB2T", "TH0A", "TH0B", \ + "TC1C", "TC2C", "TC3C", "TC4C", "TCXC", \ + "TCGC", "TPCD", "TCSA", "VC0C", "VD0R", \ + "VP0R", "ALSL", "F0Ac", "F1Ac", "PCPC", \ + "PCPG", "PCPT", "PSTR", "PDTR", NULL } + + +#define ASMC_MBP115_TEMPNAMES { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", \ + "IC3C", "ILDC", "IAPC", "IHSC", \ + "TC0P", "TP0P", "TM0P", \ + "Ta0P", "Th2H", "Th1H", "TW0P", "Ts0P", \ + "Ts1P", "TB0T", "TB1T", "TB2T", "TH0A", "TH0B", \ + "TC1C", "TC2C", "TC3C", "TC4C", "TCXC", \ + "TCGC", "TPCD", "TCSA", "VC0C", "VD0R", \ + "VP0R", "ALSL", "F0Ac", "F1Ac", "PCPC", \ + "PCPG", "PCPT", "PSTR", "PDTR" } + +#define ASMC_MBP115_TEMPDESCS { "CPU High (CPU, I/O)", "DC In", "SSD", "Charger (BMON)", "CPU", \ + "Other 3.3V", "Other 5V", "Memory", "Platform Controller Hub Core", \ + "CPU DDR", "LCD Panel", "Airport", "Thunderbolt", \ + "CPU Proximity", "Platform Controller Hub", "Memory Proximity", "Air Flow Proximity", \ + "Left Fin Stack", "Right Fin Stack", "Airport Proximity", "Palm Rest", "Palm Rest Actuator", \ + "Battery Max", "Battery Sensor 1", "Battery Sensor 2", "SSD A", "SSD B", \ + "CPU Core 1", "CPU Core 2", "CPU Core 3", "CPU Core 4", "CPU PECI Die", \ + "Intel GPU", "Platform Controller Hub PECI", "CPU System Agent Core", "CPU VCore", "DC In", \ + "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ + "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } + #define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ From nobody Sun Feb 22 04:09: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 4fJVqJ37gyz6StNc for ; Sun, 22 Feb 2026 04:09: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 4fJVqJ2N1Nz3Y1d for ; Sun, 22 Feb 2026 04:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLbRll1ly8JDDmX6mhuYzoau7KC+b/p9rW0AH4SZsqE=; b=HB7USwPK2k2ws8hWTmglWeQW2+w9DAvfIXRQ9zXGDv6DyV2RLR5tZW/aweDi8+ojHfj+VO b4Fcyz7B3fiJP9VNR7RhaRgG/bXTou5idhk4aXCDkkY7t5mPNe5ev9rHnVT7ZdwC/WIY8l 9dVhBKn9jB+1HtF0UU/Tw1ULOO2ev5UHRvx2f6iU5COVgQFwvhnHDKK+K/p+uOV6INGe8w Mfj+TTqJc9JFUKGunVoJ6K8onITHfd8jE0C7IksxNhkeyBTpWTHrdNmTcB0aO7pc/vWZ2V lT1VTRfUpaamtN94J7yc+doJshlQij8p8RORRyNKCoSqFrOdo1NOGaPJARkNKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733356; a=rsa-sha256; cv=none; b=nokH6WeBxZNoT9K5Ae986NrpC2HGebroxug4pfdekumHxx6I/Oi4dgGc7oq5Y2soGJO05z AtMJDi2o8HEFdQcpcwmKEBFV0N3TBK5ztg5YSS8VljiaoKcl4g4V6k13+b1yvCLljyNLHc GaY5qEhP2Y18PJpqdYWQzv3Z5ymMSutWxzPQS53WR+HgkfRmkk+CV8TEkX6VXhnxDjmmua rVIwoAYwb2XdFNvEnizPKdy4C7j2312Aqgxdn7eQsUsnIAFeobuPEArPBqq85Yrn9VGD7V cszKmYHJKcaPP5McRCmPymvDpojc8To8LXat3ir7JrR90RE5grxCX5y+b6XvOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLbRll1ly8JDDmX6mhuYzoau7KC+b/p9rW0AH4SZsqE=; b=spjLnYtKaa97wdDaIbg3b2pTVYrd8YqW0jQWiff9pdZLu4/gdCSBpFNhS4QRagSnfRfMHR YvZb6nFrsZrwATMQx15jo4FDu7mzin7ZHcvKQOhelGsN7tpy4bIF/q6bTy9ReWV7BnGgXC xb/wyRgjuRgmviXcTMnCdyU0yb/joAKMbsJhIeG/4eoH+cHOzy8lf4TnfjDCvIkUajrwKI 8VydhkrK2CUf/6pWIlqNMhFRL5kw8RPbqcOVHt/6xeJiBoakfMjDGHYEVgKYBlCOJZ4bp4 qZZYiAAiaHIbhPWFQhI36/cDUA+z3oJxPl6F4QzaVZB049h6OikLpqTBNBPLaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVqJ18P8zCr2 for ; Sun, 22 Feb 2026 04:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22566 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:09:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 5c361eb2c085 - stable/14 - openssl: add a simple smoke test for the legacy provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c361eb2c0852b7a5fc59044c08f24db3cb9df52 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:09:16 +0000 Message-Id: <699a816c.22566.1919001@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=5c361eb2c0852b7a5fc59044c08f24db3cb9df52 commit 5c361eb2c0852b7a5fc59044c08f24db3cb9df52 Author: Enji Cooper AuthorDate: 2025-10-11 20:45:20 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:08:44 +0000 openssl: add a simple smoke test for the legacy provider This change adds a simple smoke test for the legacy provider to ensure that the provider doesn't break in the future when performing updates. This is not a functional or system test; the OpenSSL test suite does a much better job at doing this than we can. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53045 (cherry picked from commit 3b6442370a17c57c4c290b9a8e1e8328da820705) --- etc/mtree/BSD.tests.dist | 2 ++ secure/lib/libcrypto/Makefile | 3 +++ secure/lib/libcrypto/tests/Makefile | 5 ++++ secure/lib/libcrypto/tests/libcrypto_test.sh | 40 ++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index eed5db1c806f..f5d683630c92 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -490,6 +490,8 @@ .. secure lib + libcrypto + .. .. libexec .. diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index dc701d90451e..112080031d90 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -615,6 +615,9 @@ buildasm cleanasm: ${.TARGET:S/build/all/:S/asm$//} .endfor +HAS_TESTS= yes +SUBDIR.${MK_TESTS}= tests + .include PICFLAG+= -DOPENSSL_PIC diff --git a/secure/lib/libcrypto/tests/Makefile b/secure/lib/libcrypto/tests/Makefile new file mode 100644 index 000000000000..d309a1b1100c --- /dev/null +++ b/secure/lib/libcrypto/tests/Makefile @@ -0,0 +1,5 @@ +PACKAGE= tests + +ATF_TESTS_SH+= libcrypto_test + +.include diff --git a/secure/lib/libcrypto/tests/libcrypto_test.sh b/secure/lib/libcrypto/tests/libcrypto_test.sh new file mode 100755 index 000000000000..83ef1686089d --- /dev/null +++ b/secure/lib/libcrypto/tests/libcrypto_test.sh @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Enji Cooper + +atf_test_case legacy_provider +legacy_provider_head() { + atf_set "descr" "daemon should drop privileges" +} +legacy_provider_body() { + local passphrase="test" + local plaintext="test" + + export OPENSSL_CONF="$PWD/openssl.conf" + cat > "$OPENSSL_CONF" <; Sun, 22 Feb 2026 04:09: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 4fJVr64PMPz3Yfl for ; Sun, 22 Feb 2026 04:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=97ZFL99X6Gs0/mw6cg3QZiMmvRBens2k8yu49/FYgQY=; b=ZkWOXhMd5xc/h4h3Yipv/XSAUljZCfjC99EX/HJu71Ae5H2ZCLTqR7XMuFffgMOi+pdS7b VVV1P0v9PahN5VK0cpPJQ/xNSWuzhPCvTKw8lBfEQtwEh4b6xvmgn0IZPyoopI/a2flE2K 02RUzAgceliaYnJvzQiCd+KSjZakLa904A/vlOzUTwqY6224c5uX8lUQJqiNcY/ZJ5y9P2 s71npxDVD3M8csrIqM9eT7yt7nE00OEcN21L+Hs8/iTjYkZzb7HSxIJAhp6O2gbyq081wf fnR1Ys2J2ZTsIK9Qp/87QWa/484bWGceOHwD+HZlvjrW3E8Qu129Rz3RWUkf/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733398; a=rsa-sha256; cv=none; b=mHZ405oOxIH+DpGjal6F/f2XvObdB8NSPOxeGe1wiOtzKQvAOhhtItNM613iS0jTEKbsB6 2eA6dTKfIfXtnxoQ02obcrO/OOJfFqlxhqMdzrD664NI/i89mWu3FrNM+eddBuqTMs9Czr vnuJJq3v719/rTKP1ShsRls2MeReFdf28gFgG1mm52UkhDv1OKYMkdwzelTBv8mKde4Hb2 Qkbm7cK5nFdzSW+M2xAADmqdE1My3KoXXFYS5pFnUxnZjJt+Q9n8QrECdZ5LUJvwEjo+0t ec4CDuOUAwC2vu7g8vDV3Txq056K513vALToMChnPu7F5WRQ3oiFCRBoXrpMBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=97ZFL99X6Gs0/mw6cg3QZiMmvRBens2k8yu49/FYgQY=; b=W12ZZrmZZUHr5hY3lHZnaAAeK8yjsPqGxjCj7NUJKZtX8cS7vsSZG0HDEzMDNVXg5S2Ebe OoWysJ6puMUI3andTq7ZJc1QGtEvzzdATMp0bTCn5wIz2RJxbtr8o71NUozMjy/N/PScss HKnOhsSQyobYG9ylpElzUbQO7HsN+fVc4zIkCgkCqSdYsN6zKimizPKLCfSmOtILERTE2o /lbQR2ifmfh3h/gOh52GNiO2Qzkda0hgx5RZSphS1sx0tDvBKOrvG8T+lkmeWSDrXSlEhD jQlFv5eeayrTfxoehvaP2F9jDR756jNc/pyxJxmGpAEoNVLX80OnLOkFrUGhgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVr63tDxzCXj for ; Sun, 22 Feb 2026 04:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23aff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:09:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: fca1e5d1ef18 - stable/14 - Remove example tests when MK_EXAMPLES=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: fca1e5d1ef1853a823825407223cc7ff7d85a111 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:09:58 +0000 Message-Id: <699a8196.23aff.44f12249@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=fca1e5d1ef1853a823825407223cc7ff7d85a111 commit fca1e5d1ef1853a823825407223cc7ff7d85a111 Author: Enji Cooper AuthorDate: 2026-02-01 17:12:44 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:09:49 +0000 Remove example tests when MK_EXAMPLES=no This change cleans up example tests for atf, googletest, plain, and TAP when MK_EXAMPLES=no. Not having this in results `kyua test -k /usr/tests/share/examples/Kyuafile` being broken on a host where the content in that directory tree is stale. I ran into that case because at some point in time in the past I had specified `MK_GOOGLETEST=no` one of my dev instances. MFC after: 1 week (cherry picked from commit cea2683bb691d6cbcfb7e342c497d018bba712c2) --- tools/build/mk/OptionalObsoleteFiles.inc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e5626cf2144f..72b495416d3b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1927,6 +1927,26 @@ OLD_FILES+=usr/share/examples/sunrpc/sort/Makefile OLD_FILES+=usr/share/examples/sunrpc/sort/rsort.c OLD_FILES+=usr/share/examples/sunrpc/sort/sort.x OLD_FILES+=usr/share/examples/sunrpc/sort/sort_proc.c +OLD_FILES+=usr/tests/share/examples/tests/atf/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/atf/cp_test +OLD_FILES+=usr/tests/share/examples/tests/atf/printf_test +OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample2_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample3_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample4_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample5_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample6_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample7_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample8_unittest +OLD_FILES+=usr/tests/share/examples/tests/plain/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/plain/cp_test +OLD_FILES+=usr/tests/share/examples/tests/plain/printf_test +OLD_FILES+=usr/tests/share/examples/tests/tap/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/tap/cp_test +OLD_FILES+=usr/tests/share/examples/tests/tap/printf_test +OLD_FILES+=usr/tests/share/examples/tests/Kyuafile OLD_FILES+=usr/share/examples/tcsh/complete.tcsh OLD_FILES+=usr/share/examples/tcsh/csh-mode.el OLD_FILES+=usr/share/examples/uefisign/uefikeys @@ -1993,6 +2013,12 @@ OLD_DIRS+=usr/share/examples/sunrpc/sort OLD_DIRS+=usr/share/examples/tcsh OLD_DIRS+=usr/share/examples/uefisign OLD_DIRS+=usr/share/examples/ypldap +OLD_DIRS+=usr/tests/share/examples/tests/atf +OLD_DIRS+=usr/tests/share/examples/tests/plain +OLD_DIRS+=usr/tests/share/examples/tests/googletest +OLD_DIRS+=usr/tests/share/examples/tests/tap +OLD_DIRS+=usr/tests/share/examples/tests +OLD_DIRS+=usr/tests/share/examples .endif .if ${MK_FDT} == no From nobody Sun Feb 22 04:10: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 4fJVrH5dLJz6Sthd for ; Sun, 22 Feb 2026 04:10: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 4fJVrH4yzKz3YSK for ; Sun, 22 Feb 2026 04:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Zl00amE6olw3h++CJUHnzgxc9w46tMalNeJX7e0WwM=; b=IIk/nVQpQimK9lfv7JXN25aCaNJamYn1EK6G4xU8LMnE5f+dnnxgZW+kHfYi+/3xB39rCW CHkfX5USItnALMVCmmcnkSmD5+kEyGznssRUeYBAc9bSeCkoCF8Jn+MOEHggxLTIYkXShH xhtwEKQ9Dt6k1gIYcyq5kVl43+cQqcKTEZzF//Kt/YuYrHItr3c2bONkzItHsfX+SOvMo2 uoTbYIdH+/zmQT/KVl5cMEHA/1+Crrowm/oA5LDmxfq6R2d9+cX5SNFmps4vm29SQTHL1+ 2mE9n82RatcKmlw6Fk+YO1vKcUOG48ZC3VOIIanGP87Ox0LPpIYovQ3Tjr7TUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733407; a=rsa-sha256; cv=none; b=WHFadWiOEzkU2xFJmQw29Wsnz+LlxcR0m1XsgJg9QIrwwbW9vgapmDUuHm6ampgN5cVO8/ HPd5aO9AjhYdZ95aLY8WTTyKt817VBXNvD/RHnZiAOICJ7yU95PyDaPJXWyMENuSG+wGxz N4q6VG7v5Wgl9ftABkpXGDAfzbh8qNfgEomwntMGJ2Wtd0jA9PbIpqozRCpwPET0oklJLH kSyDiL6xWHkHyzzLtbH5ikNSyiSWLw9mJ5EFAyB+kpUdySEtb8pK/Y6ZnMw2nAxoLNgbzG /a53JPBHSPWGfjD4uUqMzdl2nA/brWXkmNqIs9b+cdnZsNAnh3D/vEavEJxpNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Zl00amE6olw3h++CJUHnzgxc9w46tMalNeJX7e0WwM=; b=bdtGfyHktiXFvIzIkeCQe6zKj1CYUTxUagBpyNzZP4xA+en7OAnx4kR99ORH4lWC1ItKHb +TtoFdVt9pvpoBknFXZwqmaqe0wbVCFf9X0KJAeF2MTOzZfuFw1ipO/K4KEHw+DW1IPsJ3 4RetXJeQlzQ1bzycul3N4p9ln4TbBJWaxaZrGs5LjZQSfFl6w8aYngcmGeTwKksMD5H0TJ s7zuNV1OMVFYSm5Gbo7tlv5b8J2FvYDcjdW04agNgT/WTkCLwjp6Fd+WM45EdtslEhbqMC gUPHm7tkwyzm6TsaVkdz6wfaObONX7yEnwseTKQll9BKI4aceClvP+77vXWhCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVrH4Yr9zCGs for ; Sun, 22 Feb 2026 04:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24df5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:10:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 640c1ee72d2a - stable/15 - Remove example tests when MK_EXAMPLES=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 640c1ee72d2af4b6d831f3e417702467f439030e Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:10:07 +0000 Message-Id: <699a819f.24df5.50b286e@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=640c1ee72d2af4b6d831f3e417702467f439030e commit 640c1ee72d2af4b6d831f3e417702467f439030e Author: Enji Cooper AuthorDate: 2026-02-01 17:12:44 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:10:02 +0000 Remove example tests when MK_EXAMPLES=no This change cleans up example tests for atf, googletest, plain, and TAP when MK_EXAMPLES=no. Not having this in results `kyua test -k /usr/tests/share/examples/Kyuafile` being broken on a host where the content in that directory tree is stale. I ran into that case because at some point in time in the past I had specified `MK_GOOGLETEST=no` one of my dev instances. MFC after: 1 week (cherry picked from commit cea2683bb691d6cbcfb7e342c497d018bba712c2) --- tools/build/mk/OptionalObsoleteFiles.inc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7d348b0fce40..3617e2d4df40 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1926,6 +1926,26 @@ OLD_FILES+=usr/share/examples/sunrpc/sort/Makefile OLD_FILES+=usr/share/examples/sunrpc/sort/rsort.c OLD_FILES+=usr/share/examples/sunrpc/sort/sort.x OLD_FILES+=usr/share/examples/sunrpc/sort/sort_proc.c +OLD_FILES+=usr/tests/share/examples/tests/atf/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/atf/cp_test +OLD_FILES+=usr/tests/share/examples/tests/atf/printf_test +OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample2_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample3_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample4_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample5_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample6_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample7_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample8_unittest +OLD_FILES+=usr/tests/share/examples/tests/plain/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/plain/cp_test +OLD_FILES+=usr/tests/share/examples/tests/plain/printf_test +OLD_FILES+=usr/tests/share/examples/tests/tap/Kyuafile +OLD_FILES+=usr/tests/share/examples/tests/tap/cp_test +OLD_FILES+=usr/tests/share/examples/tests/tap/printf_test +OLD_FILES+=usr/tests/share/examples/tests/Kyuafile OLD_FILES+=usr/share/examples/tcsh/complete.tcsh OLD_FILES+=usr/share/examples/tcsh/csh-mode.el OLD_FILES+=usr/share/examples/uefisign/uefikeys @@ -1993,6 +2013,12 @@ OLD_DIRS+=usr/share/examples/sunrpc/sort OLD_DIRS+=usr/share/examples/tcsh OLD_DIRS+=usr/share/examples/uefisign OLD_DIRS+=usr/share/examples/ypldap +OLD_DIRS+=usr/tests/share/examples/tests/atf +OLD_DIRS+=usr/tests/share/examples/tests/plain +OLD_DIRS+=usr/tests/share/examples/tests/googletest +OLD_DIRS+=usr/tests/share/examples/tests/tap +OLD_DIRS+=usr/tests/share/examples/tests +OLD_DIRS+=usr/tests/share/examples .endif .if ${MK_FDT} == no From nobody Sun Feb 22 04:19: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 4fJW385x5zz6SvGf for ; Sun, 22 Feb 2026 04:19: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 4fJW385BBcz3ZqG for ; Sun, 22 Feb 2026 04:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733972; 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=GXKdPYWJVVJowK8FFNdy37ay0wepPDqu6aszXc5i8q0=; b=YR6OSyxF7p5yPI9FL0xEaGye/2Py8J1oN3GlPEjEQIXRR5Uk7Z3TzNXEV3P5JMEIOWJHtQ mPvuaOG5r0a1/rg4Hm3QGSLMTg0FPchfXFyv3AP/c2+87Jmkfwel0WUClScXqYuN6xEe2i W6dZwlJ/3UozbQ4ORqXq6jk2HKgqSnjuZ5LbmS68sM7DPIc1poMtK0Q5vFvHwLexC4wQzA CESkK1uv4igf8/65JKSq9nn3GKyilUZt+0TFNLvvlzBM/8lH7GdKwo/Eh6S3si/BhcTKge GX/OqPxqe4n7/cVkQSmVM+X3gzV0sbsMBBF1qCnMygWpKBFjZi/FnCQceFeZdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733972; a=rsa-sha256; cv=none; b=k2QD4BjvUhoQl/P+ignxHUB1LN158LbBxAo7xgD6ns5sjuE3JyY53jSvn97PYWWpQXV1rg EJPIP88CnMt8W8DLvRgIz0t0O0LVAq4+DTp2Xdr0HYj5qGBpfCp+n2niHjzJlKXl1RQi9d XnWm6+rDBAlqKFhXPRhNsHxXTbP7aRsRft/CARhoNOJXeZBDZtqFYf2PC9nMuCInmwdOfq UiCN9ZNPeqKCDDF3gyTGxaDwiszvBS3VEFjYH/JSYcw+AXpdozYHAFfcN1dWCwS7hKWOWY xeR2OGZL0dFlarsyv2aFDjAyncZyT0zhE4huPlcf6DsQA8ROha+81Zw3YfhJIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733972; 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=GXKdPYWJVVJowK8FFNdy37ay0wepPDqu6aszXc5i8q0=; b=Rck82kobeZ+Bd1zWLprvOF0OTVFpKutHuVCKQwVnU2RFRvHHeXK+xskBeicDinzgvhcz+d Qgaz+UuGSggNpwf4cNd9caRyDq8iXGDVBpYaFqFo6MybY0AeQlRr4w/gQbQIt4Yd2f6M3L zjRebGq1oLMOVW0yQB4OVPEqOZtBDdlK6Fqr56HMYieKArhK+v0wIor01uKAac+UBSHL68 YPsZeEdLPWk7kW5T7e9oHGX/j716jl6pR6iaInt4K78ofN5hjJQckkSP59nLriJKfApCWc 2BYFb2BNF+gAHHo86bWPjgapGRM8f6EvWrXZ6XoXjp94rbKvbxThqoSvjfikXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJW384l3GzCpJ for ; Sun, 22 Feb 2026 04:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:19:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: cd937141ac00 - stable/15 - acpi: add Darwin OSI quirk for Apple Mac hardware List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd937141ac0041d018e56bfc39843b7a96a5fd41 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:19:32 +0000 Message-Id: <699a83d4.25b31.29b25edf@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=cd937141ac0041d018e56bfc39843b7a96a5fd41 commit cd937141ac0041d018e56bfc39843b7a96a5fd41 Author: Abdelkader Boudih AuthorDate: 2026-02-03 01:43:00 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:17:44 +0000 acpi: add Darwin OSI quirk for Apple Mac hardware Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86 systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not installed via ACPI. Prior to this change, FreeBSD always used the dGPU. This is fine in practice, but consumed more power than when the iGPU is used, resulting in reduced battery life. Linux handles this in `drivers/acpi/osi.c` by detecting Apple hardware via DMI, disabling all Windows OSI strings, and by explicitly installing the Darwin OSI ACPI handler. This change applies equivalent logic to the acpi(4) driver on FreeBSD. This feature can be enabled/disabled using the `hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0` restores the previous behavior by explicitly disabling the added support. Reviewed by: obiwac, ngie, adrian Differential Revision: https://reviews.freebsd.org/D54762 (cherry picked from commit 052a791b00555805f19ccc38a04d42d48b54104b) --- sys/dev/acpica/acpi.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 04fc8d708a7d..9a141248524c 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -273,6 +273,17 @@ static char acpi_remove_interface[256]; TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface, sizeof(acpi_remove_interface)); +/* + * Automatically apply the Darwin OSI on Apple Mac hardware to obtain + * access to full ACPI hardware support on supported platforms. + * + * This flag automatically overrides any values set by + * `hw.acpi.acpi_install_interface` and unset by + * `hw.acpi.acpi_remove_interface`. + */ +static int acpi_apple_darwin_osi = 1; +TUNABLE_INT("hw.acpi.apple_darwin_osi", &acpi_apple_darwin_osi); + /* Allow users to dump Debug objects without ACPI debugger. */ static int acpi_debug_objects; TUNABLE_INT("debug.acpi.enable_debug_objects", &acpi_debug_objects); @@ -4616,6 +4627,67 @@ acpi_reset_interfaces(device_t dev) } acpi_free_interfaces(&list); } + + /* + * Apple Mac hardware quirk: install Darwin OSI. + * + * On Apple hardware, install the Darwin OSI and remove the Windows OSI + * to match Linux behavior. + * + * This is required for dual-GPU MacBook Pro systems + * (Intel iGPU + AMD/NVIDIA dGPU) where the iGPU is hidden when the + * firmware doesn't see Darwin OSI, but it also unlocks additional ACPI + * support on non-MacBook Pro Apple platforms. + * + * Apple's ACPI firmware checks _OSI("Darwin") and sets OSYS=10000 + * for macOS. Many device methods use OSDW() which checks OSYS==10000 + * for macOS-specific behavior including GPU visibility and power + * management. + * + * Linux enables Darwin OSI by default on Apple hardware and disables + * all Windows OSI strings (drivers/acpi/osi.c). Users can override + * this behavior with acpi_osi=!Darwin to get Windows-like behavior, + * in general, but this logic makes that process unnecessary. + * + * Detect Apple via SMBIOS and enable Darwin while disabling Windows + * vendor strings. This makes both GPUs visible on dual-GPU MacBook Pro + * systems (Intel iGPU + AMD dGPU) and unlocks full platform + * ACPI support. + */ + if (acpi_apple_darwin_osi) { + char *vendor = kern_getenv("smbios.system.maker"); + if (vendor != NULL) { + if (strcmp(vendor, "Apple Inc.") == 0 || + strcmp(vendor, "Apple Computer, Inc.") == 0) { + /* Disable all other OSI vendor strings. */ + status = AcpiUpdateInterfaces( + ACPI_DISABLE_ALL_VENDOR_STRINGS); + /* Install Darwin */ + if (ACPI_SUCCESS(status)) { + status = AcpiInstallInterface("Darwin"); + } + if (bootverbose) { + if (ACPI_SUCCESS(status)) { + device_printf(dev, + "Apple hardware: installed Darwin " + "OSI and removed other vendor OSI " + "(Windows, etc)\n"); + } else { + device_printf(dev, + "Apple hardware: failed to install " + "Darwin OSI: %s\n", + AcpiFormatException( + status)); + } + } + } else if (bootverbose) { + device_printf(dev, + "Not installing Darwin OSI on unsupported platform: %s\n", + vendor); + } + freeenv(vendor); + } + } } static int From nobody Sun Feb 22 04:19: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 4fJW39739Pz6SvKP for ; Sun, 22 Feb 2026 04:19: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 4fJW3969Ysz3b0F for ; Sun, 22 Feb 2026 04:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kLy3GRkc2c0tDwLwWeWGvGi/VGkH7oHsjsw/uSHWpU8=; b=aHFokyFjFMsxuzb8hPAEZpltQUk3IyUhEaDWvHcYwXt1AYZVaFlOlAhA1Pdt4htGnijSJw bfqQW4tXtbDCuNPdXdn+CulPmRu6Lx0u47J0OFeOOikZYLBIwi9P2qMarqtTwvsDyticxP g9NdkvveOuKGZ9GoKwRRoVl/uaUkzKcKh3TdToRKT5R+PG6r/8Ab4SEj83C23T4PtH6tJU F7dvr+pmBMgBFe6zjQzlxf9bGx3avmx5GT8NqDhekpaWjsQrptLJxuhzDV9J3V62BAUvAs cN1apWHS8mpHV6HmBpMwEJgjrGu3SbHq/u5Q7YK8fDfgEBmxUjSqzQRTiq80AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733973; a=rsa-sha256; cv=none; b=vGb1CHkdmYtEuHHNaCyegPsqXccyTP4kRdvQWzTfEGdzk40OH1IXNMMMjbJW2HmNAF4mUI sKn/1gW3iJdScDCxyfWiG0x2BfoZRDs1jo8CzC2Yu5U6pTNONbQYvjlgSAW+0MMJXv7/mI R11ZRdwDmfLVqSsRkTDN9txWJyYApgoOX6OIDFet+NuFqJHgcmlp3QkIEJG4BNA/LUPzwl MFVzruk5KtPBqr2vwvJ8dgP44XAJUT7eIWqslg5etAsztAOw6BCvkfJgIjtti4bQYyY0Zz LEKFNLgoQKLeav//C2TxEgs+z6jJ8alJHVh1wtTS+A5KOjuLM4XUs4i5AN2zpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kLy3GRkc2c0tDwLwWeWGvGi/VGkH7oHsjsw/uSHWpU8=; b=WP/JfRXXW1G9lA631ynKhR7aJfkx44hBpjy0UpclweELZCjza+dinNpCc671G57GOLtSvU mziCLXPo+lX4tUy98555SJJBSo5ArsrR9uHWIKdkTNi8mphnQ0SbsoWitmBy4DC48SEZPf maj/siOz35ZycHvnl+mQKur1WwrJFY8hmStgWwsy9ue7kRVrLt/2l5kXNY8M5NPSF5LAlZ zZSUX82sewmwDbABnQW93x7iaou/cCr51wUY1Jr/G0Yx5SSnf8INC1GW6RE9jlmuZvk67X UKwzexesbhqpu11ztuWsbpba5aighudshbjjSLrN53amwm18guD0C9nvQFk9zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJW395VcPzCmY for ; Sun, 22 Feb 2026 04:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25836 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:19:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: a0d06f59e849 - stable/15 - Make message added for Darwin OSI quirk more terse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: a0d06f59e84991479adabcfd42d3c80fda1f30e7 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:19:33 +0000 Message-Id: <699a83d5.25836.126a61e0@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=a0d06f59e84991479adabcfd42d3c80fda1f30e7 commit a0d06f59e84991479adabcfd42d3c80fda1f30e7 Author: Enji Cooper AuthorDate: 2026-02-05 02:57:22 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:17:44 +0000 Make message added for Darwin OSI quirk more terse The verbose message was way too verbose. Make it terse. MFC after: 1 week MFC with: 052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware") Requested by: kib (cherry picked from commit 9c666de5b339d3c8f9bf3963691e4310e7d159cb) --- sys/dev/acpica/acpi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 9a141248524c..6bd34d9e16db 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4662,22 +4662,20 @@ acpi_reset_interfaces(device_t dev) /* Disable all other OSI vendor strings. */ status = AcpiUpdateInterfaces( ACPI_DISABLE_ALL_VENDOR_STRINGS); - /* Install Darwin */ if (ACPI_SUCCESS(status)) { + /* Install Darwin OSI */ status = AcpiInstallInterface("Darwin"); } if (bootverbose) { if (ACPI_SUCCESS(status)) { device_printf(dev, - "Apple hardware: installed Darwin " - "OSI and removed other vendor OSI " - "(Windows, etc)\n"); + "disabled non-Darwin OSI & " + "installed Darwin OSI\n"); } else { device_printf(dev, - "Apple hardware: failed to install " - "Darwin OSI: %s\n", - AcpiFormatException( - status)); + "could not install " + "Darwin OSI: %s\n" + AcpiFormatException(status)); } } } else if (bootverbose) { From nobody Sun Feb 22 04:19: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 4fJW3C3HZvz6SvP2 for ; Sun, 22 Feb 2026 04:19: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 4fJW3B6l4dz3Zrg for ; Sun, 22 Feb 2026 04:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RW5mODBZDmC+er2RfpcWQeLivI7F5hene35JancnbCw=; b=GNIS8QCz0l0ssjs/mEijmq+jyGjIKsmBjEAqtoGf1L5K24nTCuSjXXnH5adg8IoqwzhU3R fYFhXcsVTGTk4ErErcKokgrJJn6940lBybNJRDAqSkOkzoqXb0+JMGmJoclF4Xu5ngR3up ozuElXXPabsOw4OhPrUpI+3f5Cr7b+VSTfw6ctN4tH8xpjLwsuHk/7IG2O9v3A8rYdxPFF RC6HAzbg2/TJ+PWdiTz00UfMlK5IHjbDR4QmZFZu/9EFto1v0+xfBwrW13q+BYQ5hW9C3a llW3kB9q+PD2wYB6TTrQdXCDw+LO7qt9rCFrX5DnCHT3RNPLtleC2dwJPYVTHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733974; a=rsa-sha256; cv=none; b=cpRG/ZXeIxlRmj2On8v/vmxQ5XKyFeK37DjXjeuBf/gr/M8SzwrHypp/TgVeL59IwsBNmk jPIscylsqKE2sLyADzhZL6HMw0PZW6SiY1l9nCrI/c3flGZVsANqeIPNnCX76XqvuZXbNY j65QZCA0FW/8N+rEueZVbIgAPfc79MIXW6HALkVZc3+3sSyDXLeU7pi4rjiuzbVUG4LyYQ YpJ4gWZ8vDoQfuko0UJz1Qew5ITLXDSvqfluSV9SK/hP1uGVlDr5DUk4n3tXchzs5XgBhQ Iobkvk2FS2Va50oxcfEFHEE6IPki+TMiFIxFZu6ZSscP2UbGl07DSTdP/+ZeGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RW5mODBZDmC+er2RfpcWQeLivI7F5hene35JancnbCw=; b=AOZ1uuU0lPQbpEcoIoS6YSHgUEGZq5rkI+qyTFxTy7cvAalo3voxRqUtrzFmexG4GeWWip ujPBDMCmDZLxIkf5vKbFahq4yyj+XJ1SJxmizZTpXZBv2q9RW9blBp6YCeD8PySONPBeEO 0vfTltXltUmuCUYq50EGGNBFKAztj3QWa2uxMqenjBIbUaraYU8gLNcf1ck9i9Xt+bxlGE ronUmnwzAdZZfs0UUUEmBTnWOSrTiKON/IhhuJREcknM4qIH1yrS4OYCiSkPRX0sGxzTff N4+jyy/YVR+KLtpIWS52Yuy6dhFTjZZ+QDetb9WXjc7xVfBgcCPO6Od9wZl9sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJW3B6DSbzCmZ for ; Sun, 22 Feb 2026 04:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2509a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:19:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 9ecdc69d3005 - stable/15 - Unbreak the 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9ecdc69d3005bcdb7fc4cadb95342083b105f844 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:19:34 +0000 Message-Id: <699a83d6.2509a.2d968e0e@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=9ecdc69d3005bcdb7fc4cadb95342083b105f844 commit 9ecdc69d3005bcdb7fc4cadb95342083b105f844 Author: Enji Cooper AuthorDate: 2026-02-05 04:38:31 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:17:44 +0000 Unbreak the build Add the missing comma in the `device_printf` statement. MFC after: 1 week MFC with: 9c666de5b Fixes: 9c666de5b ("Make message added for Darwin OSI quirk more terse") (cherry picked from commit cc702c78f70f972cf2f8ea008752d96df1989988) --- sys/dev/acpica/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 6bd34d9e16db..4a6c805f9c6a 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4674,7 +4674,7 @@ acpi_reset_interfaces(device_t dev) } else { device_printf(dev, "could not install " - "Darwin OSI: %s\n" + "Darwin OSI: %s\n", AcpiFormatException(status)); } } From nobody Sun Feb 22 04:20: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 4fJW4L27F5z6SvKj for ; Sun, 22 Feb 2026 04:20: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 4fJW4L0rmpz3bYy for ; Sun, 22 Feb 2026 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734034; 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=61hQNVffy6YJLke8PDyNjgscnZxjC44V1l5KslYhRZg=; b=OtsSCqGMyetpX3iZ49S3XH3eseuTRqPB5hULN2SzBvJUIeL0dgPKkzjdMJIq/DKz4ybHyd MRMawzHbWcRGuD52ZucD8T+q9WM8A+disl9Hflg7wmzvJ54uTDOtdrlQpGRlp32KalBL8E 2iv2FoEjstuayW5DlGO7VBJINiDEPifrWWWyCKCCZ4PEcucIDdzDFTxuViRuXNRudcrUsg WtSJj1hCBF4/8RY23eErsV0Ol5bSUrGIuqZdsqJPjfmAdfr112f+8nejgAVP9CRDv67FDW 5sukhpd779Sho9FaHUm6Y0fLKnk8B+HBprFsfKak6OVaj4jDcT+pcQ1iG+pW7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734034; a=rsa-sha256; cv=none; b=TySvKYOXt/NvizlHGbbYqDv0Lp1yycaJJXFMZ8B/wwa8lDOIe6Mcsk/kvgetHcKuW9PKJt RcinfPG9+nK8/SgxdoJy8VKhyLVnv98pl5HmRIAM1sAYe8Kb0s+zTYSNeI6+U4Hoa6XwPX UZs5IbO7KdI3oUZFhh/sfItnMnMLXGvhPk42KTIU7UQMegUZdipOqXcXe2p3L5igqJj00n K3iWTv4G3XwwH+fQvuUgKibbZPnereDJEZFCF7caX+yXAREhRB2ukZy4PDoWRI4PIZXwF1 pPJcYKQ5EWhVlueXaUi/bnC+vw4xKZb115ZdbkTTuNf+mwUCYCGUVkpHSiiVhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734034; 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=61hQNVffy6YJLke8PDyNjgscnZxjC44V1l5KslYhRZg=; b=tkrCuIvZlOdW3n5LPcq4Mk7c53o95QMvCRleNsfEMSPcNu2tso+0IuyB14bpnKNTOk4wAl /pKFjQo/o5wOJagCPNFWLsoH/KiJCLc67/YFumlDxO3z3TGkSx9yd2lk43iryBD9ny1liT 9sVOyc4+0cp80XldF11mz35hcOu/4o1lVLo9z69J59NF76qTtfbpg2wPmG3JIWoBMRYFN3 PvcdjGl/kkrKyBTlDUwrXnHgzEEPSBIQSbNbeCtJAKctCf8lVVzNWo4sNyzTCvQqtf5G15 MtE1E3JvYPQAnDcZp4kYQ19emOAg4gg4nMqRcycR2iiXmX23PobAeXV7e2WC9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJW4L0P4ZzCLQ for ; Sun, 22 Feb 2026 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25655 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:20:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 964c97aa80ec - stable/14 - acpi: add Darwin OSI quirk for Apple Mac hardware List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 964c97aa80ec301478dead9b67f0a1fe18d5479b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:20:34 +0000 Message-Id: <699a8412.25655.6977cbf3@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=964c97aa80ec301478dead9b67f0a1fe18d5479b commit 964c97aa80ec301478dead9b67f0a1fe18d5479b Author: Abdelkader Boudih AuthorDate: 2026-02-03 01:43:00 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:19:49 +0000 acpi: add Darwin OSI quirk for Apple Mac hardware Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86 systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not installed via ACPI. Prior to this change, FreeBSD always used the dGPU. This is fine in practice, but consumed more power than when the iGPU is used, resulting in reduced battery life. Linux handles this in `drivers/acpi/osi.c` by detecting Apple hardware via DMI, disabling all Windows OSI strings, and by explicitly installing the Darwin OSI ACPI handler. This change applies equivalent logic to the acpi(4) driver on FreeBSD. This feature can be enabled/disabled using the `hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0` restores the previous behavior by explicitly disabling the added support. Reviewed by: obiwac, ngie, adrian Differential Revision: https://reviews.freebsd.org/D54762 (cherry picked from commit 052a791b00555805f19ccc38a04d42d48b54104b) --- sys/dev/acpica/acpi.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 2ba2b2c8c642..00086083f154 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -273,6 +273,17 @@ static char acpi_remove_interface[256]; TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface, sizeof(acpi_remove_interface)); +/* + * Automatically apply the Darwin OSI on Apple Mac hardware to obtain + * access to full ACPI hardware support on supported platforms. + * + * This flag automatically overrides any values set by + * `hw.acpi.acpi_install_interface` and unset by + * `hw.acpi.acpi_remove_interface`. + */ +static int acpi_apple_darwin_osi = 1; +TUNABLE_INT("hw.acpi.apple_darwin_osi", &acpi_apple_darwin_osi); + /* Allow users to dump Debug objects without ACPI debugger. */ static int acpi_debug_objects; TUNABLE_INT("debug.acpi.enable_debug_objects", &acpi_debug_objects); @@ -4623,6 +4634,67 @@ acpi_reset_interfaces(device_t dev) } acpi_free_interfaces(&list); } + + /* + * Apple Mac hardware quirk: install Darwin OSI. + * + * On Apple hardware, install the Darwin OSI and remove the Windows OSI + * to match Linux behavior. + * + * This is required for dual-GPU MacBook Pro systems + * (Intel iGPU + AMD/NVIDIA dGPU) where the iGPU is hidden when the + * firmware doesn't see Darwin OSI, but it also unlocks additional ACPI + * support on non-MacBook Pro Apple platforms. + * + * Apple's ACPI firmware checks _OSI("Darwin") and sets OSYS=10000 + * for macOS. Many device methods use OSDW() which checks OSYS==10000 + * for macOS-specific behavior including GPU visibility and power + * management. + * + * Linux enables Darwin OSI by default on Apple hardware and disables + * all Windows OSI strings (drivers/acpi/osi.c). Users can override + * this behavior with acpi_osi=!Darwin to get Windows-like behavior, + * in general, but this logic makes that process unnecessary. + * + * Detect Apple via SMBIOS and enable Darwin while disabling Windows + * vendor strings. This makes both GPUs visible on dual-GPU MacBook Pro + * systems (Intel iGPU + AMD dGPU) and unlocks full platform + * ACPI support. + */ + if (acpi_apple_darwin_osi) { + char *vendor = kern_getenv("smbios.system.maker"); + if (vendor != NULL) { + if (strcmp(vendor, "Apple Inc.") == 0 || + strcmp(vendor, "Apple Computer, Inc.") == 0) { + /* Disable all other OSI vendor strings. */ + status = AcpiUpdateInterfaces( + ACPI_DISABLE_ALL_VENDOR_STRINGS); + /* Install Darwin */ + if (ACPI_SUCCESS(status)) { + status = AcpiInstallInterface("Darwin"); + } + if (bootverbose) { + if (ACPI_SUCCESS(status)) { + device_printf(dev, + "Apple hardware: installed Darwin " + "OSI and removed other vendor OSI " + "(Windows, etc)\n"); + } else { + device_printf(dev, + "Apple hardware: failed to install " + "Darwin OSI: %s\n", + AcpiFormatException( + status)); + } + } + } else if (bootverbose) { + device_printf(dev, + "Not installing Darwin OSI on unsupported platform: %s\n", + vendor); + } + freeenv(vendor); + } + } } static int From nobody Sun Feb 22 04:20: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 4fJW4M3zSrz6Sv7P for ; Sun, 22 Feb 2026 04:20: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 4fJW4M1b4Jz3bsT for ; Sun, 22 Feb 2026 04:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gjKpl6aN10ULSSzW0Mq1YN8geFuz5FUbes7O1KjuXi0=; b=Orx+FmYSGFNfJ5UQNkOs8lv5yDmEQTrR/aUJK9FK73U5OIyX8F9lQHgCS4q4fyqeJ13Uu8 JG38NbwrN9SSjvrLRhFFevjhzExWtM1kgDzDk++C7uqZo8GD8aEH2e7KRkCqK49xYvKqey o4xrkVzqpM7e7mR46Z8Mac5w1wPcGSuoisqN75FVC/5VKPLOSwcCEx/EMg/MVrGL06D6lT MrfcXyF51uE2iOteVpPcR0T9QbFhxFjB0/cBieFOgRI7RzYuBirys/6A5DU6BNh/W5gMb7 EX5u5WFsLP4vnW+LG+P7OOHPZNVrcFYPTqbJe/mKfCRpgEshsEWe3qIaKhmG3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734035; a=rsa-sha256; cv=none; b=AQxac2KlSDc6Z41bePmPNaWTYoDfwJNSPODxmscknERUZWrzIl1qEeR9hGuvkizpk6gqKo Y/6fe1O0EnUKZTDrQ4OABklHKAvG+Tfm8RxoCqscDSb3rXFNK0pZqSvMvJq+UVK2re8hWp ZJwqS3h54uO5uhVoUIhhXRegAY3Z314ckkXvFhDH3EwOsGykQ607/tZyUnqIkiLz+/rsqO fiZ7PciXQs43+H75JIi1BugojkwMdYJ9a3lqV5A19b+oY7Dvx1aZiE4axoaxs9Vw6cLblU WoHjiBtlzqN3B0Y7FAnP+VonwMcG7aIAAG77pwvmkKSrIdERuoVKj2DbbOjkdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gjKpl6aN10ULSSzW0Mq1YN8geFuz5FUbes7O1KjuXi0=; b=Tq9FRp0My5LsuCIhzv9BHaj9QyEgXazcWolwpGT7wJ+zrYHBZJVR1SmMDecrEmZ3bKD0No 8du375ijcyVE6sBCBLqLkNEqHU26GWSI+qU3bnamF1i504kmxsUPJoBO2VShTi7N2Xswpg pzq85ofK7ipdj/xnbuUn995UdyelH6M5kT0mKapK95TR0uZNnIQai/LvFrRb7YI94BxT8s 9GGjIBfc6daw0OMDZHBU9pchsOwtMwTVDisd5IJd27/sz4crG+u2AWQm4XsCT07NMq5Z9w jSGjsNHox9vTaQQqPc+gvbJO7h+QR420do5XKk6omZUe6ZeFSHv6GAoaUMbSig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJW4M1BHvzCZD for ; Sun, 22 Feb 2026 04:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:20:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: da481c5e3d9d - stable/14 - Make message added for Darwin OSI quirk more terse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: da481c5e3d9d6e420169ad9262b9358a5192e8d1 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:20:35 +0000 Message-Id: <699a8413.24f77.492996db@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=da481c5e3d9d6e420169ad9262b9358a5192e8d1 commit da481c5e3d9d6e420169ad9262b9358a5192e8d1 Author: Enji Cooper AuthorDate: 2026-02-05 02:57:22 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:19:49 +0000 Make message added for Darwin OSI quirk more terse The verbose message was way too verbose. Make it terse. MFC after: 1 week MFC with: 052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware") Requested by: kib (cherry picked from commit 9c666de5b339d3c8f9bf3963691e4310e7d159cb) --- sys/dev/acpica/acpi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 00086083f154..b72e43bab893 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4669,22 +4669,20 @@ acpi_reset_interfaces(device_t dev) /* Disable all other OSI vendor strings. */ status = AcpiUpdateInterfaces( ACPI_DISABLE_ALL_VENDOR_STRINGS); - /* Install Darwin */ if (ACPI_SUCCESS(status)) { + /* Install Darwin OSI */ status = AcpiInstallInterface("Darwin"); } if (bootverbose) { if (ACPI_SUCCESS(status)) { device_printf(dev, - "Apple hardware: installed Darwin " - "OSI and removed other vendor OSI " - "(Windows, etc)\n"); + "disabled non-Darwin OSI & " + "installed Darwin OSI\n"); } else { device_printf(dev, - "Apple hardware: failed to install " - "Darwin OSI: %s\n", - AcpiFormatException( - status)); + "could not install " + "Darwin OSI: %s\n" + AcpiFormatException(status)); } } } else if (bootverbose) { From nobody Sun Feb 22 04:20: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 4fJW4N5Nn8z6SvMd for ; Sun, 22 Feb 2026 04:20: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 4fJW4N2QhPz3bn1 for ; Sun, 22 Feb 2026 04:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mO6Th9p0ox4z0m2jqDnfGXR+DJW89Z7+LG/yr27k3M=; b=aIstr4wnvy70/RqhKUtBWEtBxMmSv4kfjiKPhsHbooRLPP0ffFQ0dbzQJneE17PaZdMDsd VDSfRXCCzYzNahb6xhP/QsLuFOL/1h6oMa6Czn5+0gH/GSdiPPsNziOsHTMCQFESsMmRnk 7iohhr9sFEcdG3LL9zPE6fN0h2gkS3BxXAA6dey7QDaWb6b76WEgGvI6G+ODwFh9RezVig x5SawhtnS072VcRbQ4GnuhSe52Zepe4cgOHair/m8uNcXva2iayyjnfCK3e2kbcuoi8pkI wByh0CiYUae1K8yqx9W/IBsrq3oR1M+lEuuK3X5nGRJb++25LcrFgwmkZX6FGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734036; a=rsa-sha256; cv=none; b=JXMQxaNrrQ/banbSAcV4hu/J9llHvEXi4i3DxoIGOQz/rDowW8TL11e3j7Awe+xGVi6N61 htKnYl7kJm3ptyWf2McHdYdMbYtx1VLJyL7C4u22JV7ENtMAOKCmyEEU4ZwnG2HlsvgEKS TYhIQfajKuQmsGyjo3Veou8mhiW9Z6+deaZUFsXLIUM0lfwLD4BGv1hJXatRDunwOH+oCf cgHvw6ndjd0vrwqSbif9UbDjOLKOlQJva45P5KnB43DNS5LLhtz6fFKvEWsG72fdQ8MopR pH4YCn09/g3aFU4KQCt6GdU0duWXQlbgl45zfdtk33IsI/6NXOdqMq+u+b35TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mO6Th9p0ox4z0m2jqDnfGXR+DJW89Z7+LG/yr27k3M=; b=v9buzM5jMX6xIyMgY4FgNmzNXzVXex2mQ97vu4p1gnaIkiRAeIUxnCl7u+5P5IRdCaWpW8 ox7AA2rPo7wnjAarQdeApV+7t9yR9iZg4lngHa37jETzgQXqGhpJ0xrrpFU6VFi1EZ5UJ9 OO2Ux32OhSIz3NDQQ/a08wRK3aYi83njDxQRmgdcUOPX6472qbyrYifYpbLBWVUgX1MZZf /9a8tJswX2xbeTxluI2Aos06+x+BD/yT24Zn2cAjmVHWEy2RNKj34N04OLK76dqP4HJ9jP 0gy+2Xa/yxKUFHSJsVWVExZEmgu3zGcXKUE7BuebhtHtfkkx9lGiTF7/SSYy5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJW4N1x9jzCZF for ; Sun, 22 Feb 2026 04:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25326 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:20:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: a38f44fc83d0 - stable/14 - Unbreak the 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a38f44fc83d07baf03947ac32b8c57cc7790b3b4 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:20:36 +0000 Message-Id: <699a8414.25326.344dc8b1@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=a38f44fc83d07baf03947ac32b8c57cc7790b3b4 commit a38f44fc83d07baf03947ac32b8c57cc7790b3b4 Author: Enji Cooper AuthorDate: 2026-02-05 04:38:31 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:19:49 +0000 Unbreak the build Add the missing comma in the `device_printf` statement. MFC after: 1 week MFC with: 9c666de5b Fixes: 9c666de5b ("Make message added for Darwin OSI quirk more terse") (cherry picked from commit cc702c78f70f972cf2f8ea008752d96df1989988) --- sys/dev/acpica/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index b72e43bab893..e9c346e371d9 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4681,7 +4681,7 @@ acpi_reset_interfaces(device_t dev) } else { device_printf(dev, "could not install " - "Darwin OSI: %s\n" + "Darwin OSI: %s\n", AcpiFormatException(status)); } } From nobody Sun Feb 22 04:27: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 4fJWCy2KtPz6SvTD for ; Sun, 22 Feb 2026 04:27: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 4fJWCx5WCHz3cl8 for ; Sun, 22 Feb 2026 04:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBQdouk452Bc2ir16sWzUu8MPtS4MlLJznkwiyG2VIg=; b=DoOfJht+rsldhOPOFENMbxs0+L5JT3pDbDjqU+uywqPIaWtJ2DJfkKDuVrTzzxmY4HcbHf XV+FuIXmi3RaRABySAHnbaYAzyVAob5mU2SJIM1AbcBi7v8qFH34WWBARNrjNNYlDm0k+Z 55ZLb9VZtKZ5/Hl2dvXVPGuv/db7NAZDe54CkkZDmJZL4D3CDai1lSrlSfoVmW8BfoAYjE d9wE7mUOEUYHQl7ep7R3WxdeUtKeOcocMEqs5dHjpUvAeLKuNOPdxBxBBfZt9Tcp9mQDTR XVqvGtVI0x4j3au8sWCMCoR/fEyPugb2kwT7kkwub8hjbNI0N9tlAR8PnZpOIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734429; a=rsa-sha256; cv=none; b=y38jMGpH8V1FYM0XpB+rvyveb8Pxx0XVFgn+mZ6uhi+PktUSrYu2aXXXg0Z389XW8JTikH e6244qvL7gFDUfp2NOcwOooPZORS0zJW52m3MT60OpQm1CQRaFb8zl6qs0D0D4fcfCQL7q aXUgmtyljSQoUIsPj/F3qZabfXE7PSsOcNqYTsqEml5mB1aL7BToN3gB1/0jphi0meMNf3 lft2Ls9FYxQLhtD/ScakZljU+FAG2GjER/mUlSjL9Bb3X40VptY025xJLcFXbj+RtnuM0I t3Ovq1GvhDzihFvzi7R/dSEEeiFq6vK3MKAbw5C0HGJd0U4g/AymFUk/XbUErQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBQdouk452Bc2ir16sWzUu8MPtS4MlLJznkwiyG2VIg=; b=mVRtdeBLZSKetDVxm+cdidBje8cRpgSJq6tDwX+AQalqnveOp+N9URrRHKa7SZd3/aLQFw loYhUzra3n1rPiJvee5ZHy5GrzPyJNH3R1CXx/lOF0S2GbNE7La5Wl9XgMhvIwQCj6N7Ny ImswePAXuHNH/ObTAijo74SrwQKXQX45Z94XQJJYrQ5+/tt6eCuHj4PqghLEH7hxhnnQ9B 5znRj26JTRAWrqLCDhobt47xvVFa6YcC2Wnq2IDA+j1DNFpnZ4oVXI1luBNvoAPeR0rB2u Ve9V/odo9nirzk6S1XRyW5z3J2xf4Q7r0h0S+ksn7PuBcowOl/FScNH8EN7M5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWCx4zTLzCyF for ; Sun, 22 Feb 2026 04:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26511 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:27:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: df4cc7df4571 - stable/15 - chore: asmc: minor code cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: df4cc7df457149ece5284b109d9b780d71067a7c Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:27:09 +0000 Message-Id: <699a859d.26511.717ddc10@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=df4cc7df457149ece5284b109d9b780d71067a7c commit df4cc7df457149ece5284b109d9b780d71067a7c Author: Enji Cooper AuthorDate: 2026-01-01 06:43:05 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:26:51 +0000 chore: asmc: minor code cleanup - Use symbolic names in Mac definitions in lieu of the unrolled values they represent. - Delete trailing whitespace. - Fix indentation. No functional change intended. MFC after: 1 week (cherry picked from commit a8f3c3b5d4d9dac1dafe4094fe35b30ffdf26178) --- sys/dev/asmc/asmc.c | 72 +++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5b2a901328d3..a9f2555b79c6 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -137,7 +137,7 @@ static const struct asmc_model *asmc_match(device_t dev); #define ASMC_SMS_FUNCS asmc_mb_sysctl_sms_x, asmc_mb_sysctl_sms_y, \ asmc_mb_sysctl_sms_z -#define ASMC_SMS_FUNCS_DISABLED NULL,NULL,NULL +#define ASMC_SMS_FUNCS_DISABLED NULL, NULL, NULL #define ASMC_FAN_FUNCS asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, asmc_mb_sysctl_fansafespeed, \ asmc_mb_sysctl_fanminspeed, \ @@ -163,19 +163,19 @@ static const struct asmc_model *asmc_match(device_t dev); static const struct asmc_model asmc_models[] = { { "MacBook1,1", "Apple SMC MacBook Core Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS }, { "MacBook2,1", "Apple SMC MacBook Core 2 Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS }, { "MacBook3,1", "Apple SMC MacBook Core 2 Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MB31_TEMPS, ASMC_MB31_TEMPNAMES, ASMC_MB31_TEMPDESCS }, @@ -297,9 +297,9 @@ static const struct asmc_model asmc_models[] = { /* The Mac Mini has no SMS */ { "Macmini1,1", "Apple SMC Mac Mini", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, @@ -315,9 +315,9 @@ static const struct asmc_model asmc_models[] = { /* The Mac Mini 3,1 has no SMS */ { "Macmini3,1", "Apple SMC Mac Mini 3,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS }, @@ -334,18 +334,18 @@ static const struct asmc_model asmc_models[] = { /* - same sensors as Mac Mini 5,2 */ { "Macmini5,1", "Apple SMC Mac Mini 5,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, /* The Mac Mini 5,2 has no SMS */ { "Macmini5,2", "Apple SMC Mac Mini 5,2", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, @@ -353,63 +353,63 @@ static const struct asmc_model asmc_models[] = { /* - same sensors as Mac Mini 5,2 */ { "Macmini5,3", "Apple SMC Mac Mini 5,3", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, /* The Mac Mini 6,1 has no SMS */ { "Macmini6,1", "Apple SMC Mac Mini 6,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM61_TEMPS, ASMC_MM61_TEMPNAMES, ASMC_MM61_TEMPDESCS }, /* The Mac Mini 6,2 has no SMS */ { "Macmini6,2", "Apple SMC Mac Mini 6,2", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM62_TEMPS, ASMC_MM62_TEMPNAMES, ASMC_MM62_TEMPDESCS }, /* The Mac Mini 7,1 has no SMS */ { "Macmini7,1", "Apple SMC Mac Mini 7,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM71_TEMPS, ASMC_MM71_TEMPNAMES, ASMC_MM71_TEMPDESCS }, /* Idem for the Mac Pro "Quad Core" (original) */ { "MacPro1,1", "Apple SMC Mac Pro (Quad Core)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP1_TEMPS, ASMC_MP1_TEMPNAMES, ASMC_MP1_TEMPDESCS }, /* Idem for the Mac Pro (8-core) */ { "MacPro2", "Apple SMC Mac Pro (8-core)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP2_TEMPS, ASMC_MP2_TEMPNAMES, ASMC_MP2_TEMPDESCS }, /* Idem for the MacPro 2010*/ { "MacPro5,1", "Apple SMC MacPro (2010)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS }, @@ -424,20 +424,20 @@ static const struct asmc_model asmc_models[] = { { "MacBookAir1,1", "Apple SMC MacBook Air", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MBA_TEMPS, ASMC_MBA_TEMPNAMES, ASMC_MBA_TEMPDESCS }, { "MacBookAir3,1", "Apple SMC MacBook Air Core 2 Duo (Late 2010)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MBA3_TEMPS, ASMC_MBA3_TEMPNAMES, ASMC_MBA3_TEMPDESCS }, { "MacBookAir4,1", "Apple SMC Macbook Air 11-inch (Mid 2011)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS2, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS }, @@ -445,7 +445,7 @@ static const struct asmc_model asmc_models[] = { { "MacBookAir4,2", "Apple SMC Macbook Air 13-inch (Mid 2011)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS2, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS }, @@ -830,11 +830,13 @@ asmc_detach(device_t dev) static int asmc_resume(device_t dev) { - uint8_t buf[2]; - buf[0] = light_control; - buf[1] = 0x00; - asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf); - return (0); + uint8_t buf[2]; + + buf[0] = light_control; + buf[1] = 0x00; + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf); + + return (0); } #ifdef ASMC_DEBUG From nobody Sun Feb 22 04:27: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 4fJWCz0PgYz6SvsH for ; Sun, 22 Feb 2026 04:27: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 4fJWCy67Pnz3cl9 for ; Sun, 22 Feb 2026 04:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bs2xWFqGtpHPOyh8Pgadn8TaQETI4cooPFx8oV/hxhM=; b=AYHZGK2pJQXJtTDXYqGxOkYf7nnH5wBal8ao8+lh8GuWHqt9mvwOnRjLgYGqgO2gcaYDoP F/pQ6UqzOS5Pvj03Rv37Ae+08/F+AN7WxBsY15PPErjnzt83B92aLO2qxtGBXPa4uq7qxL jZLTHmcO64kmjfZlYzhh8tIytdWadup0mlaQ5mAXIVKp0sBVh+c+FrGVjoh+ljmRoMuKB7 zyP5ZqvQo8N8+bLS+dnpIGBmAVvCJjIxT4ZtJ9IbaVZYMt2HR3XYEiZ2QIMy9hZLK15q8c uWsEndry8DhFgSvht6jKJxemxBCc0lcyn9YoyPq3FS8N42pj+8Hd9v0W64SU/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734430; a=rsa-sha256; cv=none; b=aq9wTbKThoOJAzn43nrE5Kcc0Jg8uCcYmWeya1StfbojNPXQi0jlQm+bAtLdnyBOpVTcEy cVHsls/iVerIKCjjJZ3Wc8nMZ7S5VNShDfCXTRU1AWMJH8jEiZJJM/brY/Hfj2PWa+AbTF pro1/kMYcKopx8Uk5OOAxKHInNdkqaiswchbOKlBL6b5fLVxdhiNGCLIC32l/Z7y0CuBOC 9HlXzQC1KJCxjbCxWFh8E2xjQkdjS/sO89wOH1QZRT/+F5FVqcN4q9SxM5O1trVhevK9YD tT1XQjIkl+sUSoDx8L4Yl1RMAOwpYDLVmgi0Abiv/gsuaZ4/JVC+TLUK5anTfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bs2xWFqGtpHPOyh8Pgadn8TaQETI4cooPFx8oV/hxhM=; b=o939N6U9MIgndbxC/fssXXOiQYYRhYSSG8TxlV52gD3sA/+e0PFoMZdtEvZ6RxpUiyzTcc 3U/rvbpQ1HglBY3tCMtojCObS59ZJdNasuHYtfepNvFhPBwU59GLlErN4M7/O37adO71v6 TlNJ1lClyY6h0eP+gavVnSPalMmGYykRhqJdgsdkLDmOp8BbMoZsOYDrQZaNgMQhXvLnMI L9SkYwSbBkYK5LTdDqBWIyzuNCxPcq/JQuuRzrPSj++sdh9lyjo/XdKi6nPKFImENt5cly Wm/iubpsy6lZLKw7CclILy67WOnS7VHkqE3aSva0fxA5zXYJ+ekLdQlBtTnVlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWCy5kxTzDJF for ; Sun, 22 Feb 2026 04:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:27:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: cfd588aef579 - stable/15 - chore: asmc: additional style(9) cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: cfd588aef579dd36800c50a5ffdd794a1e3395f9 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:27:10 +0000 Message-Id: <699a859e.24f7e.538a7743@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=cfd588aef579dd36800c50a5ffdd794a1e3395f9 commit cfd588aef579dd36800c50a5ffdd794a1e3395f9 Author: Enji Cooper AuthorDate: 2026-02-08 20:04:32 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:26:51 +0000 chore: asmc: additional style(9) cleanup Pick out non-gratuitous style(9) changes suggested by `clang-format` on the driver. This helps eliminate minor stylistic issues with spaces, braces, line lengths, etc, so future functional changes in the driver will be easier to pick out. Many of the other `clang-format` suggested changes were not taken because they were considerably more gratuitous. No functional change intended. MFC after: 1 week (cherry picked from commit d76bb14e0224e235209d8c07ec132d602b18648b) --- sys/dev/asmc/asmc.c | 105 ++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index a9f2555b79c6..f2c42ba814e2 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -110,8 +110,8 @@ static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS); struct asmc_model { - const char *smc_model; /* smbios.system.product env var. */ - const char *smc_desc; /* driver description */ + const char *smc_model; /* smbios.system.product env var. */ + const char *smc_desc; /* driver description */ /* Helper functions */ int (*smc_sms_x)(SYSCTL_HANDLER_ARGS); @@ -599,7 +599,7 @@ asmc_attach(device_t dev) return (ENOMEM); } - sysctlctx = device_get_sysctl_ctx(dev); + sysctlctx = device_get_sysctl_ctx(dev); sysctlnode = device_get_sysctl_tree(dev); model = asmc_match(dev); @@ -774,8 +774,8 @@ asmc_attach(device_t dev) * Allocate an IRQ for the SMS. */ sc->sc_rid_irq = 0; - sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &sc->sc_rid_irq, RF_ACTIVE); + sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_rid_irq, + RF_ACTIVE); if (sc->sc_irq == NULL) { device_printf(dev, "unable to allocate IRQ resource\n"); ret = ENXIO; @@ -840,7 +840,8 @@ asmc_resume(device_t dev) } #ifdef ASMC_DEBUG -void asmc_dumpall(device_t dev) +void +asmc_dumpall(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); int i; @@ -945,7 +946,8 @@ nosms: if (asmc_key_read(dev, ASMC_NKEYS, buf, 4) == 0) { sc->sc_nkeys = be32dec(buf); if (bootverbose) - device_printf(dev, "number of keys: %d\n", sc->sc_nkeys); + device_printf(dev, "number of keys: %d\n", + sc->sc_nkeys); } else { sc->sc_nkeys = 0; } @@ -1009,11 +1011,12 @@ asmc_wait(device_t dev, uint8_t val) * the acknowledgement fails. */ static int -asmc_command(device_t dev, uint8_t command) { +asmc_command(device_t dev, uint8_t command) +{ int i; struct asmc_softc *sc = device_get_softc(dev); - for (i=0; i < 10; i++) { + for (i = 0; i < 10; i++) { ASMC_CMDPORT_WRITE(sc, command); if (asmc_wait_ack(dev, 0x0c, 100) == 0) { return (0); @@ -1056,9 +1059,10 @@ begin: error = 0; out: if (error) { - if (++try < 10) goto begin; - device_printf(dev,"%s for key %s failed %d times, giving up\n", - __func__, key, try); + if (++try < 10) + goto begin; + device_printf(dev, "%s for key %s failed %d times, giving up\n", + __func__, key, try); } mtx_unlock_spin(&sc->sc_mtx); @@ -1124,11 +1128,11 @@ begin: error = 0; out: if (error) { - if (++try < 10) goto begin; - device_printf(dev,"%s for key %s failed %d times, giving up\n", - __func__, key, try); + if (++try < 10) + goto begin; + device_printf(dev, "%s for key %s failed %d times, giving up\n", + __func__, key, try); mtx_unlock_spin(&sc->sc_mtx); - } else { char buf[1024]; char buf2[8]; @@ -1192,15 +1196,15 @@ begin: error = 0; out: if (error) { - if (++try < 10) goto begin; - device_printf(dev,"%s for key %s failed %d times, giving up\n", - __func__, key, try); + if (++try < 10) + goto begin; + device_printf(dev, "%s for key %s failed %d times, giving up\n", + __func__, key, try); } mtx_unlock_spin(&sc->sc_mtx); return (error); - } /* @@ -1232,16 +1236,17 @@ asmc_fan_getvalue(device_t dev, const char *key, int fan) return (speed); } -static char* -asmc_fan_getstring(device_t dev, const char *key, int fan, uint8_t *buf, uint8_t buflen) +static char * +asmc_fan_getstring(device_t dev, const char *key, int fan, uint8_t *buf, + uint8_t buflen) { char fankey[5]; - char* desc; + char *desc; snprintf(fankey, sizeof(fankey), key, fan); if (asmc_key_read(dev, fankey, buf, buflen) != 0) return (NULL); - desc = buf+4; + desc = buf + 4; return (desc); } @@ -1254,7 +1259,7 @@ asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed) speed *= 4; - buf[0] = speed>>8; + buf[0] = speed >> 8; buf[1] = speed; snprintf(fankey, sizeof(fankey), key, fan); @@ -1267,7 +1272,7 @@ asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed) static int asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1282,10 +1287,10 @@ static int asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS) { uint8_t buf[16]; - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error = true; - char* desc; + char *desc; desc = asmc_fan_getstring(dev, ASMC_KEY_FANID, fan, buf, sizeof(buf)); @@ -1298,7 +1303,7 @@ asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1312,7 +1317,7 @@ asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1331,7 +1336,7 @@ asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1350,7 +1355,7 @@ asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1369,7 +1374,7 @@ asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1393,7 +1398,8 @@ asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) if (v != 0 && v != 1) return (EINVAL); /* Read-modify-write of FS! bitmask */ - error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, + sizeof(buf)); if (error == 0) { val = (buf[0] << 8) | buf[1]; @@ -1406,7 +1412,8 @@ asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) /* Write back */ buf[0] = val >> 8; buf[1] = val & 0xff; - error = asmc_key_write(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + error = asmc_key_write(dev, ASMC_KEY_FANMANUAL, buf, + sizeof(buf)); } } @@ -1433,7 +1440,7 @@ asmc_temp_getvalue(device_t dev, const char *key) static int asmc_temp_sysctl(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; struct asmc_softc *sc = device_get_softc(dev); int error, val; @@ -1457,11 +1464,11 @@ asmc_sms_read(device_t dev, const char *key, int16_t *val) case 'X': case 'Y': case 'Z': - error = asmc_key_read(dev, key, buf, sizeof buf); + error = asmc_key_read(dev, key, buf, sizeof buf); break; default: device_printf(dev, "%s called with invalid argument %s\n", - __func__, key); + __func__, key); error = 1; goto out; } @@ -1484,7 +1491,7 @@ static int asmc_sms_intrfast(void *arg) { uint8_t type; - device_t dev = (device_t) arg; + device_t dev = (device_t)arg; struct asmc_softc *sc = device_get_softc(dev); if (!sc->sc_sms_intr_works) return (FILTER_HANDLED); @@ -1557,13 +1564,13 @@ asmc_sms_task(void *arg, int pending) static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; asmc_sms_read(dev, ASMC_KEY_SMS_X, &val); - v = (int32_t) val; + v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); return (error); @@ -1572,13 +1579,13 @@ asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; asmc_sms_read(dev, ASMC_KEY_SMS_Y, &val); - v = (int32_t) val; + v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); return (error); @@ -1587,13 +1594,13 @@ asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; asmc_sms_read(dev, ASMC_KEY_SMS_Z, &val); - v = (int32_t) val; + v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); return (error); @@ -1602,7 +1609,7 @@ asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[6]; int error; int32_t v; @@ -1617,7 +1624,7 @@ asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[6]; int error; int32_t v; @@ -1632,7 +1639,7 @@ asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[2]; int error; int v; @@ -1654,7 +1661,7 @@ asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[10]; int error; uint32_t v; From nobody Sun Feb 22 04:30: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 4fJWHw3S9Lz6Sw9x for ; Sun, 22 Feb 2026 04:30: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 4fJWHw1WMsz3dg2 for ; Sun, 22 Feb 2026 04:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TShi4LRSAKDz94A9LFYTPjKCYD2Q5E3jazapqfmRXlA=; b=db9qKGA3jlVqgiDx3dLx6TDwizeDlPrmqJM3hofKs15rS0yuGJHFPITQaiatC4Be0jcCK+ 7uj8NrHQZ+NVlBZU7HbyUYyVzyK6dvMDJ0VzFgRBmqKq8C54o26VU8yLRVvMUkOwqJ1cGY hvJJzpnA66payIP0uKqI3BUyUWscECjyjPZLkkdHN9buGwzx4FcwpOL3ZcLfqjjU9tFu1S mv2FA68HGue6pjcflzFKpJSk8W9UZscZP/vc5WJMmZAr5EqUSX9e5vSP+fe1TYmUjWyb1e GF7WVwfVuY2CvysbaBrYwX8zwnM7tQDZ1iqsiD8a6mLQm/scpvQVoo4xocOvDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734636; a=rsa-sha256; cv=none; b=Ow3jOr+WtHIuuSHHFmWUPyx2g3enL/1hH3cffrTB7hiZ+kr+sb428MXXFxUw11lvpatqiX XjbIJpcyXomkCsXNvHUwvIvf3io2Yoc/qiwMIRJGqksYUngtJHHmyWBsvo4VhALPL9kOLs 0znlNam6fMPNYGbkwDij9SMKPRra150K1YLF/1psPfLSUHn8l2W3VMKxh7mAl5h+t3Zx9z 7Z7qmf3VXFOIskOiYDgUQ4xUZUT/xQeDky/Y6EHtPcR8B+0gOEQGP7bteuCWaWvMoudtrp ErEFIJddubuorLzD+/07wi66jExxsFk04ROlJjNSZ5BKJXq2fg4uKu2gnIj16w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TShi4LRSAKDz94A9LFYTPjKCYD2Q5E3jazapqfmRXlA=; b=wbQ6I73ruXyJzEKIKSSbjM3RBzZvEr87q6fA/uu22sfGceyxRkUjctihzuzO9PD6JFFEuS IGzb5OZ5HA++KQhl8PSsVvSLsinp7tgZwnqG0UNJDzuac2lUh0qGgXcd+tFkEyCvglYpSg cyDua+xmlpfJlOBqiL0slyfXa/ZEvA6x2gMs66REsnWhRyHQY8PqWHpVRYPNmzVWeurljD bn7FGuTIESBllAbDO+NZ7mksWfUB400ops0RhLHeFQKvhKRlVde3kh3aULZypRh2ebmmg0 GrYw1CB76/4y1FI8bf14hSqC/lLCfEFUp15mtn0Ut+ntvazykpKXHYQTJVrShQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWHw0TdszCb8 for ; Sun, 22 Feb 2026 04:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2747c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:30:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: ab3eaa6ea29d - stable/14 - Add ASMC_DEBUG make option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: ab3eaa6ea29d846d3beb7dd90dbe0c7e0cea26c4 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:30:36 +0000 Message-Id: <699a866c.2747c.72ccd08f@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=ab3eaa6ea29d846d3beb7dd90dbe0c7e0cea26c4 commit ab3eaa6ea29d846d3beb7dd90dbe0c7e0cea26c4 Author: Enji Cooper AuthorDate: 2026-01-04 08:27:57 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:29:53 +0000 Add ASMC_DEBUG make option This allows folks to enable debug statements in asmc(4) using kernel configs via the `options ASMC_DEBUG` directive. While here, remove a duplicate `device vt_efifb` directive in `NOTES` as it's already handled in the `GENERIC` config MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54511 (cherry picked from commit f224591746bdaf14ad5f63de4738a3146cc2f55f) --- sys/amd64/conf/NOTES | 7 ++++--- sys/conf/options.amd64 | 3 +++ sys/dev/asmc/asmc.c | 21 +++++++++++---------- sys/modules/asmc/Makefile | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 08d096cd800e..55f631675bbe 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -43,9 +43,6 @@ cpu HAMMER # aka K8, aka Opteron & Athlon64 # Optional devices: # -# vt(4) drivers. -device vt_efifb # EFI framebuffer - # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as @@ -110,6 +107,10 @@ device ioat # Intel I/OAT DMA engine # EFI Runtime Services support options EFIRT +# Apple System Management Controller (SMC) +device asmc +options ASMC_DEBUG # Enable asmc(4)-specific debug logic. + # # Intel QuickAssist driver with OpenCrypto support # diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 8402c89640f7..c7c1f4da2a4a 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -65,3 +65,6 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT + +# Enable asmc(4)-specific debug logic. +ASMC_DEBUG opt_asmc.h diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index c0fb342709a1..114f4130d8ce 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -34,7 +34,8 @@ * Inspired by the Linux applesmc driver. */ -#include +#include "opt_asmc.h" + #include #include #include @@ -84,7 +85,7 @@ static void asmc_sms_calibrate(device_t dev); static int asmc_sms_intrfast(void *arg); static void asmc_sms_printintr(device_t dev, uint8_t); static void asmc_sms_task(void *arg, int pending); -#ifdef DEBUG +#ifdef ASMC_DEBUG void asmc_dumpall(device_t); static int asmc_key_dump(device_t, int); #endif @@ -505,7 +506,7 @@ static driver_t asmc_driver = { */ #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASMC") -#ifdef DEBUG +#ifdef ASMC_DEBUG #define ASMC_DPRINTF(str) device_printf(dev, str) #else #define ASMC_DPRINTF(str) @@ -818,7 +819,7 @@ asmc_resume(device_t dev) return (0); } -#ifdef DEBUG +#ifdef ASMC_DEBUG void asmc_dumpall(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); @@ -929,7 +930,7 @@ nosms: sc->sc_nkeys = 0; } -#ifdef DEBUG +#ifdef ASMC_DEBUG asmc_dumpall(dev); #endif @@ -964,19 +965,19 @@ asmc_wait_ack(device_t dev, uint8_t val, int amount) static int asmc_wait(device_t dev, uint8_t val) { -#ifdef DEBUG +#ifdef ASMC_DEBUG struct asmc_softc *sc; #endif if (asmc_wait_ack(dev, val, 1000) == 0) return (0); -#ifdef DEBUG +#ifdef ASMC_DEBUG sc = device_get_softc(dev); #endif val = val & ASMC_STATUS_MASK; -#ifdef DEBUG +#ifdef ASMC_DEBUG device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, val, ASMC_CMDPORT_READ(sc)); #endif @@ -999,7 +1000,7 @@ asmc_command(device_t dev, uint8_t command) { } } -#ifdef DEBUG +#ifdef ASMC_DEBUG device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, command, ASMC_CMDPORT_READ(sc)); #endif @@ -1045,7 +1046,7 @@ out: return (error); } -#ifdef DEBUG +#ifdef ASMC_DEBUG static int asmc_key_dump(device_t dev, int number) { diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile index 70d8ed845900..978b9a1c2113 100644 --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -2,6 +2,6 @@ .PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc -SRCS= asmc.c opt_acpi.h acpi_if.h bus_if.h device_if.h +SRCS= asmc.c opt_acpi.h opt_asmc.h acpi_if.h bus_if.h device_if.h .include From nobody Sun Feb 22 04:30: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 4fJWHx4kRLz6Sw0n for ; Sun, 22 Feb 2026 04:30: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 4fJWHx1pVzz3dg3 for ; Sun, 22 Feb 2026 04:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yzk6oZ8MpjkpVt/78IXfwQbnw/hbuf66ifK7b/q9mfE=; b=vF69PzfSMNkHcSELAwucx355cXN3KKlHwSbearUCJk39lQsFBsutkvM02VKmeITjIpuzFF lAhjFExnl5utdmm/E3GXyMMOUfpaaDz5LO2x4Wp/2q6bDPFnIz9UYQ+K8f5cnH6hm7EFli hQxIXlHh2Ldj+QnTAb1/4Eb1eiBoQtGoFuLSSSjOZr73P3yqP3sQ3MF87t6UpQV5kCjHH9 HLnXdFkcMOtVHES+KPZNHBGZ4osmdshc7CKZUL6K3hv17oEHqRBx/AC1QoDHjxJHu+yKLV 6epejiXUOkYSSRBNr8dr6PKz7s1lQ9EGSM9ktbe0fSWGDpn+LGjx0sirc6uQzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734637; a=rsa-sha256; cv=none; b=I6dlckqHqvJXZytItoUYSYAimmdAOkTnZ88ZTHreqpZ8Dyyto5exI1euNELAoEKb7PPdhC jhgVMtjpo0EEI3514R+mnmGvX+ky2A7PnGNoAg8OO7fY3SuwK8kb9HOc9Edx3U4V+EHkhk fsuU/MD8hJSYgwcWgydaFyUZEi1PtL67U1UVTLC9h4eH5PARZl9QjStNluDbPAxUYemC2L +hJvlvoXimTEXt0+ZLHcxTOPUr3pTTQ6MPMqQcuiBeUoFAcDBx0OP9jrCzWQPTES35x8Vz bb4QLKesY82urXaWzs62pFJCD4aTDb/Mzu84DLbBnyiFf3na0LWGX/q7nJhSfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yzk6oZ8MpjkpVt/78IXfwQbnw/hbuf66ifK7b/q9mfE=; b=H7Mi1LjwDUMTQTxDOgxgRG7DQPF8gTvI6WuyMIOggFBaaFzGccoJoY6iy33Z9ozkpMJvs9 Vn3PwG3rEC/KnCScAixydWtfbwe8lqUAiVTSyStLyglKqNgY93V8L0QIshit6Fi6+5XZtj 6qdatzLAAvAj2xIhebt9hkAcrapuh4R907Fy1OOILzrZwsQoFbXLDmVhaE9l6pei663byL fF5uG3j29X+tJLMyBReCfyFZQHPLzUa6uOmgTph7N2LKkPho9E50rTtNKXXyDhwBtHPad8 bno6uwCfohSccc9BW1dVm1R36K0B4ybQUfGxOtRUQA/tHjQJ2rPiMPF7iojLLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWHx1D2nzCyJ for ; Sun, 22 Feb 2026 04:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27020 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:30:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: c20013933af9 - stable/14 - chore: asmc: additional style(9) cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: c20013933af90ed377497769bf66eaf276b5c6c2 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:30:37 +0000 Message-Id: <699a866d.27020.5d10e50e@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c20013933af90ed377497769bf66eaf276b5c6c2 commit c20013933af90ed377497769bf66eaf276b5c6c2 Author: Enji Cooper AuthorDate: 2026-02-08 20:04:32 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:30:04 +0000 chore: asmc: additional style(9) cleanup Pick out non-gratuitous style(9) changes suggested by `clang-format` on the driver. This helps eliminate minor stylistic issues with spaces, braces, line lengths, etc, so future functional changes in the driver will be easier to pick out. Many of the other `clang-format` suggested changes were not taken because they were considerably more gratuitous. No functional change intended. MFC after: 1 week (cherry picked from commit d76bb14e0224e235209d8c07ec132d602b18648b) --- sys/dev/asmc/asmc.c | 105 ++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 114f4130d8ce..2a973be2e95c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -110,8 +110,8 @@ static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS); struct asmc_model { - const char *smc_model; /* smbios.system.product env var. */ - const char *smc_desc; /* driver description */ + const char *smc_model; /* smbios.system.product env var. */ + const char *smc_desc; /* driver description */ /* Helper functions */ int (*smc_sms_x)(SYSCTL_HANDLER_ARGS); @@ -581,7 +581,7 @@ asmc_attach(device_t dev) return (ENOMEM); } - sysctlctx = device_get_sysctl_ctx(dev); + sysctlctx = device_get_sysctl_ctx(dev); sysctlnode = device_get_sysctl_tree(dev); model = asmc_match(dev); @@ -756,8 +756,8 @@ asmc_attach(device_t dev) * Allocate an IRQ for the SMS. */ sc->sc_rid_irq = 0; - sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &sc->sc_rid_irq, RF_ACTIVE); + sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_rid_irq, + RF_ACTIVE); if (sc->sc_irq == NULL) { device_printf(dev, "unable to allocate IRQ resource\n"); ret = ENXIO; @@ -820,7 +820,8 @@ asmc_resume(device_t dev) } #ifdef ASMC_DEBUG -void asmc_dumpall(device_t dev) +void +asmc_dumpall(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); int i; @@ -925,7 +926,8 @@ nosms: if (asmc_key_read(dev, ASMC_NKEYS, buf, 4) == 0) { sc->sc_nkeys = be32dec(buf); if (bootverbose) - device_printf(dev, "number of keys: %d\n", sc->sc_nkeys); + device_printf(dev, "number of keys: %d\n", + sc->sc_nkeys); } else { sc->sc_nkeys = 0; } @@ -989,11 +991,12 @@ asmc_wait(device_t dev, uint8_t val) * the acknowledgement fails. */ static int -asmc_command(device_t dev, uint8_t command) { +asmc_command(device_t dev, uint8_t command) +{ int i; struct asmc_softc *sc = device_get_softc(dev); - for (i=0; i < 10; i++) { + for (i = 0; i < 10; i++) { ASMC_CMDPORT_WRITE(sc, command); if (asmc_wait_ack(dev, 0x0c, 100) == 0) { return (0); @@ -1036,9 +1039,10 @@ begin: error = 0; out: if (error) { - if (++try < 10) goto begin; - device_printf(dev,"%s for key %s failed %d times, giving up\n", - __func__, key, try); + if (++try < 10) + goto begin; + device_printf(dev, "%s for key %s failed %d times, giving up\n", + __func__, key, try); } mtx_unlock_spin(&sc->sc_mtx); @@ -1104,11 +1108,11 @@ begin: error = 0; out: if (error) { - if (++try < 10) goto begin; - device_printf(dev,"%s for key %s failed %d times, giving up\n", - __func__, key, try); + if (++try < 10) + goto begin; + device_printf(dev, "%s for key %s failed %d times, giving up\n", + __func__, key, try); mtx_unlock_spin(&sc->sc_mtx); - } else { char buf[1024]; char buf2[8]; @@ -1172,15 +1176,15 @@ begin: error = 0; out: if (error) { - if (++try < 10) goto begin; - device_printf(dev,"%s for key %s failed %d times, giving up\n", - __func__, key, try); + if (++try < 10) + goto begin; + device_printf(dev, "%s for key %s failed %d times, giving up\n", + __func__, key, try); } mtx_unlock_spin(&sc->sc_mtx); return (error); - } /* @@ -1212,16 +1216,17 @@ asmc_fan_getvalue(device_t dev, const char *key, int fan) return (speed); } -static char* -asmc_fan_getstring(device_t dev, const char *key, int fan, uint8_t *buf, uint8_t buflen) +static char * +asmc_fan_getstring(device_t dev, const char *key, int fan, uint8_t *buf, + uint8_t buflen) { char fankey[5]; - char* desc; + char *desc; snprintf(fankey, sizeof(fankey), key, fan); if (asmc_key_read(dev, fankey, buf, buflen) != 0) return (NULL); - desc = buf+4; + desc = buf + 4; return (desc); } @@ -1234,7 +1239,7 @@ asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed) speed *= 4; - buf[0] = speed>>8; + buf[0] = speed >> 8; buf[1] = speed; snprintf(fankey, sizeof(fankey), key, fan); @@ -1247,7 +1252,7 @@ asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed) static int asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1262,10 +1267,10 @@ static int asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS) { uint8_t buf[16]; - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error = true; - char* desc; + char *desc; desc = asmc_fan_getstring(dev, ASMC_KEY_FANID, fan, buf, sizeof(buf)); @@ -1278,7 +1283,7 @@ asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1292,7 +1297,7 @@ asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1311,7 +1316,7 @@ asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1330,7 +1335,7 @@ asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1349,7 +1354,7 @@ asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int fan = arg2; int error; int32_t v; @@ -1373,7 +1378,8 @@ asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) if (v != 0 && v != 1) return (EINVAL); /* Read-modify-write of FS! bitmask */ - error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + error = asmc_key_read(dev, ASMC_KEY_FANMANUAL, buf, + sizeof(buf)); if (error == 0) { val = (buf[0] << 8) | buf[1]; @@ -1386,7 +1392,8 @@ asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS) /* Write back */ buf[0] = val >> 8; buf[1] = val & 0xff; - error = asmc_key_write(dev, ASMC_KEY_FANMANUAL, buf, sizeof(buf)); + error = asmc_key_write(dev, ASMC_KEY_FANMANUAL, buf, + sizeof(buf)); } } @@ -1413,7 +1420,7 @@ asmc_temp_getvalue(device_t dev, const char *key) static int asmc_temp_sysctl(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; struct asmc_softc *sc = device_get_softc(dev); int error, val; @@ -1437,11 +1444,11 @@ asmc_sms_read(device_t dev, const char *key, int16_t *val) case 'X': case 'Y': case 'Z': - error = asmc_key_read(dev, key, buf, sizeof buf); + error = asmc_key_read(dev, key, buf, sizeof buf); break; default: device_printf(dev, "%s called with invalid argument %s\n", - __func__, key); + __func__, key); error = 1; goto out; } @@ -1464,7 +1471,7 @@ static int asmc_sms_intrfast(void *arg) { uint8_t type; - device_t dev = (device_t) arg; + device_t dev = (device_t)arg; struct asmc_softc *sc = device_get_softc(dev); if (!sc->sc_sms_intr_works) return (FILTER_HANDLED); @@ -1537,13 +1544,13 @@ asmc_sms_task(void *arg, int pending) static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; asmc_sms_read(dev, ASMC_KEY_SMS_X, &val); - v = (int32_t) val; + v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); return (error); @@ -1552,13 +1559,13 @@ asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; asmc_sms_read(dev, ASMC_KEY_SMS_Y, &val); - v = (int32_t) val; + v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); return (error); @@ -1567,13 +1574,13 @@ asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS) static int asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; asmc_sms_read(dev, ASMC_KEY_SMS_Z, &val); - v = (int32_t) val; + v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); return (error); @@ -1582,7 +1589,7 @@ asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[6]; int error; int32_t v; @@ -1597,7 +1604,7 @@ asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[6]; int error; int32_t v; @@ -1612,7 +1619,7 @@ asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[2]; int error; int v; @@ -1634,7 +1641,7 @@ asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; + device_t dev = (device_t)arg1; uint8_t buf[10]; int error; uint32_t v; From nobody Sun Feb 22 04:32: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 4fJWLJ6qfVz6SwFZ for ; Sun, 22 Feb 2026 04:32: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 4fJWLJ5Zn4z3fMm for ; Sun, 22 Feb 2026 04:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734760; 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=xjuwR4Pr+AW7sd6WRcj7hzhcyGkLECCsX3B53NdlO0Y=; b=r+gO7iR1/HypTRxMkj/ZpxMmfJhkQ6ygCpfgS0A4Plo6LMhWH9kztledt9QXusv3/HzNtH uFNTTZwGGFmFTkg3VEU+qCJMOdSjw0s80IBb/PlTE3IWgeMdHBgkoGDPbAg728+3Q2nxNq g+Tg0NPwOV5T/VMrdAIyi3kroierBjtMM9GqyzOivoi6iAc325ZKmIAk8VvaB1CyR7uYGn 9PTq/YVgAtkWSA+VCaREJOM6WnVkxLn465TjxZq85wY51/ChxTpS9T/J7OlGQsFd4DlFuz LKxIPmaBS+9FUebvZ2QikHlVZY3BnWjx2DiPjLzcx70mHR/x1Rz2gGKgcC8L2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734760; a=rsa-sha256; cv=none; b=Iluj1WraRvezcg4magAv1xXj/IHE0oMyr1UVquDn2xXdGN8n2ZzxvnJk5FCIA0hJsNL7iV 9UWSos3hv34mLBBx1Lb1EpmbwZkpyvuZd92l/Jp5kXQSMWJwuTg6DbY6LTLI8gsireUWt/ Am9ntcfNEGp9LKgbj0HvrYR2lWIRFf1q8eo69duDMeU1u3ok2AzkigcCuw+0uOH2wxt+Vj tXx72yBR+If11erMkwGzsIkzQi3Lc+czoDf2cDBE1+Gc6I/+XVRKxLfMLbLfpWXRq1lNAn 3U2OJcPfWxxoHIRqPuXrxcG0e1HAOmJfVj/nW+VGM4Q8PP35fK5RJmql0wZ1ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734760; 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=xjuwR4Pr+AW7sd6WRcj7hzhcyGkLECCsX3B53NdlO0Y=; b=gdQ7a4B5RXFOXKWR597yuiIQk/PKFXzDnYkeTWZrySk5j16K43VJITTI69MZcgfYWJLc08 BLQQv5Y/l0l2m/yafGAM9oEgrU/DSeIyOmeGgWmE1QjFcXXCCDutp+e1exNyRLaHTkq3B7 9Q3LArZFfteBzek1jD4ZjDbPIU5ZRGGpNbMpF4JMMR/OPivh7G8zw7qEAS8KkRshll2SwN JdHPLZz79QF3qJGBG6vbtdX58Kg5eH0rVfxs3z/nKlaS15Mg6Th9GUWgxwMLvvqAxYOoex kStnNO5/2oLWRDt1ZQLZzAhsgACmkFUouHLXXBDJk74JPj9RmY8WNBCtGuk/NQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWLJ5BDRzDVg for ; Sun, 22 Feb 2026 04:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27549 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:32:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hrant Dadivanyan From: Enji Cooper Subject: git: dbeb51347afa - stable/14 - asmc: Add support for macmini 6,1 and 6,2 (late 2012) models List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: dbeb51347afaf910d1962d263da7a0e54d6343f3 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:32:40 +0000 Message-Id: <699a86e8.27549.276b46e3@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=dbeb51347afaf910d1962d263da7a0e54d6343f3 commit dbeb51347afaf910d1962d263da7a0e54d6343f3 Author: Hrant Dadivanyan AuthorDate: 2025-04-20 15:07:34 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:31:33 +0000 asmc: Add support for macmini 6,1 and 6,2 (late 2012) models This adds the ASMC support for the macmini 6,1 and 6,2. PR: kern/268141 Differential Revision: https://reviews.freebsd.org/D49929 (cherry picked from commit 93ca9e44b752e6a9aeb0f761a022d14281d1a4e3) --- sys/dev/asmc/asmc.c | 18 +++++++++++++++ sys/dev/asmc/asmcvar.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 2a973be2e95c..d845ea7d669c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -359,6 +359,24 @@ static const struct asmc_model asmc_models[] = { ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, + /* The Mac Mini 6,1 has no SMS */ + { + "Macmini6,1", "Apple SMC Mac Mini 6,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM61_TEMPS, ASMC_MM61_TEMPNAMES, ASMC_MM61_TEMPDESCS + }, + + /* The Mac Mini 6,2 has no SMS */ + { + "Macmini6,2", "Apple SMC Mac Mini 6,2", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM62_TEMPS, ASMC_MM62_TEMPNAMES, ASMC_MM62_TEMPDESCS + }, + /* The Mac Mini 7,1 has no SMS */ { "Macmini7,1", "Apple SMC Mac Mini 7,1", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index c5ef84519742..102bee8a15b7 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -600,6 +600,68 @@ struct asmc_softc { "Power Supply Temperature", \ "Wireless Module Proximity Temperature", } +#define ASMC_MM61_TEMPS { "TA0P", "TA1P", \ + "TC0D", "TC0G", "TC0P", "TCPG", \ + "TI0P", \ + "TM0S", "TMBS", "TM0P", \ + "TP0P", "TPCD", \ + "Tp0C", \ + "TW0P", NULL } + +#define ASMC_MM61_TEMPNAMES { "ambient_air_proximity", "ambient_cpu_pch_wireless_dimm", \ + "cpu_die", "TC0G", "cpu_proximity", "TCPG", \ + "thunderbolt_proximity", \ + "memory_slot1", "memory_slot2", "memory_proximity", \ + "pch_controller_proximity", "pch_controller_die", \ + "pwr_supply", \ + "wireless_proximity", NULL } + +#define ASMC_MM61_TEMPDESCS { "Ambient Air Proximity Temperature", \ + "Combo Ambient CPU PCH Wireless DIMM Temperature", \ + "CPU Die Temperature", \ + NULL, \ + "CPU Proximity Temperature", \ + NULL, \ + "Thunderbolt Proximity Temperature", \ + "Memory Slot 1 Temperature", \ + "Memory Slot 2 Temperature", \ + "Memory Slots Proximity Temperature", \ + "Platform Controller Hub Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Power Supply Temperature", \ + "Wireless Module Proximity Temperature", NULL } + +#define ASMC_MM62_TEMPS { "TA0P", "TA1P", \ + "TC0D", "TC0G", "TC0P", "TCPG", \ + "TI0P", \ + "TM0S", "TMBS", "TM0P", \ + "TP0P", "TPCD", \ + "Tp0C", \ + "TW0P", NULL } + +#define ASMC_MM62_TEMPNAMES { "ambient_air_proximity", "ambient_cpu_pch_wireless_dimm", \ + "cpu_die", "TC0G", "cpu_proximity", "TCPG", \ + "thunderbolt_proximity", \ + "memory_slot1", "memory_slot2", "memory_proximity", \ + "pch_controller_proximity", "pch_controller_die", \ + "pwr_supply", \ + "wireless_proximity", NULL } + +#define ASMC_MM62_TEMPDESCS { "Ambient Air Proximity Temperature", \ + "Combo Ambient CPU PCH Wireless DIMM Temperature", \ + "CPU Die Temperature", \ + NULL, \ + "CPU Proximity Temperature", \ + NULL, \ + "Thunderbolt Proximity Temperature", \ + "Memory Slot 1 Temperature", \ + "Memory Slot 2 Temperature", \ + "Memory Slots Proximity Temperature", \ + "Platform Controller Hub Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Power Supply Temperature", \ + "Wireless Module Proximity Temperature", NULL } + #define ASMC_MM71_TEMPS { "TA0p", "TA1p", \ "TA2p", "TC0c", \ "TC0p", "TC1c", \ From nobody Sun Feb 22 04:32: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 4fJWLL0p4Yz6SwLh for ; Sun, 22 Feb 2026 04:32: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 4fJWLK6K30z3fbb for ; Sun, 22 Feb 2026 04:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzq4+s9D4VauGYvdSuq+Nch56x5eJ9LgwjstQBj2LPs=; b=ASD1ygOMTWQF2RDQnDWdWca1smwi5D8dhwq+TaylDUBMfg85pVuAjhjtHEhRoLdVJk+1n+ ZMpoM8pPC2maxWxoHxQh5bbwEGd12DHXN0pjebd1Xf69kd05OQHTj6SuABHpJlN+FBFdCI Lmw1xqDBX8SwaanyvkVnXdYA5Q4Li2WyIXh6txQzVV1MvH3OQ7MLMGuKyZv0E6V+1ukral TEx5u3kootfsOGK09ZSmqQPB+JhtaWGpTL8cv//J0oNwsN6EXgNqvmxrIANTKjZENPMfvX 4gKgSJ5wW1p3aG8tSSBHedmwj+GTBX/1AJ921JAI8iVoj6CMQ6LKmVzyyy7DLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734761; a=rsa-sha256; cv=none; b=rKgA6Utek/rxuHJzqT+8nI/YubhxBlZCcaQ75VOz9+vJG+AznVYHOxq87PKKyStMfhI4gV OORorxGCWivJUrNk65BVdyYT8a7tN6cgRNbC7+EJ+hFLgBzzSuuALMKwtYPmHZszJK671u IQRIqXkkbSe+YeKtEWfevHqLkGVWJajkAaJlSb6yV+BEglC7cbAsFZrJwVlx66QBc1WrRn 5BcsTL0iZ6n9bkX7xarizp+7oDlc3EPa8aBZAEtKIWsW8OUn9E5oKgL+9q17w4dCeBvsQh PZP0M2avzV/HUnzqfC30PcCOkd6ooGpHP3SWqZX6oEymAr/IByUdfLAwMC4awg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzq4+s9D4VauGYvdSuq+Nch56x5eJ9LgwjstQBj2LPs=; b=dj1G/Vpf9L7/H4mRB5AiiQkbnjdEcgrXg1wku+N7A3ELIP9RXWYwKj2935Z+beRktSYLYJ fPiMna7D5p1LV4QLaGJ++f8pTJjujSFq/f2PpEqjpbM54MknMQHB+VGCQbcFY7AgBxxwnM 7mcXz3lhrfEsehZt52wZaNyF/tIImBB7I++cA5LW1icHO//u8ER68/Ecg5QYou4u5SkgQ9 gh12Zr6qhZdSwOdz5UVjR+MnimAwETXTB9wQ6nzdB1k+IMOpJL4j/zB2UDl/5bZTEkRPH4 oGTxRuhao00QcD/Tmm2CGuZCsydPNCqaqJ/YKCb7fnPknRQ6faq4gexaYw3BIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWLK5wlczTGy for ; Sun, 22 Feb 2026 04:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2754e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:32:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 38917c4f5eab - stable/14 - chore: asmc: minor code cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 38917c4f5eabda8f20391b3d84e1cd12f0e5734d Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:32:41 +0000 Message-Id: <699a86e9.2754e.70cde263@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=38917c4f5eabda8f20391b3d84e1cd12f0e5734d commit 38917c4f5eabda8f20391b3d84e1cd12f0e5734d Author: Enji Cooper AuthorDate: 2026-01-01 06:43:05 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:32:07 +0000 chore: asmc: minor code cleanup - Use symbolic names in Mac definitions in lieu of the unrolled values they represent. - Delete trailing whitespace. - Fix indentation. No functional change intended. MFC after: 1 week (cherry picked from commit a8f3c3b5d4d9dac1dafe4094fe35b30ffdf26178) --- sys/dev/asmc/asmc.c | 72 +++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index d845ea7d669c..f2c42ba814e2 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -137,7 +137,7 @@ static const struct asmc_model *asmc_match(device_t dev); #define ASMC_SMS_FUNCS asmc_mb_sysctl_sms_x, asmc_mb_sysctl_sms_y, \ asmc_mb_sysctl_sms_z -#define ASMC_SMS_FUNCS_DISABLED NULL,NULL,NULL +#define ASMC_SMS_FUNCS_DISABLED NULL, NULL, NULL #define ASMC_FAN_FUNCS asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, asmc_mb_sysctl_fansafespeed, \ asmc_mb_sysctl_fanminspeed, \ @@ -163,19 +163,19 @@ static const struct asmc_model *asmc_match(device_t dev); static const struct asmc_model asmc_models[] = { { "MacBook1,1", "Apple SMC MacBook Core Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS }, { "MacBook2,1", "Apple SMC MacBook Core 2 Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS }, { "MacBook3,1", "Apple SMC MacBook Core 2 Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MB31_TEMPS, ASMC_MB31_TEMPNAMES, ASMC_MB31_TEMPDESCS }, @@ -297,9 +297,9 @@ static const struct asmc_model asmc_models[] = { /* The Mac Mini has no SMS */ { "Macmini1,1", "Apple SMC Mac Mini", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, @@ -315,9 +315,9 @@ static const struct asmc_model asmc_models[] = { /* The Mac Mini 3,1 has no SMS */ { "Macmini3,1", "Apple SMC Mac Mini 3,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS }, @@ -334,18 +334,18 @@ static const struct asmc_model asmc_models[] = { /* - same sensors as Mac Mini 5,2 */ { "Macmini5,1", "Apple SMC Mac Mini 5,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, /* The Mac Mini 5,2 has no SMS */ { "Macmini5,2", "Apple SMC Mac Mini 5,2", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, @@ -353,63 +353,63 @@ static const struct asmc_model asmc_models[] = { /* - same sensors as Mac Mini 5,2 */ { "Macmini5,3", "Apple SMC Mac Mini 5,3", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, /* The Mac Mini 6,1 has no SMS */ { "Macmini6,1", "Apple SMC Mac Mini 6,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM61_TEMPS, ASMC_MM61_TEMPNAMES, ASMC_MM61_TEMPDESCS }, /* The Mac Mini 6,2 has no SMS */ { "Macmini6,2", "Apple SMC Mac Mini 6,2", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM62_TEMPS, ASMC_MM62_TEMPNAMES, ASMC_MM62_TEMPDESCS }, /* The Mac Mini 7,1 has no SMS */ { "Macmini7,1", "Apple SMC Mac Mini 7,1", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM71_TEMPS, ASMC_MM71_TEMPNAMES, ASMC_MM71_TEMPDESCS }, /* Idem for the Mac Pro "Quad Core" (original) */ { "MacPro1,1", "Apple SMC Mac Pro (Quad Core)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP1_TEMPS, ASMC_MP1_TEMPNAMES, ASMC_MP1_TEMPDESCS }, /* Idem for the Mac Pro (8-core) */ { "MacPro2", "Apple SMC Mac Pro (8-core)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP2_TEMPS, ASMC_MP2_TEMPNAMES, ASMC_MP2_TEMPDESCS }, /* Idem for the MacPro 2010*/ { "MacPro5,1", "Apple SMC MacPro (2010)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS }, @@ -424,20 +424,20 @@ static const struct asmc_model asmc_models[] = { { "MacBookAir1,1", "Apple SMC MacBook Air", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MBA_TEMPS, ASMC_MBA_TEMPNAMES, ASMC_MBA_TEMPDESCS }, { "MacBookAir3,1", "Apple SMC MacBook Air Core 2 Duo (Late 2010)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MBA3_TEMPS, ASMC_MBA3_TEMPNAMES, ASMC_MBA3_TEMPDESCS }, { "MacBookAir4,1", "Apple SMC Macbook Air 11-inch (Mid 2011)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS2, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS }, @@ -445,7 +445,7 @@ static const struct asmc_model asmc_models[] = { { "MacBookAir4,2", "Apple SMC Macbook Air 13-inch (Mid 2011)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS2, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS }, @@ -830,11 +830,13 @@ asmc_detach(device_t dev) static int asmc_resume(device_t dev) { - uint8_t buf[2]; - buf[0] = light_control; - buf[1] = 0x00; - asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf); - return (0); + uint8_t buf[2]; + + buf[0] = light_control; + buf[1] = 0x00; + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf); + + return (0); } #ifdef ASMC_DEBUG From nobody Sun Feb 22 04: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 4fJWRr1LLfz6SwJq for ; Sun, 22 Feb 2026 04:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJWRq6Ttvz3gl0 for ; Sun, 22 Feb 2026 04: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=1771735047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62UMm9OG2JHLznfeAuIKVdZFMssJCIXektXSc5JxDQo=; b=f1E6ICRbJcn3TBjWdbxUnfhBrRUWoSDX7L2S62jDTeb7KgpW6pGVJsuLfMpvig+Zd+ErI9 ssElH3k2wf9IqJVRZWuhM/+FoMSbs+QjyMgHGAu0FJX48DI7kCkZZqhdaZVT+nX1C+LqcN fVTOjQZPR832ztR/D+Vd9Xc24WZuPQ7atC0JVCFngJMf7yNxRNM+k/Xzr+bM5FXV4WzU6H sm1j61Leq/w6lmKbDPG1aqJq6kgRpXzwRpXfOHlDhPpQbBoFdplb8/Em1rGniUJDu32LU3 d1IaxzUQlnlKs22YLFgHst7kHIYGx4XlpqitJLrS++EJNTuI2ushfR2/IoICVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771735047; a=rsa-sha256; cv=none; b=jpglCZ9Mbuml1l/XGD5Y1+cQ63WJWHw/RxKiQuYCSETORaqRks4maUNm2VSCVCwUPcmvf3 XSU5ronh2OdIfyuha8Gq3v00M9NqT4Lm4MN9m9/B4b+rCuvHPT7uNqII+71lm230NqHols k8yfp3yQ5g1Lvr4utXaZu/SSV/kWJxIPY0/s7XB87cOfWu8/RdqIUQNUglYL8j0+AO1FyO sYl3V+7ghmXqUO/6OdON8zLxfppCLdFnQBmYrKeTTbN7VUiN29zYRhHLCtp6V99+PkV79m 1MvV5P0kVl1sI3ozIBtk5aaT7wJr7Wp3uD21wTdfceQ1vl55ryR3EUAXail8JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771735047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62UMm9OG2JHLznfeAuIKVdZFMssJCIXektXSc5JxDQo=; b=sCygGbZ+ydA+y65s4V7v2YCxdrxS6hj1NzT4ctK7u0Ruencu25rkgeOM8t9ZE5PHXSRdTW I2zfFtf7x2Ro+MLfHBkp1BBorLBgcNXrPlUzv3YkWaq9H2HPyiri6WWtKxC3ED05/ZKyCi XvH60tJ+ssko3QaG4cXb7my9n1wWsP7RBXHuL0nbQgnOdNHsG0tcL02YkN2pMNDQhbD0eT Nd2F1vH5fscKU5ufljzHPalw/IAK6jOCxGtkFIk5LujKm5DlSLq5aEkrHSlgxpkvWrN7Cc x46wdc59Tcvj1+onS547iXPKtRNJhh1PYSZz4ORsVn+ckz+mZ44Mi0PMkJYmRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWRq5WktzDVn for ; Sun, 22 Feb 2026 04:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25357 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:37:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: cc5c8b61ad1e - stable/14 - t_ptrace_wait.c: clean up trailing whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: cc5c8b61ad1e2443efc4aaca232245de11c2ea5a Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:37:27 +0000 Message-Id: <699a8807.25357.7c331e8@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=cc5c8b61ad1e2443efc4aaca232245de11c2ea5a commit cc5c8b61ad1e2443efc4aaca232245de11c2ea5a Author: Enji Cooper AuthorDate: 2026-02-08 23:40:56 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:37:14 +0000 t_ptrace_wait.c: clean up trailing whitespace This is being done to aid with future potential updates of this file. MFC after: 1 week (cherry picked from commit fa3519d068d95f87e773d27f96e9f1e18f70075a) --- contrib/netbsd-tests/kernel/t_ptrace_wait.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/netbsd-tests/kernel/t_ptrace_wait.c b/contrib/netbsd-tests/kernel/t_ptrace_wait.c index 9d08c0e9648d..af364390dd25 100644 --- a/contrib/netbsd-tests/kernel/t_ptrace_wait.c +++ b/contrib/netbsd-tests/kernel/t_ptrace_wait.c @@ -524,7 +524,7 @@ ATF_TC_BODY(attach3, tc) _exit(exitval_tracee); } PARENT_TO_CHILD("Message 1", parent_tracee, msg); - + printf("Before calling PT_ATTACH for tracee %d\n", tracee); ATF_REQUIRE(ptrace(PT_ATTACH, tracee, NULL, 0) != -1); @@ -6109,7 +6109,7 @@ ATF_TC_BODY(signal6, tc) printf("Before calling %s() for the forkee - expected exited\n", TWAIT_FNAME); TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0), - child2); + child2); validate_status_exited(status, exitval2); @@ -6120,11 +6120,11 @@ ATF_TC_BODY(signal6, tc) printf("Before calling %s() for the child - expected stopped " "SIGCHLD\n", TWAIT_FNAME); - TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); validate_status_stopped(status, SIGCHLD); - printf("Before resuming the child process where it left off and " + printf("Before resuming the child process where it left off and " "without signal to be sent\n"); ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); @@ -6135,7 +6135,7 @@ ATF_TC_BODY(signal6, tc) validate_status_exited(status, exitval); printf("Before calling %s() for the child - expected no process\n", - TWAIT_FNAME); + TWAIT_FNAME); TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); } #endif @@ -6240,7 +6240,7 @@ ATF_TC_BODY(signal7, tc) printf("Before calling %s() for the forkee - expected exited\n", TWAIT_FNAME); TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0), - child2); + child2); validate_status_exited(status, exitval2); @@ -6251,11 +6251,11 @@ ATF_TC_BODY(signal7, tc) printf("Before calling %s() for the child - expected stopped " "SIGCHLD\n", TWAIT_FNAME); - TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); validate_status_stopped(status, SIGCHLD); - printf("Before resuming the child process where it left off and " + printf("Before resuming the child process where it left off and " "without signal to be sent\n"); ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); @@ -6266,7 +6266,7 @@ ATF_TC_BODY(signal7, tc) validate_status_exited(status, exitval); printf("Before calling %s() for the child - expected no process\n", - TWAIT_FNAME); + TWAIT_FNAME); TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); } #endif @@ -6356,11 +6356,11 @@ ATF_TC_BODY(signal8, tc) printf("Before calling %s() for the child - expected stopped " "SIGCHLD\n", TWAIT_FNAME); - TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); validate_status_stopped(status, SIGCHLD); - printf("Before resuming the child process where it left off and " + printf("Before resuming the child process where it left off and " "without signal to be sent\n"); ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); @@ -6371,7 +6371,7 @@ ATF_TC_BODY(signal8, tc) validate_status_exited(status, exitval); printf("Before calling %s() for the child - expected no process\n", - TWAIT_FNAME); + TWAIT_FNAME); TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); } From nobody Sun Feb 22 05:14: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 4fJXGQ3WnSz6Sypc for ; Sun, 22 Feb 2026 05:14: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 4fJXGQ2rCdz3lH3 for ; Sun, 22 Feb 2026 05:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGEePKt9chEM6XYGcI8XB/8ANkeFnmYAP+qYfUiK5h4=; b=UeLqZhAkvR2vRSsZYlvPFJczs3ZyNRbD9J1q87UJlsPX9Njtv1/F5+PZjEbYTd0oTnKT4O dbfsEuqo0o57nr4ZYpRaoPfQL0clwzqJL3w4iajD0dZeU+PZEYiIte0d+bV1rm8G7/Didi c5nhmzBzKgE7KUaHgksescBm/qphjO92kdbheZ0tkzw+hHXs02bEGSRQJA31nXC7MLcMJL ip3m4ap0+eGKNkuZ+CqEkUeyLngoBVXtu6hExL13ruD2w29ACiGNo4I5kGWIF3jfgVWMQV 39nCTgFZK0XZJI4VqWfp+XQkGJ+O3gK9xHT+1N+q2mkak51vvETIArwKs3B0XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771737262; a=rsa-sha256; cv=none; b=GVsFpmb5a1H8JKUNQ5vj+7r7yldhAZB8LDIEn3GKGbshGnQTo8MGf0622zHHCovlkc0tgn B5j7f7eqIefQMU1YU6yOMNw98SM8gxMCSrUaHV36lByAV4N4W0j5eskXUjQiIoSbiwHVNB WcqTWsjDl5ucUrdHcdiVwACevsfenhSvU1ebbbmMWg++q9/LVpYDKQUyT6MgzBGJWxUVwI 1bxVAj4csXupv/GossvBADS2nOZkpNtayu6nqzsVdmKm/oBv4Hf0FCT7b6qiZphS/KzbGm +ZanSBtt2sxEs77DAq9oMJGnJfhJGzLce6Z8FAAlm8d5OllegBX8h0N6OtcQoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGEePKt9chEM6XYGcI8XB/8ANkeFnmYAP+qYfUiK5h4=; b=wu50PuSbp5KfGGVvznan6BpXS4mueFqT/xV7/K7nueNyHhlhZIhXCAIAvYK/o1CnLJIOO7 LLptQ0oGhWnzblmEE7VeizNVYBr8QhnpOQgyK9lEaKqU/NG0BwyfDrxTzvUwWmrUZZGl1F mXvQlJBUH79eCCeUR7gM5Osuo65ZN9iWdBz/G+Jl42CcP07noXzHuNs9gN1rE/I2sR0s/m GbkmdepbfUQQK0APUXUnu2FnT2yqrNPCBtmAQwO8a1lwOS8vI/tfnRb/wKGVDXaCDaqs4H SVMqPj17QyWk3Un8lo5nx7lpUvMFIO12CxH3F2UOrpQ8/Hr95hjnKoOWYB1r1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJXGQ2Gj2zVrQ for ; Sun, 22 Feb 2026 05:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 05:14:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: f775385affef - stable/15 - openssl: import 3.5.5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f775385affefd7beac0d038d5cd9cbf01bfc4a06 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 05:14:16 +0000 Message-Id: <699a90a8.33c9a.36afaabb@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f775385affefd7beac0d038d5cd9cbf01bfc4a06 commit f775385affefd7beac0d038d5cd9cbf01bfc4a06 Author: Enji Cooper AuthorDate: 2026-01-31 22:00:39 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:34:23 +0000 openssl: import 3.5.5 This change adds OpenSSL 3.5.5 from upstream [1]. The 3.5.5 artifact was been verified via PGP key [2] and by SHA256 checksum [3]. This is a security release, but also contains several bugfixes. All of the CVE-worthy issues have already been addressed on the target branch(es), so the net-result is that this is a bugfix release. More information about the release (from a high level) can be found in the release notes [4]. MFC after: 1 week 1. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz 2. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz.asc 3. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz.sha256 4. https://github.com/openssl/openssl/blob/openssl-3.5.5/NEWS.md Merge commit '808413da28df9fb93e1f304e6016b15e660f54c8' (cherry picked from commit f25b8c9fb4f58cf61adb47d7570abe7caa6d385d) --- crypto/openssl/.ctags.d/exclude.ctags | 3 +- crypto/openssl/CHANGES.md | 269 + crypto/openssl/CONTRIBUTING.md | 8 + crypto/openssl/Configurations/50-nonstop.conf | 2 + crypto/openssl/Configurations/unix-Makefile.tmpl | 17 +- crypto/openssl/NEWS.md | 62 +- crypto/openssl/NOTES-NONSTOP.md | 12 +- crypto/openssl/README.md | 2 +- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/asn1parse.c | 72 +- crypto/openssl/apps/ca.c | 765 +- crypto/openssl/apps/ciphers.c | 55 +- crypto/openssl/apps/cmp.c | 1439 +- crypto/openssl/apps/cms.c | 509 +- crypto/openssl/apps/crl.c | 126 +- crypto/openssl/apps/crl2pkcs7.c | 36 +- crypto/openssl/apps/dgst.c | 163 +- crypto/openssl/apps/dhparam.c | 159 +- crypto/openssl/apps/dsa.c | 78 +- crypto/openssl/apps/dsaparam.c | 71 +- crypto/openssl/apps/ec.c | 78 +- crypto/openssl/apps/ecparam.c | 117 +- crypto/openssl/apps/enc.c | 216 +- crypto/openssl/apps/engine.c | 112 +- crypto/openssl/apps/errstr.c | 17 +- crypto/openssl/apps/fipsinstall.c | 524 +- crypto/openssl/apps/gendsa.c | 42 +- crypto/openssl/apps/genpkey.c | 97 +- crypto/openssl/apps/genrsa.c | 61 +- crypto/openssl/apps/include/app_libctx.h | 4 +- crypto/openssl/apps/include/app_params.h | 1 - crypto/openssl/apps/include/apps.h | 252 +- crypto/openssl/apps/include/apps_ui.h | 5 +- crypto/openssl/apps/include/cmp_mock_srv.h | 18 +- crypto/openssl/apps/include/engine_loader.h | 8 +- crypto/openssl/apps/include/fmt.h | 32 +- crypto/openssl/apps/include/function.h | 17 +- crypto/openssl/apps/include/http_server.h | 64 +- crypto/openssl/apps/include/log.h | 34 +- crypto/openssl/apps/include/names.h | 2 +- crypto/openssl/apps/include/opt.h | 585 +- crypto/openssl/apps/include/platform.h | 12 +- crypto/openssl/apps/include/s_apps.h | 60 +- crypto/openssl/apps/include/vms_term_sock.h | 12 +- crypto/openssl/apps/info.c | 39 +- crypto/openssl/apps/kdf.c | 45 +- crypto/openssl/apps/lib/app_libctx.c | 1 - crypto/openssl/apps/lib/app_params.c | 7 +- crypto/openssl/apps/lib/app_provider.c | 12 +- crypto/openssl/apps/lib/app_rand.c | 5 +- crypto/openssl/apps/lib/app_x509.c | 54 +- crypto/openssl/apps/lib/apps.c | 686 +- crypto/openssl/apps/lib/apps_opt_printf.c | 1 - crypto/openssl/apps/lib/apps_ui.c | 39 +- crypto/openssl/apps/lib/cmp_mock_srv.c | 331 +- crypto/openssl/apps/lib/columns.c | 1 - crypto/openssl/apps/lib/engine.c | 15 +- crypto/openssl/apps/lib/engine_loader.c | 38 +- crypto/openssl/apps/lib/http_server.c | 125 +- crypto/openssl/apps/lib/log.c | 8 +- crypto/openssl/apps/lib/names.c | 2 +- crypto/openssl/apps/lib/opt.c | 202 +- crypto/openssl/apps/lib/s_cb.c | 650 +- crypto/openssl/apps/lib/s_socket.c | 115 +- crypto/openssl/apps/lib/tlssrp_depr.c | 47 +- crypto/openssl/apps/lib/vms_decc_argv.c | 2 +- crypto/openssl/apps/lib/vms_term_sock.c | 501 +- crypto/openssl/apps/lib/win32_init.c | 28 +- crypto/openssl/apps/list.c | 610 +- crypto/openssl/apps/mac.c | 40 +- crypto/openssl/apps/nseq.c | 22 +- crypto/openssl/apps/ocsp.c | 462 +- crypto/openssl/apps/openssl.c | 66 +- crypto/openssl/apps/passwd.c | 250 +- crypto/openssl/apps/pkcs12.c | 369 +- crypto/openssl/apps/pkcs7.c | 46 +- crypto/openssl/apps/pkcs8.c | 92 +- crypto/openssl/apps/pkey.c | 100 +- crypto/openssl/apps/pkeyparam.c | 32 +- crypto/openssl/apps/pkeyutl.c | 257 +- crypto/openssl/apps/prime.c | 45 +- crypto/openssl/apps/progs.pl | 7 +- crypto/openssl/apps/rand.c | 36 +- crypto/openssl/apps/rehash.c | 172 +- crypto/openssl/apps/req.c | 479 +- crypto/openssl/apps/rsa.c | 103 +- crypto/openssl/apps/rsautl.c | 91 +- crypto/openssl/apps/s_client.c | 1863 +- crypto/openssl/apps/s_server.c | 929 +- crypto/openssl/apps/s_time.c | 158 +- crypto/openssl/apps/sess_id.c | 42 +- crypto/openssl/apps/skeyutl.c | 38 +- crypto/openssl/apps/smime.c | 225 +- crypto/openssl/apps/speed.c | 1648 +- crypto/openssl/apps/spkac.c | 56 +- crypto/openssl/apps/srp.c | 196 +- crypto/openssl/apps/storeutl.c | 159 +- crypto/openssl/apps/testdsa.h | 1490 +- crypto/openssl/apps/testrsa.h | 4912 +++- crypto/openssl/apps/timeouts.h | 8 +- crypto/openssl/apps/ts.c | 264 +- crypto/openssl/apps/verify.c | 137 +- crypto/openssl/apps/version.c | 58 +- crypto/openssl/apps/vms_decc_init.c | 73 +- crypto/openssl/apps/x509.c | 417 +- crypto/openssl/crypto/LPdir_nyi.c | 2 +- crypto/openssl/crypto/LPdir_unix.c | 23 +- crypto/openssl/crypto/LPdir_vms.c | 24 +- crypto/openssl/crypto/LPdir_win.c | 35 +- crypto/openssl/crypto/LPdir_win32.c | 2 + crypto/openssl/crypto/LPdir_wince.c | 2 + crypto/openssl/crypto/aes/aes_cbc.c | 8 +- crypto/openssl/crypto/aes/aes_cfb.c | 18 +- crypto/openssl/crypto/aes/aes_core.c | 3589 ++- crypto/openssl/crypto/aes/aes_ecb.c | 2 +- crypto/openssl/crypto/aes/aes_ige.c | 56 +- crypto/openssl/crypto/aes/aes_local.h | 51 +- crypto/openssl/crypto/aes/aes_misc.c | 6 +- crypto/openssl/crypto/aes/aes_ofb.c | 6 +- crypto/openssl/crypto/aes/aes_wrap.c | 12 +- crypto/openssl/crypto/aes/aes_x86core.c | 591 +- crypto/openssl/crypto/aes/asm/aesni-xts-avx512.pl | 14 +- crypto/openssl/crypto/aria/aria.c | 335 +- crypto/openssl/crypto/arm_arch.h | 369 +- crypto/openssl/crypto/armcap.c | 241 +- crypto/openssl/crypto/asn1/a_bitstr.c | 12 +- crypto/openssl/crypto/asn1/a_d2i_fp.c | 40 +- crypto/openssl/crypto/asn1/a_digest.c | 9 +- crypto/openssl/crypto/asn1/a_dup.c | 6 +- crypto/openssl/crypto/asn1/a_gentm.c | 8 +- crypto/openssl/crypto/asn1/a_i2d_fp.c | 4 +- crypto/openssl/crypto/asn1/a_int.c | 33 +- crypto/openssl/crypto/asn1/a_mbstr.c | 58 +- crypto/openssl/crypto/asn1/a_object.c | 32 +- crypto/openssl/crypto/asn1/a_octet.c | 4 +- crypto/openssl/crypto/asn1/a_print.c | 3 +- crypto/openssl/crypto/asn1/a_sign.c | 45 +- crypto/openssl/crypto/asn1/a_strex.c | 91 +- crypto/openssl/crypto/asn1/a_strnid.c | 16 +- crypto/openssl/crypto/asn1/a_time.c | 53 +- crypto/openssl/crypto/asn1/a_type.c | 12 +- crypto/openssl/crypto/asn1/a_utctm.c | 2 +- crypto/openssl/crypto/asn1/a_utf8.c | 4 +- crypto/openssl/crypto/asn1/a_verify.c | 29 +- crypto/openssl/crypto/asn1/ameth_lib.c | 172 +- crypto/openssl/crypto/asn1/asn1_err.c | 374 +- crypto/openssl/crypto/asn1/asn1_gen.c | 103 +- crypto/openssl/crypto/asn1/asn1_item_list.h | 4 +- crypto/openssl/crypto/asn1/asn1_lib.c | 12 +- crypto/openssl/crypto/asn1/asn1_local.h | 28 +- crypto/openssl/crypto/asn1/asn1_parse.c | 74 +- crypto/openssl/crypto/asn1/asn_mime.c | 99 +- crypto/openssl/crypto/asn1/asn_mstbl.c | 12 +- crypto/openssl/crypto/asn1/asn_pack.c | 9 +- crypto/openssl/crypto/asn1/bio_asn1.c | 44 +- crypto/openssl/crypto/asn1/bio_ndef.c | 17 +- crypto/openssl/crypto/asn1/d2i_param.c | 2 +- crypto/openssl/crypto/asn1/d2i_pr.c | 43 +- crypto/openssl/crypto/asn1/d2i_pu.c | 4 +- crypto/openssl/crypto/asn1/evp_asn1.c | 30 +- crypto/openssl/crypto/asn1/f_int.c | 4 +- crypto/openssl/crypto/asn1/f_string.c | 4 +- crypto/openssl/crypto/asn1/i2d_evp.c | 34 +- crypto/openssl/crypto/asn1/n_pkey.c | 23 +- crypto/openssl/crypto/asn1/nsseq.c | 6 +- crypto/openssl/crypto/asn1/p5_pbe.c | 19 +- crypto/openssl/crypto/asn1/p5_pbev2.c | 50 +- crypto/openssl/crypto/asn1/p5_scrypt.c | 52 +- crypto/openssl/crypto/asn1/p8_pkey.c | 24 +- crypto/openssl/crypto/asn1/t_bitst.c | 4 +- crypto/openssl/crypto/asn1/t_pkey.c | 19 +- crypto/openssl/crypto/asn1/t_spki.c | 6 +- crypto/openssl/crypto/asn1/tasn_dec.c | 227 +- crypto/openssl/crypto/asn1/tasn_enc.c | 51 +- crypto/openssl/crypto/asn1/tasn_new.c | 30 +- crypto/openssl/crypto/asn1/tasn_prn.c | 92 +- crypto/openssl/crypto/asn1/tasn_scn.c | 2 +- crypto/openssl/crypto/asn1/tasn_typ.c | 26 +- crypto/openssl/crypto/asn1/tasn_utl.c | 22 +- crypto/openssl/crypto/asn1/tbl_standard.h | 85 +- crypto/openssl/crypto/asn1/x_algor.c | 24 +- crypto/openssl/crypto/asn1/x_bignum.c | 29 +- crypto/openssl/crypto/asn1/x_int64.c | 87 +- crypto/openssl/crypto/asn1/x_long.c | 25 +- crypto/openssl/crypto/asn1/x_sig.c | 8 +- crypto/openssl/crypto/asn1/x_spki.c | 10 +- crypto/openssl/crypto/asn1/x_val.c | 4 +- crypto/openssl/crypto/asn1_dsa.c | 61 +- crypto/openssl/crypto/async/arch/async_null.c | 5 +- crypto/openssl/crypto/async/arch/async_null.h | 17 +- crypto/openssl/crypto/async/arch/async_posix.c | 14 +- crypto/openssl/crypto/async/arch/async_posix.h | 53 +- crypto/openssl/crypto/async/arch/async_win.c | 14 +- crypto/openssl/crypto/async/arch/async_win.h | 38 +- crypto/openssl/crypto/async/async.c | 29 +- crypto/openssl/crypto/async/async_err.c | 16 +- crypto/openssl/crypto/async/async_local.h | 9 +- crypto/openssl/crypto/async/async_wait.c | 48 +- crypto/openssl/crypto/bf/bf_cfb64.c | 4 +- crypto/openssl/crypto/bf/bf_ecb.c | 2 +- crypto/openssl/crypto/bf/bf_enc.c | 12 +- crypto/openssl/crypto/bf/bf_local.h | 134 +- crypto/openssl/crypto/bf/bf_ofb64.c | 4 +- crypto/openssl/crypto/bf/bf_pi.h | 1548 +- crypto/openssl/crypto/bio/bf_buff.c | 21 +- crypto/openssl/crypto/bio/bf_lbuf.c | 18 +- crypto/openssl/crypto/bio/bf_prefix.c | 14 +- crypto/openssl/crypto/bio/bf_readbuff.c | 64 +- crypto/openssl/crypto/bio/bio_addr.c | 145 +- crypto/openssl/crypto/bio/bio_cb.c | 26 +- crypto/openssl/crypto/bio/bio_dump.c | 22 +- crypto/openssl/crypto/bio/bio_err.c | 142 +- crypto/openssl/crypto/bio/bio_lib.c | 78 +- crypto/openssl/crypto/bio/bio_local.h | 145 +- crypto/openssl/crypto/bio/bio_meth.c | 56 +- crypto/openssl/crypto/bio/bio_print.c | 148 +- crypto/openssl/crypto/bio/bio_sock.c | 243 +- crypto/openssl/crypto/bio/bio_sock2.c | 140 +- crypto/openssl/crypto/bio/bss_acpt.c | 140 +- crypto/openssl/crypto/bio/bss_bio.c | 68 +- crypto/openssl/crypto/bio/bss_conn.c | 236 +- crypto/openssl/crypto/bio/bss_core.c | 6 +- crypto/openssl/crypto/bio/bss_dgram.c | 1475 +- crypto/openssl/crypto/bio/bss_dgram_pair.c | 110 +- crypto/openssl/crypto/bio/bss_fd.c | 46 +- crypto/openssl/crypto/bio/bss_file.c | 73 +- crypto/openssl/crypto/bio/bss_log.c | 208 +- crypto/openssl/crypto/bio/bss_mem.c | 12 +- crypto/openssl/crypto/bio/bss_null.c | 2 +- crypto/openssl/crypto/bio/bss_sock.c | 135 +- crypto/openssl/crypto/bio/ossl_core_bio.c | 4 +- crypto/openssl/crypto/bn/asm/rsaz-2k-avx512.pl | 10 +- crypto/openssl/crypto/bn/asm/rsaz-2k-avxifma.pl | 10 +- crypto/openssl/crypto/bn/asm/rsaz-3k-avx512.pl | 10 +- crypto/openssl/crypto/bn/asm/rsaz-4k-avx512.pl | 10 +- crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl | 10 +- crypto/openssl/crypto/bn/asm/x86_64-gcc.c | 306 +- crypto/openssl/crypto/bn/asm/x86_64-mont5.pl | 10 +- crypto/openssl/crypto/bn/bn_add.c | 3 +- crypto/openssl/crypto/bn/bn_asm.c | 445 +- crypto/openssl/crypto/bn/bn_blind.c | 35 +- crypto/openssl/crypto/bn/bn_const.c | 253 +- crypto/openssl/crypto/bn/bn_conv.c | 14 +- crypto/openssl/crypto/bn/bn_ctx.c | 37 +- crypto/openssl/crypto/bn/bn_depr.c | 16 +- crypto/openssl/crypto/bn/bn_dh.c | 1193 +- crypto/openssl/crypto/bn/bn_div.c | 160 +- crypto/openssl/crypto/bn/bn_err.c | 54 +- crypto/openssl/crypto/bn/bn_exp.c | 378 +- crypto/openssl/crypto/bn/bn_exp2.c | 29 +- crypto/openssl/crypto/bn/bn_gcd.c | 37 +- crypto/openssl/crypto/bn/bn_gf2m.c | 158 +- crypto/openssl/crypto/bn/bn_intern.c | 14 +- crypto/openssl/crypto/bn/bn_kron.c | 6 +- crypto/openssl/crypto/bn/bn_lib.c | 71 +- crypto/openssl/crypto/bn/bn_local.h | 824 +- crypto/openssl/crypto/bn/bn_mod.c | 20 +- crypto/openssl/crypto/bn/bn_mont.c | 64 +- crypto/openssl/crypto/bn/bn_mpi.c | 3 +- crypto/openssl/crypto/bn/bn_mul.c | 69 +- crypto/openssl/crypto/bn/bn_nist.c | 422 +- crypto/openssl/crypto/bn/bn_ppc.c | 26 +- crypto/openssl/crypto/bn/bn_prime.c | 70 +- crypto/openssl/crypto/bn/bn_print.c | 6 +- crypto/openssl/crypto/bn/bn_rand.c | 78 +- crypto/openssl/crypto/bn/bn_recp.c | 12 +- crypto/openssl/crypto/bn/bn_rsa_fips186_4.c | 43 +- crypto/openssl/crypto/bn/bn_s390x.c | 28 +- crypto/openssl/crypto/bn/bn_shift.c | 8 +- crypto/openssl/crypto/bn/bn_sparc.c | 77 +- crypto/openssl/crypto/bn/bn_sqr.c | 16 +- crypto/openssl/crypto/bn/bn_sqrt.c | 13 +- crypto/openssl/crypto/bn/bn_srp.c | 26 +- crypto/openssl/crypto/bn/bn_word.c | 3 +- crypto/openssl/crypto/bn/bn_x931p.c | 25 +- crypto/openssl/crypto/bn/rsaz_exp.c | 32 +- crypto/openssl/crypto/bn/rsaz_exp.h | 67 +- crypto/openssl/crypto/bn/rsaz_exp_x2.c | 269 +- crypto/openssl/crypto/bsearch.c | 8 +- crypto/openssl/crypto/buffer/buf_err.c | 2 +- crypto/openssl/crypto/camellia/camellia.c | 426 +- crypto/openssl/crypto/camellia/cmll_cbc.c | 8 +- crypto/openssl/crypto/camellia/cmll_cfb.c | 18 +- crypto/openssl/crypto/camellia/cmll_ctr.c | 10 +- crypto/openssl/crypto/camellia/cmll_ecb.c | 2 +- crypto/openssl/crypto/camellia/cmll_local.h | 18 +- crypto/openssl/crypto/camellia/cmll_misc.c | 6 +- crypto/openssl/crypto/camellia/cmll_ofb.c | 6 +- crypto/openssl/crypto/cast/c_cfb64.c | 4 +- crypto/openssl/crypto/cast/c_ecb.c | 2 +- crypto/openssl/crypto/cast/c_enc.c | 4 +- crypto/openssl/crypto/cast/c_ofb64.c | 4 +- crypto/openssl/crypto/cast/c_skey.c | 15 +- crypto/openssl/crypto/cast/cast_local.h | 233 +- crypto/openssl/crypto/cast/cast_s.h | 2560 +- crypto/openssl/crypto/chacha/asm/chacha-x86.pl | 8 +- crypto/openssl/crypto/chacha/asm/chacha-x86_64.pl | 11 +- crypto/openssl/crypto/chacha/chacha_enc.c | 82 +- crypto/openssl/crypto/chacha/chacha_ppc.c | 35 +- crypto/openssl/crypto/chacha/chacha_riscv.c | 14 +- crypto/openssl/crypto/cmac/cmac.c | 7 +- crypto/openssl/crypto/cmp/cmp_asn.c | 291 +- crypto/openssl/crypto/cmp/cmp_client.c | 241 +- crypto/openssl/crypto/cmp/cmp_ctx.c | 580 +- crypto/openssl/crypto/cmp/cmp_err.c | 356 +- crypto/openssl/crypto/cmp/cmp_genm.c | 124 +- crypto/openssl/crypto/cmp/cmp_hdr.c | 50 +- crypto/openssl/crypto/cmp/cmp_http.c | 46 +- crypto/openssl/crypto/cmp/cmp_local.h | 224 +- crypto/openssl/crypto/cmp/cmp_msg.c | 272 +- crypto/openssl/crypto/cmp/cmp_protect.c | 42 +- crypto/openssl/crypto/cmp/cmp_server.c | 142 +- crypto/openssl/crypto/cmp/cmp_status.c | 59 +- crypto/openssl/crypto/cmp/cmp_util.c | 73 +- crypto/openssl/crypto/cmp/cmp_vfy.c | 221 +- crypto/openssl/crypto/cms/cms_asn1.c | 303 +- crypto/openssl/crypto/cms/cms_att.c | 88 +- crypto/openssl/crypto/cms/cms_cd.c | 10 +- crypto/openssl/crypto/cms/cms_dd.c | 13 +- crypto/openssl/crypto/cms/cms_dh.c | 26 +- crypto/openssl/crypto/cms/cms_ec.c | 26 +- crypto/openssl/crypto/cms/cms_enc.c | 36 +- crypto/openssl/crypto/cms/cms_env.c | 198 +- crypto/openssl/crypto/cms/cms_err.c | 310 +- crypto/openssl/crypto/cms/cms_ess.c | 57 +- crypto/openssl/crypto/cms/cms_io.c | 30 +- crypto/openssl/crypto/cms/cms_kari.c | 110 +- crypto/openssl/crypto/cms/cms_lib.c | 56 +- crypto/openssl/crypto/cms/cms_local.h | 89 +- crypto/openssl/crypto/cms/cms_pwri.c | 60 +- crypto/openssl/crypto/cms/cms_rsa.c | 14 +- crypto/openssl/crypto/cms/cms_sd.c | 181 +- crypto/openssl/crypto/cms/cms_smime.c | 140 +- crypto/openssl/crypto/comp/c_brotli.c | 139 +- crypto/openssl/crypto/comp/c_zlib.c | 190 +- crypto/openssl/crypto/comp/c_zstd.c | 206 +- crypto/openssl/crypto/comp/comp_err.c | 48 +- crypto/openssl/crypto/comp/comp_lib.c | 6 +- crypto/openssl/crypto/comp/comp_local.h | 22 +- crypto/openssl/crypto/comp_methods.c | 6 +- crypto/openssl/crypto/conf/conf_api.c | 6 +- crypto/openssl/crypto/conf/conf_def.c | 72 +- crypto/openssl/crypto/conf/conf_err.c | 90 +- crypto/openssl/crypto/conf/conf_lib.c | 25 +- crypto/openssl/crypto/conf/conf_mod.c | 64 +- crypto/openssl/crypto/conf/conf_sap.c | 6 +- crypto/openssl/crypto/conf/conf_ssl.c | 13 +- crypto/openssl/crypto/context.c | 8 +- crypto/openssl/crypto/core_algorithm.c | 52 +- crypto/openssl/crypto/core_fetch.c | 36 +- crypto/openssl/crypto/core_namemap.c | 54 +- crypto/openssl/crypto/cpt_err.c | 120 +- crypto/openssl/crypto/cpuid.c | 39 +- crypto/openssl/crypto/crmf/crmf_asn.c | 75 +- crypto/openssl/crypto/crmf/crmf_err.c | 114 +- crypto/openssl/crypto/crmf/crmf_lib.c | 269 +- crypto/openssl/crypto/crmf/crmf_local.h | 34 +- crypto/openssl/crypto/crmf/crmf_pbm.c | 28 +- crypto/openssl/crypto/cryptlib.c | 112 +- crypto/openssl/crypto/ct/ct_b64.c | 16 +- crypto/openssl/crypto/ct/ct_err.c | 62 +- crypto/openssl/crypto/ct/ct_local.h | 97 +- crypto/openssl/crypto/ct/ct_log.c | 27 +- crypto/openssl/crypto/ct/ct_oct.c | 22 +- crypto/openssl/crypto/ct/ct_policy.c | 12 +- crypto/openssl/crypto/ct/ct_prn.c | 16 +- crypto/openssl/crypto/ct/ct_sct.c | 11 +- crypto/openssl/crypto/ct/ct_sct_ctx.c | 13 +- crypto/openssl/crypto/ct/ct_vfy.c | 9 +- crypto/openssl/crypto/ct/ct_x509v3.c | 62 +- crypto/openssl/crypto/ctype.c | 410 +- crypto/openssl/crypto/cversion.c | 28 +- crypto/openssl/crypto/defaults.c | 36 +- crypto/openssl/crypto/der_writer.c | 23 +- crypto/openssl/crypto/des/cbc_cksm.c | 4 +- crypto/openssl/crypto/des/cbc_enc.c | 2 + crypto/openssl/crypto/des/cfb64ede.c | 12 +- crypto/openssl/crypto/des/cfb64enc.c | 4 +- crypto/openssl/crypto/des/cfb_enc.c | 13 +- crypto/openssl/crypto/des/des_enc.c | 144 +- crypto/openssl/crypto/des/des_local.h | 379 +- crypto/openssl/crypto/des/ecb3_enc.c | 4 +- crypto/openssl/crypto/des/ecb_enc.c | 3 +- crypto/openssl/crypto/des/fcrypt.c | 154 +- crypto/openssl/crypto/des/fcrypt_b.c | 52 +- crypto/openssl/crypto/des/ncbc_enc.c | 6 +- crypto/openssl/crypto/des/ofb64ede.c | 6 +- crypto/openssl/crypto/des/ofb64enc.c | 4 +- crypto/openssl/crypto/des/ofb_enc.c | 8 +- crypto/openssl/crypto/des/pcbc_enc.c | 4 +- crypto/openssl/crypto/des/qud_cksm.c | 22 +- crypto/openssl/crypto/des/set_key.c | 726 +- crypto/openssl/crypto/des/spr.h | 640 +- crypto/openssl/crypto/des/xcbc_enc.c | 6 +- crypto/openssl/crypto/deterministic_nonce.c | 62 +- crypto/openssl/crypto/dh/dh_ameth.c | 48 +- crypto/openssl/crypto/dh/dh_asn1.c | 39 +- crypto/openssl/crypto/dh/dh_backend.c | 21 +- crypto/openssl/crypto/dh/dh_check.c | 14 +- crypto/openssl/crypto/dh/dh_depr.c | 2 +- crypto/openssl/crypto/dh/dh_err.c | 94 +- crypto/openssl/crypto/dh/dh_gen.c | 21 +- crypto/openssl/crypto/dh/dh_group_params.c | 5 +- crypto/openssl/crypto/dh/dh_kdf.c | 26 +- crypto/openssl/crypto/dh/dh_key.c | 45 +- crypto/openssl/crypto/dh/dh_lib.c | 16 +- crypto/openssl/crypto/dh/dh_local.h | 24 +- crypto/openssl/crypto/dh/dh_meth.c | 28 +- crypto/openssl/crypto/dh/dh_pmeth.c | 47 +- crypto/openssl/crypto/dh/dh_rfc5114.c | 36 +- crypto/openssl/crypto/dllmain.c | 7 +- crypto/openssl/crypto/dsa/dsa_ameth.c | 141 +- crypto/openssl/crypto/dsa/dsa_asn1.c | 34 +- crypto/openssl/crypto/dsa/dsa_backend.c | 24 +- crypto/openssl/crypto/dsa/dsa_check.c | 8 +- crypto/openssl/crypto/dsa/dsa_depr.c | 10 +- crypto/openssl/crypto/dsa/dsa_err.c | 50 +- crypto/openssl/crypto/dsa/dsa_gen.c | 24 +- crypto/openssl/crypto/dsa/dsa_key.c | 26 +- crypto/openssl/crypto/dsa/dsa_lib.c | 19 +- crypto/openssl/crypto/dsa/dsa_local.h | 42 +- crypto/openssl/crypto/dsa/dsa_meth.c | 52 +- crypto/openssl/crypto/dsa/dsa_ossl.c | 96 +- crypto/openssl/crypto/dsa/dsa_pmeth.c | 39 +- crypto/openssl/crypto/dsa/dsa_sign.c | 22 +- crypto/openssl/crypto/dsa/dsa_vrf.c | 2 +- crypto/openssl/crypto/dso/dso_dl.c | 59 +- crypto/openssl/crypto/dso/dso_dlfcn.c | 132 +- crypto/openssl/crypto/dso/dso_err.c | 56 +- crypto/openssl/crypto/dso/dso_lib.c | 8 +- crypto/openssl/crypto/dso/dso_local.h | 16 +- crypto/openssl/crypto/dso/dso_vms.c | 172 +- crypto/openssl/crypto/dso/dso_win32.c | 160 +- crypto/openssl/crypto/ebcdic.c | 110 +- crypto/openssl/crypto/ec/curve25519.c | 5161 ++-- .../crypto/ec/curve448/arch_32/arch_intrinsics.h | 8 +- crypto/openssl/crypto/ec/curve448/arch_32/f_impl.h | 18 +- .../openssl/crypto/ec/curve448/arch_32/f_impl32.c | 10 +- .../crypto/ec/curve448/arch_64/arch_intrinsics.h | 12 +- crypto/openssl/crypto/ec/curve448/arch_64/f_impl.h | 15 +- .../openssl/crypto/ec/curve448/arch_64/f_impl64.c | 8 +- crypto/openssl/crypto/ec/curve448/curve448.c | 217 +- crypto/openssl/crypto/ec/curve448/curve448_local.h | 6 +- .../openssl/crypto/ec/curve448/curve448_tables.c | 3028 +-- crypto/openssl/crypto/ec/curve448/curve448utils.h | 44 +- crypto/openssl/crypto/ec/curve448/ed448.h | 102 +- crypto/openssl/crypto/ec/curve448/eddsa.c | 211 +- crypto/openssl/crypto/ec/curve448/f_generic.c | 25 +- crypto/openssl/crypto/ec/curve448/field.h | 87 +- crypto/openssl/crypto/ec/curve448/point_448.h | 101 +- crypto/openssl/crypto/ec/curve448/scalar.c | 82 +- crypto/openssl/crypto/ec/curve448/word.h | 48 +- crypto/openssl/crypto/ec/ec2_oct.c | 30 +- crypto/openssl/crypto/ec/ec2_smpl.c | 122 +- crypto/openssl/crypto/ec/ec_ameth.c | 87 +- crypto/openssl/crypto/ec/ec_asn1.c | 154 +- crypto/openssl/crypto/ec/ec_backend.c | 88 +- crypto/openssl/crypto/ec/ec_check.c | 10 +- crypto/openssl/crypto/ec/ec_curve.c | 1575 +- crypto/openssl/crypto/ec/ec_cvt.c | 4 +- crypto/openssl/crypto/ec/ec_deprecated.c | 8 +- crypto/openssl/crypto/ec/ec_err.c | 212 +- crypto/openssl/crypto/ec/ec_key.c | 56 +- crypto/openssl/crypto/ec/ec_kmeth.c | 147 +- crypto/openssl/crypto/ec/ec_lib.c | 188 +- crypto/openssl/crypto/ec/ec_local.h | 519 +- crypto/openssl/crypto/ec/ec_mult.c | 113 +- crypto/openssl/crypto/ec/ec_oct.c | 34 +- crypto/openssl/crypto/ec/ec_pmeth.c | 29 +- crypto/openssl/crypto/ec/ec_print.c | 8 +- crypto/openssl/crypto/ec/ecdh_kdf.c | 22 +- crypto/openssl/crypto/ec/ecdh_ossl.c | 6 +- crypto/openssl/crypto/ec/ecdsa_ossl.c | 85 +- crypto/openssl/crypto/ec/ecdsa_sign.c | 13 +- crypto/openssl/crypto/ec/ecdsa_vrf.c | 6 +- crypto/openssl/crypto/ec/eck_prn.c | 23 +- crypto/openssl/crypto/ec/ecp_mont.c | 32 +- crypto/openssl/crypto/ec/ecp_nist.c | 28 +- crypto/openssl/crypto/ec/ecp_nistp224.c | 603 +- crypto/openssl/crypto/ec/ecp_nistp256.c | 783 +- crypto/openssl/crypto/ec/ecp_nistp384.c | 929 +- crypto/openssl/crypto/ec/ecp_nistp521.c | 940 +- crypto/openssl/crypto/ec/ecp_nistputil.c | 62 +- crypto/openssl/crypto/ec/ecp_nistz256.c | 376 +- crypto/openssl/crypto/ec/ecp_nistz256_table.c | 24407 +++++++++++-------- crypto/openssl/crypto/ec/ecp_oct.c | 31 +- crypto/openssl/crypto/ec/ecp_ppc.c | 8 +- crypto/openssl/crypto/ec/ecp_s390x_nistp.c | 323 +- crypto/openssl/crypto/ec/ecp_sm2p256.c | 100 +- crypto/openssl/crypto/ec/ecp_sm2p256_table.c | 2 +- crypto/openssl/crypto/ec/ecp_smpl.c | 169 +- crypto/openssl/crypto/ec/ecx_backend.c | 32 +- crypto/openssl/crypto/ec/ecx_backend.h | 18 +- crypto/openssl/crypto/ec/ecx_key.c | 18 +- crypto/openssl/crypto/ec/ecx_meth.c | 235 +- crypto/openssl/crypto/ec/ecx_s390x.c | 28 +- crypto/openssl/crypto/encode_decode/decoder_err.c | 14 +- crypto/openssl/crypto/encode_decode/decoder_lib.c | 388 +- crypto/openssl/crypto/encode_decode/decoder_meth.c | 85 +- crypto/openssl/crypto/encode_decode/decoder_pkey.c | 226 +- crypto/openssl/crypto/encode_decode/encoder_err.c | 14 +- crypto/openssl/crypto/encode_decode/encoder_lib.c | 254 +- .../openssl/crypto/encode_decode/encoder_local.h | 18 +- crypto/openssl/crypto/encode_decode/encoder_meth.c | 95 +- crypto/openssl/crypto/encode_decode/encoder_pkey.c | 95 +- crypto/openssl/crypto/engine/eng_all.c | 4 +- crypto/openssl/crypto/engine/eng_cnf.c | 13 +- crypto/openssl/crypto/engine/eng_ctrl.c | 28 +- crypto/openssl/crypto/engine/eng_dyn.c | 116 +- crypto/openssl/crypto/engine/eng_err.c | 128 +- crypto/openssl/crypto/engine/eng_fat.c | 2 +- crypto/openssl/crypto/engine/eng_lib.c | 4 +- crypto/openssl/crypto/engine/eng_list.c | 17 +- crypto/openssl/crypto/engine/eng_local.h | 48 +- crypto/openssl/crypto/engine/eng_openssl.c | 132 +- crypto/openssl/crypto/engine/eng_pkey.c | 20 +- crypto/openssl/crypto/engine/eng_rdrand.c | 44 +- crypto/openssl/crypto/engine/eng_table.c | 46 +- crypto/openssl/crypto/engine/tb_asnmth.c | 22 +- crypto/openssl/crypto/engine/tb_cipher.c | 10 +- crypto/openssl/crypto/engine/tb_dh.c | 10 +- crypto/openssl/crypto/engine/tb_digest.c | 10 +- crypto/openssl/crypto/engine/tb_dsa.c | 10 +- crypto/openssl/crypto/engine/tb_eckey.c | 10 +- crypto/openssl/crypto/engine/tb_pkmeth.c | 10 +- crypto/openssl/crypto/engine/tb_rand.c | 10 +- crypto/openssl/crypto/engine/tb_rsa.c | 10 +- crypto/openssl/crypto/err/err.c | 238 +- crypto/openssl/crypto/err/err_all.c | 46 +- crypto/openssl/crypto/err/err_all_legacy.c | 112 +- crypto/openssl/crypto/err/err_local.h | 21 +- crypto/openssl/crypto/err/err_mark.c | 7 +- crypto/openssl/crypto/err/err_prn.c | 12 +- crypto/openssl/crypto/err/err_save.c | 48 +- crypto/openssl/crypto/err/openssl.txt | 1 + crypto/openssl/crypto/ess/ess_asn1.c | 28 +- crypto/openssl/crypto/ess/ess_err.c | 38 +- crypto/openssl/crypto/ess/ess_lib.c | 51 +- crypto/openssl/crypto/evp/asymcipher.c | 106 +- crypto/openssl/crypto/evp/bio_b64.c | 42 +- crypto/openssl/crypto/evp/bio_enc.c | 53 +- crypto/openssl/crypto/evp/bio_md.c | 8 +- crypto/openssl/crypto/evp/bio_ok.c | 51 +- crypto/openssl/crypto/evp/c_allc.c | 8 +- crypto/openssl/crypto/evp/cmeth_lib.c | 57 +- crypto/openssl/crypto/evp/ctrl_params_translate.c | 1365 +- crypto/openssl/crypto/evp/dh_ctrl.c | 46 +- crypto/openssl/crypto/evp/dh_support.c | 10 +- crypto/openssl/crypto/evp/digest.c | 211 +- crypto/openssl/crypto/evp/dsa_ctrl.c | 18 +- crypto/openssl/crypto/evp/e_aes.c | 1563 +- crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c | 439 +- crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c | 440 +- crypto/openssl/crypto/evp/e_aria.c | 352 +- crypto/openssl/crypto/evp/e_bf.c | 20 +- crypto/openssl/crypto/evp/e_camellia.c | 220 +- crypto/openssl/crypto/evp/e_cast.c | 22 +- crypto/openssl/crypto/evp/e_chacha20_poly1305.c | 265 +- crypto/openssl/crypto/evp/e_des.c | 128 +- crypto/openssl/crypto/evp/e_des3.c | 183 +- crypto/openssl/crypto/evp/e_idea.c | 28 +- crypto/openssl/crypto/evp/e_null.c | 8 +- crypto/openssl/crypto/evp/e_old.c | 16 +- crypto/openssl/crypto/evp/e_rc2.c | 53 +- crypto/openssl/crypto/evp/e_rc4.c | 22 +- crypto/openssl/crypto/evp/e_rc4_hmac_md5.c | 161 +- crypto/openssl/crypto/evp/e_rc5.c | 26 +- crypto/openssl/crypto/evp/e_seed.c | 8 +- crypto/openssl/crypto/evp/e_sm4.c | 173 +- crypto/openssl/crypto/evp/e_xcbc_d.c | 34 +- crypto/openssl/crypto/evp/ec_ctrl.c | 39 +- crypto/openssl/crypto/evp/ec_support.c | 194 +- crypto/openssl/crypto/evp/encode.c | 348 +- crypto/openssl/crypto/evp/evp_cnf.c | 7 +- crypto/openssl/crypto/evp/evp_enc.c | 366 +- crypto/openssl/crypto/evp/evp_err.c | 408 +- crypto/openssl/crypto/evp/evp_fetch.c | 164 +- crypto/openssl/crypto/evp/evp_key.c | 22 +- crypto/openssl/crypto/evp/evp_lib.c | 187 +- crypto/openssl/crypto/evp/evp_local.h | 183 +- crypto/openssl/crypto/evp/evp_pbe.c | 133 +- crypto/openssl/crypto/evp/evp_pkey.c | 46 +- crypto/openssl/crypto/evp/evp_rand.c | 143 +- crypto/openssl/crypto/evp/evp_utils.c | 70 +- crypto/openssl/crypto/evp/exchange.c | 107 +- crypto/openssl/crypto/evp/kdf_lib.c | 10 +- crypto/openssl/crypto/evp/kdf_meth.c | 27 +- crypto/openssl/crypto/evp/kem.c | 79 +- crypto/openssl/crypto/evp/keymgmt_lib.c | 72 +- crypto/openssl/crypto/evp/keymgmt_meth.c | 108 +- crypto/openssl/crypto/evp/legacy_blake2.c | 6 +- crypto/openssl/crypto/evp/legacy_md5_sha1.c | 6 +- crypto/openssl/crypto/evp/legacy_mdc2.c | 2 +- crypto/openssl/crypto/evp/legacy_meth.h | 55 +- crypto/openssl/crypto/evp/legacy_ripemd.c | 2 +- crypto/openssl/crypto/evp/legacy_sha.c | 130 +- crypto/openssl/crypto/evp/legacy_wp.c | 2 +- crypto/openssl/crypto/evp/m_sigver.c | 164 +- crypto/openssl/crypto/evp/mac_lib.c | 37 +- crypto/openssl/crypto/evp/mac_meth.c | 39 +- crypto/openssl/crypto/evp/names.c | 50 +- crypto/openssl/crypto/evp/p5_crpt.c | 24 +- crypto/openssl/crypto/evp/p5_crpt2.c | 69 +- crypto/openssl/crypto/evp/p_dec.c | 7 +- crypto/openssl/crypto/evp/p_enc.c | 7 +- crypto/openssl/crypto/evp/p_lib.c | 589 +- crypto/openssl/crypto/evp/p_open.c | 6 +- crypto/openssl/crypto/evp/p_seal.c | 6 +- crypto/openssl/crypto/evp/p_sign.c | 8 +- crypto/openssl/crypto/evp/p_verify.c | 8 +- crypto/openssl/crypto/evp/pbe_scrypt.c | 32 +- crypto/openssl/crypto/evp/pmeth_check.c | 25 +- crypto/openssl/crypto/evp/pmeth_gn.c | 57 +- crypto/openssl/crypto/evp/pmeth_lib.c | 692 +- crypto/openssl/crypto/evp/s_lib.c | 39 +- crypto/openssl/crypto/evp/signature.c | 286 +- crypto/openssl/crypto/evp/skeymgmt_meth.c | 44 +- crypto/openssl/crypto/ex_data.c | 47 +- crypto/openssl/crypto/ffc/ffc_backend.c | 16 +- crypto/openssl/crypto/ffc/ffc_dh.c | 64 +- crypto/openssl/crypto/ffc/ffc_key_generate.c | 2 +- crypto/openssl/crypto/ffc/ffc_key_validate.c | 10 +- crypto/openssl/crypto/ffc/ffc_params.c | 62 +- crypto/openssl/crypto/ffc/ffc_params_generate.c | 174 +- crypto/openssl/crypto/ffc/ffc_params_validate.c | 46 +- crypto/openssl/crypto/getenv.c | 18 +- crypto/openssl/crypto/hashtable/hashtable.c | 75 +- crypto/openssl/crypto/hmac/hmac.c | 32 +- crypto/openssl/crypto/hmac/hmac_local.h | 20 +- crypto/openssl/crypto/hmac/hmac_s390x.c | 33 +- crypto/openssl/crypto/hpke/hpke.c | 241 +- crypto/openssl/crypto/hpke/hpke_util.c | 185 +- crypto/openssl/crypto/http/http_client.c | 357 +- crypto/openssl/crypto/http/http_err.c | 118 +- crypto/openssl/crypto/http/http_lib.c | 38 +- crypto/openssl/crypto/idea/i_cbc.c | 4 +- crypto/openssl/crypto/idea/i_cfb64.c | 4 +- crypto/openssl/crypto/idea/i_ecb.c | 2 +- crypto/openssl/crypto/idea/i_ofb64.c | 4 +- crypto/openssl/crypto/idea/idea_local.h | 179 +- crypto/openssl/crypto/indicator_core.c | 7 +- crypto/openssl/crypto/info.c | 251 +- crypto/openssl/crypto/init.c | 159 +- crypto/openssl/crypto/initthread.c | 32 +- crypto/openssl/crypto/lhash/lh_stats.c | 22 +- crypto/openssl/crypto/lhash/lhash.c | 47 +- crypto/openssl/crypto/lhash/lhash_local.h | 4 +- crypto/openssl/crypto/loongarch_arch.h | 10 +- crypto/openssl/crypto/loongarchcap.c | 2 +- crypto/openssl/crypto/md2/md2_dgst.c | 296 +- crypto/openssl/crypto/md4/md4_dgst.c | 16 +- crypto/openssl/crypto/md4/md4_local.h | 63 +- crypto/openssl/crypto/md4/md4_one.c | 2 +- crypto/openssl/crypto/md5/md5_dgst.c | 16 +- crypto/openssl/crypto/md5/md5_local.h | 98 +- crypto/openssl/crypto/md5/md5_one.c | 2 +- crypto/openssl/crypto/mdc2/mdc2dgst.c | 16 +- crypto/openssl/crypto/mem.c | 99 +- crypto/openssl/crypto/mem_sec.c | 141 +- crypto/openssl/crypto/mips_arch.h | 48 +- crypto/openssl/crypto/ml_dsa/ml_dsa_encoders.c | 76 +- crypto/openssl/crypto/ml_dsa/ml_dsa_hash.h | 12 +- crypto/openssl/crypto/ml_dsa/ml_dsa_key.c | 52 +- crypto/openssl/crypto/ml_dsa/ml_dsa_key.h | 6 +- crypto/openssl/crypto/ml_dsa/ml_dsa_key_compress.c | 12 +- crypto/openssl/crypto/ml_dsa/ml_dsa_local.h | 86 +- crypto/openssl/crypto/ml_dsa/ml_dsa_matrix.c | 2 +- crypto/openssl/crypto/ml_dsa/ml_dsa_matrix.h | 2 +- crypto/openssl/crypto/ml_dsa/ml_dsa_ntt.c | 49 +- crypto/openssl/crypto/ml_dsa/ml_dsa_params.c | 89 +- crypto/openssl/crypto/ml_dsa/ml_dsa_poly.h | 14 +- crypto/openssl/crypto/ml_dsa/ml_dsa_sample.c | 34 +- crypto/openssl/crypto/ml_dsa/ml_dsa_sign.c | 72 +- crypto/openssl/crypto/ml_dsa/ml_dsa_vector.h | 24 +- crypto/openssl/crypto/ml_kem/ml_kem.c | 807 +- crypto/openssl/crypto/modes/asm/aes-gcm-avx512.pl | 4 +- crypto/openssl/crypto/modes/asm/aes-gcm-ppc.pl | 2061 +- .../openssl/crypto/modes/asm/aesni-gcm-x86_64.pl | 10 +- crypto/openssl/crypto/modes/cbc128.c | 38 +- crypto/openssl/crypto/modes/ccm128.c | 108 +- crypto/openssl/crypto/modes/cfb128.c | 64 +- crypto/openssl/crypto/modes/ctr128.c | 38 +- crypto/openssl/crypto/modes/cts128.c | 86 +- crypto/openssl/crypto/modes/gcm128.c | 500 +- crypto/openssl/crypto/modes/ocb128.c | 67 +- crypto/openssl/crypto/modes/ofb128.c | 20 +- crypto/openssl/crypto/modes/siv128.c | 56 +- crypto/openssl/crypto/modes/wrap128.c | 49 +- crypto/openssl/crypto/modes/xts128.c | 22 +- crypto/openssl/crypto/modes/xts128gb.c | 22 +- crypto/openssl/crypto/o_dir.c | 2 + crypto/openssl/crypto/o_fopen.c | 50 +- crypto/openssl/crypto/o_str.c | 79 +- crypto/openssl/crypto/o_time.c | 20 +- crypto/openssl/crypto/objects/o_names.c | 44 +- crypto/openssl/crypto/objects/obj_compat.h | 62 +- crypto/openssl/crypto/objects/obj_dat.c | 49 +- crypto/openssl/crypto/objects/obj_err.c | 10 +- crypto/openssl/crypto/objects/obj_lib.c | 6 +- crypto/openssl/crypto/objects/obj_xref.c | 6 +- crypto/openssl/crypto/ocsp/ocsp_asn.c | 90 +- crypto/openssl/crypto/ocsp/ocsp_cl.c | 42 +- crypto/openssl/crypto/ocsp/ocsp_err.c | 90 +- crypto/openssl/crypto/ocsp/ocsp_ext.c | 77 +- crypto/openssl/crypto/ocsp/ocsp_http.c | 16 +- crypto/openssl/crypto/ocsp/ocsp_lib.c | 12 +- crypto/openssl/crypto/ocsp/ocsp_local.h | 94 +- crypto/openssl/crypto/ocsp/ocsp_prn.c | 65 +- crypto/openssl/crypto/ocsp/ocsp_srv.c | 61 +- crypto/openssl/crypto/ocsp/ocsp_vfy.c | 50 +- crypto/openssl/crypto/ocsp/v3_ocsp.c | 60 +- crypto/openssl/crypto/packet.c | 49 +- crypto/openssl/crypto/param_build.c | 70 +- crypto/openssl/crypto/param_build_set.c | 20 +- crypto/openssl/crypto/params.c | 162 +- crypto/openssl/crypto/params_dup.c | 26 +- crypto/openssl/crypto/params_from_text.c | 28 +- crypto/openssl/crypto/params_idx.c.in | 4 + crypto/openssl/crypto/passphrase.c | 73 +- crypto/openssl/crypto/pem/pem_all.c | 35 +- crypto/openssl/crypto/pem/pem_err.c | 94 +- crypto/openssl/crypto/pem/pem_info.c | 61 +- crypto/openssl/crypto/pem/pem_lib.c | 130 +- crypto/openssl/crypto/pem/pem_local.h | 145 +- crypto/openssl/crypto/pem/pem_oth.c | 2 +- crypto/openssl/crypto/pem/pem_pk8.c | 74 +- crypto/openssl/crypto/pem/pem_pkey.c | 113 +- crypto/openssl/crypto/pem/pem_sign.c | 6 +- crypto/openssl/crypto/pem/pvkfmt.c | 123 +- crypto/openssl/crypto/pkcs12/p12_add.c | 53 +- crypto/openssl/crypto/pkcs12/p12_asn.c | 46 +- crypto/openssl/crypto/pkcs12/p12_attr.c | 35 +- crypto/openssl/crypto/pkcs12/p12_crpt.c | 25 +- crypto/openssl/crypto/pkcs12/p12_crt.c | 107 +- crypto/openssl/crypto/pkcs12/p12_decr.c | 83 +- crypto/openssl/crypto/pkcs12/p12_init.c | 2 +- crypto/openssl/crypto/pkcs12/p12_key.c | 58 +- crypto/openssl/crypto/pkcs12/p12_kiss.c | 48 +- crypto/openssl/crypto/pkcs12/p12_local.h | 6 +- crypto/openssl/crypto/pkcs12/p12_mutl.c | 111 +- crypto/openssl/crypto/pkcs12/p12_npas.c | 37 +- crypto/openssl/crypto/pkcs12/p12_p8d.c | 11 +- crypto/openssl/crypto/pkcs12/p12_p8e.c | 31 +- crypto/openssl/crypto/pkcs12/p12_sbag.c | 101 +- crypto/openssl/crypto/pkcs12/p12_utl.c | 79 +- crypto/openssl/crypto/pkcs12/pk12err.c | 66 +- crypto/openssl/crypto/pkcs7/pk7_asn1.c | 125 +- crypto/openssl/crypto/pkcs7/pk7_attr.c | 16 +- crypto/openssl/crypto/pkcs7/pk7_doit.c | 104 +- crypto/openssl/crypto/pkcs7/pk7_lib.c | 53 +- crypto/openssl/crypto/pkcs7/pk7_mime.c | 12 +- crypto/openssl/crypto/pkcs7/pk7_smime.c | 52 +- crypto/openssl/crypto/pkcs7/pkcs7err.c | 138 +- crypto/openssl/crypto/poly1305/poly1305.c | 102 +- crypto/openssl/crypto/poly1305/poly1305_base2_44.c | 29 +- crypto/openssl/crypto/poly1305/poly1305_ieee754.c | 279 +- crypto/openssl/crypto/poly1305/poly1305_ppc.c | 24 +- crypto/openssl/crypto/ppccap.c | 103 +- crypto/openssl/crypto/property/defn_cache.c | 15 +- crypto/openssl/crypto/property/property.c | 111 +- crypto/openssl/crypto/property/property_err.c | 36 +- crypto/openssl/crypto/property/property_local.h | 18 +- crypto/openssl/crypto/property/property_parse.c | 135 +- crypto/openssl/crypto/property/property_query.c | 22 +- crypto/openssl/crypto/property/property_string.c | 30 +- crypto/openssl/crypto/provider.c | 26 +- crypto/openssl/crypto/provider_child.c | 41 +- crypto/openssl/crypto/provider_conf.c | 86 +- crypto/openssl/crypto/provider_core.c | 454 +- crypto/openssl/crypto/provider_local.h | 8 +- crypto/openssl/crypto/provider_predefined.c | 4 +- crypto/openssl/crypto/punycode.c | 13 +- crypto/openssl/crypto/quic_vlint.c | 26 +- crypto/openssl/crypto/rand/prov_seed.c | 36 +- crypto/openssl/crypto/rand/rand_deprecated.c | 8 +- crypto/openssl/crypto/rand/rand_egd.c | 72 +- crypto/openssl/crypto/rand/rand_err.c | 164 +- crypto/openssl/crypto/rand/rand_lib.c | 228 +- crypto/openssl/crypto/rand/rand_local.h | 30 +- crypto/openssl/crypto/rand/rand_meth.c | 2 +- crypto/openssl/crypto/rand/rand_pool.c | 25 +- crypto/openssl/crypto/rand/rand_uniform.c | 10 +- crypto/openssl/crypto/rand/randfile.c | 87 +- crypto/openssl/crypto/rc2/rc2_cbc.c | 30 +- crypto/openssl/crypto/rc2/rc2_ecb.c | 2 +- crypto/openssl/crypto/rc2/rc2_local.h | 117 +- crypto/openssl/crypto/rc2/rc2_skey.c | 284 +- crypto/openssl/crypto/rc2/rc2cfb64.c | 4 +- crypto/openssl/crypto/rc2/rc2ofb64.c | 4 +- crypto/openssl/crypto/rc4/rc4_enc.c | 19 +- crypto/openssl/crypto/rc4/rc4_local.h | 6 +- crypto/openssl/crypto/rc4/rc4_skey.c | 15 +- crypto/openssl/crypto/rc5/rc5_ecb.c | 2 +- crypto/openssl/crypto/rc5/rc5_enc.c | 4 +- crypto/openssl/crypto/rc5/rc5_local.h | 206 +- crypto/openssl/crypto/rc5/rc5_skey.c | 5 +- crypto/openssl/crypto/rc5/rc5cfb64.c | 4 +- crypto/openssl/crypto/rc5/rc5ofb64.c | 4 +- crypto/openssl/crypto/rcu_internal.h | 4 +- crypto/openssl/crypto/ripemd/rmd_dgst.c | 19 +- crypto/openssl/crypto/ripemd/rmd_local.h | 112 +- crypto/openssl/crypto/ripemd/rmdconst.h | 360 +- crypto/openssl/crypto/riscvcap.c | 28 +- crypto/openssl/crypto/rsa/rsa_acvp_test_params.c | 29 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 272 +- crypto/openssl/crypto/rsa/rsa_asn1.c | 51 +- crypto/openssl/crypto/rsa/rsa_backend.c | 134 +- crypto/openssl/crypto/rsa/rsa_chk.c | 12 +- crypto/openssl/crypto/rsa/rsa_crpt.c | 18 +- crypto/openssl/crypto/rsa/rsa_depr.c | 4 +- crypto/openssl/crypto/rsa/rsa_err.c | 274 +- crypto/openssl/crypto/rsa/rsa_gen.c | 64 +- crypto/openssl/crypto/rsa/rsa_lib.c | 157 +- crypto/openssl/crypto/rsa/rsa_local.h | 78 +- crypto/openssl/crypto/rsa/rsa_meth.c | 132 +- crypto/openssl/crypto/rsa/rsa_mp.c | 4 +- crypto/openssl/crypto/rsa/rsa_none.c | 4 +- crypto/openssl/crypto/rsa/rsa_oaep.c | 52 +- crypto/openssl/crypto/rsa/rsa_ossl.c | 160 +- crypto/openssl/crypto/rsa/rsa_pk1.c | 97 +- crypto/openssl/crypto/rsa/rsa_pmeth.c | 105 +- crypto/openssl/crypto/rsa/rsa_pss.c | 78 +- crypto/openssl/crypto/rsa/rsa_saos.c | 17 +- crypto/openssl/crypto/rsa/rsa_schemes.c | 20 +- crypto/openssl/crypto/rsa/rsa_sign.c | 267 +- crypto/openssl/crypto/rsa/rsa_sp800_56b_check.c | 121 +- crypto/openssl/crypto/rsa/rsa_sp800_56b_gen.c | 22 +- crypto/openssl/crypto/rsa/rsa_x931.c | 5 +- crypto/openssl/crypto/rsa/rsa_x931g.c | 31 +- crypto/openssl/crypto/s390x_arch.h | 228 +- crypto/openssl/crypto/s390xcap.c | 720 +- crypto/openssl/crypto/s390xcpuid.pl | 8 +- crypto/openssl/crypto/seed/seed.c | 752 +- crypto/openssl/crypto/seed/seed_cbc.c | 8 +- crypto/openssl/crypto/seed/seed_cfb.c | 8 +- crypto/openssl/crypto/seed/seed_ecb.c | 2 +- crypto/openssl/crypto/seed/seed_local.h | 123 +- crypto/openssl/crypto/seed/seed_ofb.c | 6 +- crypto/openssl/crypto/self_test_core.c | 24 +- crypto/openssl/crypto/sha/keccak1600.c | 267 +- crypto/openssl/crypto/sha/sha256.c | 197 +- crypto/openssl/crypto/sha/sha3.c | 4 +- crypto/openssl/crypto/sha/sha512.c | 319 +- crypto/openssl/crypto/sha/sha_local.h | 251 +- crypto/openssl/crypto/sha/sha_ppc.c | 6 +- crypto/openssl/crypto/sha/sha_riscv.c | 5 +- crypto/openssl/crypto/siphash/siphash.c | 61 +- crypto/openssl/crypto/sleep.c | 26 +- crypto/openssl/crypto/slh_dsa/slh_adrs.c | 42 +- crypto/openssl/crypto/slh_dsa/slh_adrs.h | 38 +- crypto/openssl/crypto/slh_dsa/slh_dsa.c | 74 +- crypto/openssl/crypto/slh_dsa/slh_dsa_hash_ctx.c | 8 +- crypto/openssl/crypto/slh_dsa/slh_dsa_key.c | 45 +- crypto/openssl/crypto/slh_dsa/slh_dsa_key.h | 2 +- crypto/openssl/crypto/slh_dsa/slh_dsa_local.h | 60 +- crypto/openssl/crypto/slh_dsa/slh_fors.c | 44 +- crypto/openssl/crypto/slh_dsa/slh_hash.c | 126 +- crypto/openssl/crypto/slh_dsa/slh_hash.h | 62 +- crypto/openssl/crypto/slh_dsa/slh_hypertree.c | 18 +- crypto/openssl/crypto/slh_dsa/slh_params.c | 49 +- crypto/openssl/crypto/slh_dsa/slh_params.h | 12 +- crypto/openssl/crypto/slh_dsa/slh_wots.c | 38 +- crypto/openssl/crypto/slh_dsa/slh_xmss.c | 30 +- crypto/openssl/crypto/sm2/sm2_crypt.c | 74 +- crypto/openssl/crypto/sm2/sm2_err.c | 42 +- crypto/openssl/crypto/sm2/sm2_key.c | 8 +- crypto/openssl/crypto/sm2/sm2_sign.c | 136 +- crypto/openssl/crypto/sm3/legacy_sm3.c | 3 +- crypto/openssl/crypto/sm3/sm3.c | 6 +- crypto/openssl/crypto/sm3/sm3_local.h | 141 +- crypto/openssl/crypto/sm4/asm/vpsm4_ex-armv8.pl | 14 +- crypto/openssl/crypto/sm4/sm4.c | 50 +- crypto/openssl/crypto/sparcv9cap.c | 85 +- crypto/openssl/crypto/sparse_array.c | 28 +- crypto/openssl/crypto/srp/srp_lib.c | 71 +- crypto/openssl/crypto/srp/srp_vfy.c | 115 +- crypto/openssl/crypto/ssl_err.c | 1212 +- crypto/openssl/crypto/sslerr.h | 16 +- crypto/openssl/crypto/stack/stack.c | 25 +- crypto/openssl/crypto/store/store_err.c | 92 +- crypto/openssl/crypto/store/store_lib.c | 208 +- crypto/openssl/crypto/store/store_local.h | 20 +- crypto/openssl/crypto/store/store_meth.c | 67 +- crypto/openssl/crypto/store/store_register.c | 52 +- crypto/openssl/crypto/store/store_result.c | 118 +- crypto/openssl/crypto/store/store_strings.c | 12 +- crypto/openssl/crypto/thread/arch.c | 2 +- crypto/openssl/crypto/thread/arch/thread_none.c | 2 +- crypto/openssl/crypto/thread/arch/thread_posix.c | 14 +- crypto/openssl/crypto/thread/arch/thread_win.c | 48 +- crypto/openssl/crypto/thread/internal.c | 8 +- crypto/openssl/crypto/threads_lib.c | 4 +- crypto/openssl/crypto/threads_none.c | 43 +- crypto/openssl/crypto/threads_pthread.c | 266 +- crypto/openssl/crypto/threads_win.c | 144 +- crypto/openssl/crypto/time.c | 12 +- crypto/openssl/crypto/trace.c | 142 +- crypto/openssl/crypto/ts/ts_asn1.c | 74 +- crypto/openssl/crypto/ts/ts_conf.c | 108 +- crypto/openssl/crypto/ts/ts_err.c | 122 +- crypto/openssl/crypto/ts/ts_lib.c | 4 +- crypto/openssl/crypto/ts/ts_local.h | 18 +- crypto/openssl/crypto/ts/ts_req_print.c | 2 +- crypto/openssl/crypto/ts/ts_rsp_print.c | 41 +- crypto/openssl/crypto/ts/ts_rsp_sign.c | 154 +- crypto/openssl/crypto/ts/ts_rsp_verify.c | 104 +- crypto/openssl/crypto/ts/ts_verify_ctx.c | 8 +- crypto/openssl/crypto/txt_db/txt_db.c | 22 +- crypto/openssl/crypto/ui/ui_err.c | 36 +- crypto/openssl/crypto/ui/ui_lib.c | 224 +- crypto/openssl/crypto/ui/ui_local.h | 56 +- crypto/openssl/crypto/ui/ui_null.c | 10 +- crypto/openssl/crypto/ui/ui_openssl.c | 536 +- crypto/openssl/crypto/ui/ui_util.c | 65 +- crypto/openssl/crypto/uid.c | 34 +- crypto/openssl/crypto/vms_rms.h | 86 +- crypto/openssl/crypto/whrlpool/wp_block.c | 811 +- crypto/openssl/crypto/whrlpool/wp_dgst.c | 20 +- crypto/openssl/crypto/x509/by_dir.c | 76 +- crypto/openssl/crypto/x509/by_file.c | 66 +- crypto/openssl/crypto/x509/by_store.c | 50 +- crypto/openssl/crypto/x509/pcy_cache.c | 24 +- crypto/openssl/crypto/x509/pcy_data.c | 2 +- crypto/openssl/crypto/x509/pcy_lib.c | 19 +- crypto/openssl/crypto/x509/pcy_local.h | 34 +- crypto/openssl/crypto/x509/pcy_map.c | 10 +- crypto/openssl/crypto/x509/pcy_node.c | 26 +- crypto/openssl/crypto/x509/pcy_tree.c | 93 +- crypto/openssl/crypto/x509/standard_exts.h | 5 - crypto/openssl/crypto/x509/t_acert.c | 10 +- crypto/openssl/crypto/x509/t_crl.c | 7 +- crypto/openssl/crypto/x509/t_req.c | 18 +- crypto/openssl/crypto/x509/t_x509.c | 60 +- crypto/openssl/crypto/x509/v3_aaa.c | 23 +- crypto/openssl/crypto/x509/v3_ac_tgt.c | 91 +- crypto/openssl/crypto/x509/v3_addr.c | 296 +- crypto/openssl/crypto/x509/v3_admis.c | 48 +- crypto/openssl/crypto/x509/v3_admis.h | 28 +- crypto/openssl/crypto/x509/v3_akeya.c | 6 +- crypto/openssl/crypto/x509/v3_akid.c | 38 +- crypto/openssl/crypto/x509/v3_asid.c | 213 +- crypto/openssl/crypto/x509/v3_attrdesc.c | 29 +- crypto/openssl/crypto/x509/v3_attrmap.c | 15 +- crypto/openssl/crypto/x509/v3_authattid.c | 11 +- crypto/openssl/crypto/x509/v3_battcons.c | 6 +- crypto/openssl/crypto/x509/v3_bcons.c | 28 +- crypto/openssl/crypto/x509/v3_bitst.c | 54 +- crypto/openssl/crypto/x509/v3_conf.c | 77 +- crypto/openssl/crypto/x509/v3_cpols.c | 81 +- crypto/openssl/crypto/x509/v3_crld.c | 149 +- crypto/openssl/crypto/x509/v3_enum.c | 30 +- crypto/openssl/crypto/x509/v3_extku.c | 23 +- crypto/openssl/crypto/x509/v3_genn.c | 47 +- *** 599526 LINES SKIPPED *** From nobody Sun Feb 22 05:14: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 4fJXGR4kgBz6SysH for ; Sun, 22 Feb 2026 05:14: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 4fJXGR3fbjz3kv0 for ; Sun, 22 Feb 2026 05:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sgLamYZR7jZj1YOXd30IRmmC4AYYNH3MNOQlwaW1DdQ=; b=W3CkfWBCvx21MazpQGireZkRG+qVk+ZtxllspKRl85Na7yl6lhfsNFKzkmPVlGWeNBAtWB LZZCYWRxTiOibG72Xv/5zaDEued/8P65NhQQVXWanWveDSQiW1g6v6brwuWcx+LwCTwbqW P9vCa9RZnrs8HG/cmo5/Yc4+z14K8iCdE2K/OmO+vFtS4auNgRD04e5MwxZh8StqVZlHia v3WM6Kll2Qicg9AyShArhMTkZHlSYL0qWt3SIZrfm5dyL1ExTdAYeWzAb3SrK1PxlnZRzw pRrYd3Yvbw2WDh/wUxcRp9mqwqEMa1EnzUdHSbYQXB1Tr+h3SaSUGtj/pFLxRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771737263; a=rsa-sha256; cv=none; b=lY+gFdLu3mLtNFMlOyWdNMpn99LiPefYDlKL1P6CDTRQTtbSqF6Mk/VmN04v2ey7QIqQ3Y TpfX7UN69fVQ0Gwg23OyzkxR2cGOxaTkYkgJ0UpfcTs5I/nN97FczZ0j/0XItCp+tEwz1Y y6S6yHIbUWUTe6VCYdrrjRgBny4lOBm09vFi+kJglk3X0CNLwfX0fwdeJYKLJv9poBmly9 HOzIMjPLJu2ZXKO5Mndx7rwOXx1BMP6YlFjslMB6qOdWFKuUz62FG8HvB54CIHqgF2IGSH s7IR+/+47h+C3S2/H3fUAcNpguTjaP8tv8wjoULkJ2z4d+6Kve6CX66U6fgCFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sgLamYZR7jZj1YOXd30IRmmC4AYYNH3MNOQlwaW1DdQ=; b=NTBmkJz7JJKkivQ0Q6FaP2NEkFubBihmBL8UXlW2B7eoyVZs2L/e2pUO0hZkG3BRSLIrtB GXMNnpJQuult/5YHgFoSJcL5ced10XMS2Aqozk/Sn/Ncgo0zhwEl74EYuIAVnIgkkKql/7 JVqQXZ5Qw1ax9mUSBV/xFhCCta1Lo2Gvk1IQv0iEs0lWCnVxUYzykzCYfAJAQmQeTffPQ+ qlRCWC5pSeMCCXIVs5bwR0Wx4gT5S09h7IbofTXo8alJsnvaNWaQWFZh4YFTjWmM8zNLJO WkrGU5ApjlCawRYENHAQGy4Du4d8VD+Cc/ouWsha56OfJbsZp9FDFQa4HXIMpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJXGR3796zVfY for ; Sun, 22 Feb 2026 05:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33539 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 05:14:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 66aff324fa55 - stable/15 - OpenSSL: commit sys/crypto changes for 3.5.5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 66aff324fa552f6f6f71d6b154718689a701186e Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 05:14:23 +0000 Message-Id: <699a90af.33539.43d6d97e@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=66aff324fa552f6f6f71d6b154718689a701186e commit 66aff324fa552f6f6f71d6b154718689a701186e Author: Enji Cooper AuthorDate: 2026-02-01 17:05:55 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:34:23 +0000 OpenSSL: commit sys/crypto changes for 3.5.5 These files were changed as part of the 3.5.4 -> 3.5.5 upgrade. Please see the upstream release notes linked in 1731fc70f7344af08db49b06c63c963fa12ee354, et al, for more details. MFC after: 6 days MFC with: 1731fc70f7344af08db49b06c63c963fa12ee354 Fixes: 1731fc70f7344af08d ("OpenSSL: update vendor sources to match 3.5.5 content") (cherry picked from commit e6c8997a8958c7aaec8e266d2eeefbfaa137e218) --- sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S | 14 +- sys/crypto/openssl/arm_arch.h | 369 +++-- sys/crypto/openssl/powerpc/aes-gcm-ppc.S | 2118 +++++++++++-------------- sys/crypto/openssl/powerpc64/aes-gcm-ppc.S | 2119 +++++++++++--------------- sys/crypto/openssl/powerpc64le/aes-gcm-ppc.S | 2119 +++++++++++--------------- 5 files changed, 2850 insertions(+), 3889 deletions(-) diff --git a/sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S b/sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S index 5627d6d1c6b4..b8c728e68683 100644 --- a/sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S +++ b/sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S @@ -1,5 +1,5 @@ /* Do not modify. This file is auto-generated from vpsm4_ex-armv8.pl. */ -// Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved. +// Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved. // // Licensed under the Apache License 2.0 (the "License"). You may not use // this file except in compliance with the License. You can obtain a copy @@ -35,13 +35,25 @@ _vpsm4_ex_consts: .Lshuffles: .quad 0x0B0A090807060504,0x030201000F0E0D0C .Lxts_magic: +#ifndef __AARCH64EB__ .quad 0x0101010101010187,0x0101010101010101 +#else +.quad 0x0101010101010101,0x0101010101010187 +#endif .Lsbox_magic: +#ifndef __AARCH64EB__ .quad 0x0b0e0104070a0d00,0x0306090c0f020508 .quad 0x62185a2042387a00,0x22581a6002783a40 .quad 0x15df62a89e54e923,0xc10bb67c4a803df7 .quad 0xb9aa6b78c1d21300,0x1407c6d56c7fbead .quad 0x6404462679195b3b,0xe383c1a1fe9edcbc +#else +.quad 0x0306090c0f020508,0x0b0e0104070a0d00 +.quad 0x22581a6002783a40,0x62185a2042387a00 +.quad 0xc10bb67c4a803df7,0x15df62a89e54e923 +.quad 0x1407c6d56c7fbead,0xb9aa6b78c1d21300 +.quad 0xe383c1a1fe9edcbc,0x6404462679195b3b +#endif .quad 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f .size _vpsm4_ex_consts,.-_vpsm4_ex_consts diff --git a/sys/crypto/openssl/arm_arch.h b/sys/crypto/openssl/arm_arch.h index acd8aee4d519..d570d1eba6c1 100644 --- a/sys/crypto/openssl/arm_arch.h +++ b/sys/crypto/openssl/arm_arch.h @@ -8,87 +8,80 @@ */ #ifndef OSSL_CRYPTO_ARM_ARCH_H -# define OSSL_CRYPTO_ARM_ARCH_H - -# if !defined(__ARM_ARCH__) -# if defined(__CC_ARM) -# define __ARM_ARCH__ __TARGET_ARCH_ARM -# if defined(__BIG_ENDIAN) -# define __ARMEB__ -# else -# define __ARMEL__ -# endif -# elif defined(__GNUC__) -# if defined(__aarch64__) -# define __ARM_ARCH__ 8 - /* - * Why doesn't gcc define __ARM_ARCH__? Instead it defines - * bunch of below macros. See all_architectures[] table in - * gcc/config/arm/arm.c. On a side note it defines - * __ARMEL__/__ARMEB__ for little-/big-endian. - */ -# elif defined(__ARM_ARCH) -# define __ARM_ARCH__ __ARM_ARCH -# elif defined(__ARM_ARCH_8A__) -# define __ARM_ARCH__ 8 -# elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__) || \ - defined(__ARM_ARCH_7EM__) -# define __ARM_ARCH__ 7 -# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ - defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ - defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__) || \ - defined(__ARM_ARCH_6T2__) -# define __ARM_ARCH__ 6 -# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ - defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__) || \ - defined(__ARM_ARCH_5TEJ__) -# define __ARM_ARCH__ 5 -# elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) -# define __ARM_ARCH__ 4 -# else -# error "unsupported ARM architecture" -# endif -# elif defined(__ARM_ARCH) -# define __ARM_ARCH__ __ARM_ARCH -# endif -# endif - -# if !defined(__ARM_MAX_ARCH__) -# define __ARM_MAX_ARCH__ __ARM_ARCH__ -# endif - -# if __ARM_MAX_ARCH__<__ARM_ARCH__ -# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__" -# elif __ARM_MAX_ARCH__!=__ARM_ARCH__ -# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__) -# error "can't build universal big-endian binary" -# endif -# endif - -# ifndef __ASSEMBLER__ +#define OSSL_CRYPTO_ARM_ARCH_H + +#if !defined(__ARM_ARCH__) +#if defined(__CC_ARM) +#define __ARM_ARCH__ __TARGET_ARCH_ARM +#if defined(__BIG_ENDIAN) +#define __ARMEB__ +#else +#define __ARMEL__ +#endif +#elif defined(__GNUC__) +#if defined(__aarch64__) +#define __ARM_ARCH__ 8 +/* + * Why doesn't gcc define __ARM_ARCH__? Instead it defines + * bunch of below macros. See all_architectures[] table in + * gcc/config/arm/arm.c. On a side note it defines + * __ARMEL__/__ARMEB__ for little-/big-endian. + */ +#elif defined(__ARM_ARCH) +#define __ARM_ARCH__ __ARM_ARCH +#elif defined(__ARM_ARCH_8A__) +#define __ARM_ARCH__ 8 +#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) +#define __ARM_ARCH__ 7 +#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) +#define __ARM_ARCH__ 6 +#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) +#define __ARM_ARCH__ 5 +#elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) +#define __ARM_ARCH__ 4 +#else +#error "unsupported ARM architecture" +#endif +#elif defined(__ARM_ARCH) +#define __ARM_ARCH__ __ARM_ARCH +#endif +#endif + +#if !defined(__ARM_MAX_ARCH__) +#define __ARM_MAX_ARCH__ __ARM_ARCH__ +#endif + +#if __ARM_MAX_ARCH__ < __ARM_ARCH__ +#error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__" +#elif __ARM_MAX_ARCH__ != __ARM_ARCH__ +#if __ARM_ARCH__ < 7 && __ARM_MAX_ARCH__ >= 7 && defined(__ARMEB__) +#error "can't build universal big-endian binary" +#endif +#endif + +#ifndef __ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; extern unsigned int OPENSSL_arm_midr; extern unsigned int OPENSSL_armv8_rsa_neonized; -# endif - -# define ARMV7_NEON (1<<0) -# define ARMV7_TICK (1<<1) -# define ARMV8_AES (1<<2) -# define ARMV8_SHA1 (1<<3) -# define ARMV8_SHA256 (1<<4) -# define ARMV8_PMULL (1<<5) -# define ARMV8_SHA512 (1<<6) -# define ARMV8_CPUID (1<<7) -# define ARMV8_RNG (1<<8) -# define ARMV8_SM3 (1<<9) -# define ARMV8_SM4 (1<<10) -# define ARMV8_SHA3 (1<<11) -# define ARMV8_UNROLL8_EOR3 (1<<12) -# define ARMV8_SVE (1<<13) -# define ARMV8_SVE2 (1<<14) -# define ARMV8_HAVE_SHA3_AND_WORTH_USING (1<<15) -# define ARMV8_UNROLL12_EOR3 (1<<16) +#endif + +#define ARMV7_NEON (1 << 0) +#define ARMV7_TICK (1 << 1) +#define ARMV8_AES (1 << 2) +#define ARMV8_SHA1 (1 << 3) +#define ARMV8_SHA256 (1 << 4) +#define ARMV8_PMULL (1 << 5) +#define ARMV8_SHA512 (1 << 6) +#define ARMV8_CPUID (1 << 7) +#define ARMV8_RNG (1 << 8) +#define ARMV8_SM3 (1 << 9) +#define ARMV8_SM4 (1 << 10) +#define ARMV8_SHA3 (1 << 11) +#define ARMV8_UNROLL8_EOR3 (1 << 12) +#define ARMV8_SVE (1 << 13) +#define ARMV8_SVE2 (1 << 14) +#define ARMV8_HAVE_SHA3_AND_WORTH_USING (1 << 15) +#define ARMV8_UNROLL12_EOR3 (1 << 16) /* * MIDR_EL1 system register @@ -100,120 +93,116 @@ extern unsigned int OPENSSL_armv8_rsa_neonized; * */ -# define ARM_CPU_IMP_ARM 0x41 -# define HISI_CPU_IMP 0x48 -# define ARM_CPU_IMP_APPLE 0x61 -# define ARM_CPU_IMP_MICROSOFT 0x6D -# define ARM_CPU_IMP_AMPERE 0xC0 - -# define ARM_CPU_PART_CORTEX_A72 0xD08 -# define ARM_CPU_PART_N1 0xD0C -# define ARM_CPU_PART_V1 0xD40 -# define ARM_CPU_PART_N2 0xD49 -# define HISI_CPU_PART_KP920 0xD01 -# define ARM_CPU_PART_V2 0xD4F - -# define APPLE_CPU_PART_M1_ICESTORM 0x022 -# define APPLE_CPU_PART_M1_FIRESTORM 0x023 -# define APPLE_CPU_PART_M1_ICESTORM_PRO 0x024 -# define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025 -# define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028 -# define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029 -# define APPLE_CPU_PART_M2_BLIZZARD 0x032 -# define APPLE_CPU_PART_M2_AVALANCHE 0x033 -# define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034 -# define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035 -# define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038 -# define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039 - -# define MICROSOFT_CPU_PART_COBALT_100 0xD49 - -# define MIDR_PARTNUM_SHIFT 4 -# define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT) -# define MIDR_PARTNUM(midr) \ - (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT) - -# define MIDR_IMPLEMENTER_SHIFT 24 -# define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT) -# define MIDR_IMPLEMENTER(midr) \ - (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT) - -# define MIDR_ARCHITECTURE_SHIFT 16 -# define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT) -# define MIDR_ARCHITECTURE(midr) \ - (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT) - -# define MIDR_CPU_MODEL_MASK \ - (MIDR_IMPLEMENTER_MASK | \ - MIDR_PARTNUM_MASK | \ - MIDR_ARCHITECTURE_MASK) - -# define MIDR_CPU_MODEL(imp, partnum) \ - (((imp) << MIDR_IMPLEMENTER_SHIFT) | \ - (0xfU << MIDR_ARCHITECTURE_SHIFT) | \ - ((partnum) << MIDR_PARTNUM_SHIFT)) - -# define MIDR_IS_CPU_MODEL(midr, imp, partnum) \ - (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum)) +#define ARM_CPU_IMP_ARM 0x41 +#define HISI_CPU_IMP 0x48 +#define ARM_CPU_IMP_APPLE 0x61 +#define ARM_CPU_IMP_MICROSOFT 0x6D +#define ARM_CPU_IMP_AMPERE 0xC0 + +#define ARM_CPU_PART_CORTEX_A72 0xD08 +#define ARM_CPU_PART_N1 0xD0C +#define ARM_CPU_PART_V1 0xD40 +#define ARM_CPU_PART_N2 0xD49 +#define HISI_CPU_PART_KP920 0xD01 +#define ARM_CPU_PART_V2 0xD4F + +#define APPLE_CPU_PART_M1_ICESTORM 0x022 +#define APPLE_CPU_PART_M1_FIRESTORM 0x023 +#define APPLE_CPU_PART_M1_ICESTORM_PRO 0x024 +#define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025 +#define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028 +#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029 +#define APPLE_CPU_PART_M2_BLIZZARD 0x032 +#define APPLE_CPU_PART_M2_AVALANCHE 0x033 +#define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034 +#define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035 +#define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038 +#define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039 + +#define MICROSOFT_CPU_PART_COBALT_100 0xD49 + +#define MIDR_PARTNUM_SHIFT 4 +#define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT) +#define MIDR_PARTNUM(midr) \ + (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT) + +#define MIDR_IMPLEMENTER_SHIFT 24 +#define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT) +#define MIDR_IMPLEMENTER(midr) \ + (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT) + +#define MIDR_ARCHITECTURE_SHIFT 16 +#define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT) +#define MIDR_ARCHITECTURE(midr) \ + (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT) + +#define MIDR_CPU_MODEL_MASK \ + (MIDR_IMPLEMENTER_MASK | MIDR_PARTNUM_MASK | MIDR_ARCHITECTURE_MASK) + +#define MIDR_CPU_MODEL(imp, partnum) \ + (((imp) << MIDR_IMPLEMENTER_SHIFT) | (0xfU << MIDR_ARCHITECTURE_SHIFT) | ((partnum) << MIDR_PARTNUM_SHIFT)) + +#define MIDR_IS_CPU_MODEL(midr, imp, partnum) \ + (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum)) #if defined(__ASSEMBLER__) - /* - * Support macros for - * - Armv8.3-A Pointer Authentication and - * - Armv8.5-A Branch Target Identification - * features which require emitting a .note.gnu.property section with the - * appropriate architecture-dependent feature bits set. - * Read more: "ELF for the Arm® 64-bit Architecture" - */ - -# if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1 -# define GNU_PROPERTY_AARCH64_BTI (1 << 0) /* Has Branch Target Identification */ -# define AARCH64_VALID_CALL_TARGET hint #34 /* BTI 'c' */ -# else -# define GNU_PROPERTY_AARCH64_BTI 0 /* No Branch Target Identification */ -# define AARCH64_VALID_CALL_TARGET -# endif - -# if defined(__ARM_FEATURE_PAC_DEFAULT) && \ - (__ARM_FEATURE_PAC_DEFAULT & 1) == 1 /* Signed with A-key */ -# define GNU_PROPERTY_AARCH64_POINTER_AUTH \ - (1 << 1) /* Has Pointer Authentication */ -# define AARCH64_SIGN_LINK_REGISTER hint #25 /* PACIASP */ -# define AARCH64_VALIDATE_LINK_REGISTER hint #29 /* AUTIASP */ -# elif defined(__ARM_FEATURE_PAC_DEFAULT) && \ - (__ARM_FEATURE_PAC_DEFAULT & 2) == 2 /* Signed with B-key */ -# define GNU_PROPERTY_AARCH64_POINTER_AUTH \ - (1 << 1) /* Has Pointer Authentication */ -# define AARCH64_SIGN_LINK_REGISTER hint #27 /* PACIBSP */ -# define AARCH64_VALIDATE_LINK_REGISTER hint #31 /* AUTIBSP */ -# else -# define GNU_PROPERTY_AARCH64_POINTER_AUTH 0 /* No Pointer Authentication */ -# if GNU_PROPERTY_AARCH64_BTI != 0 -# define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET -# else -# define AARCH64_SIGN_LINK_REGISTER -# endif -# define AARCH64_VALIDATE_LINK_REGISTER -# endif - -# if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0 - .pushsection .note.gnu.property, "a"; - .balign 8; - .long 4; - .long 0x10; - .long 0x5; - .asciz "GNU"; - .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */ - .long 4; - .long (GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI); - .long 0; - .popsection; -# endif - -# endif /* defined __ASSEMBLER__ */ - -# define IS_CPU_SUPPORT_UNROLL8_EOR3() \ - (OPENSSL_armcap_P & ARMV8_UNROLL8_EOR3) +/* + * Support macros for + * - Armv8.3-A Pointer Authentication and + * - Armv8.5-A Branch Target Identification + * features which require emitting a .note.gnu.property section with the + * appropriate architecture-dependent feature bits set. + * Read more: "ELF for the Arm® 64-bit Architecture" + */ + +#if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1 +#define GNU_PROPERTY_AARCH64_BTI (1 << 0) /* Has Branch Target Identification */ +#define AARCH64_VALID_CALL_TARGET hint #34 /* BTI 'c' */ +#else +#define GNU_PROPERTY_AARCH64_BTI 0 /* No Branch Target Identification */ +#define AARCH64_VALID_CALL_TARGET +#endif + +#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 1) == 1 /* Signed with A-key */ +#define GNU_PROPERTY_AARCH64_POINTER_AUTH \ + (1 << 1) /* Has Pointer Authentication */ +#define AARCH64_SIGN_LINK_REGISTER hint #25 /* PACIASP */ +#define AARCH64_VALIDATE_LINK_REGISTER hint #29 /* AUTIASP */ +#elif defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 2) == 2 /* Signed with B-key */ +#define GNU_PROPERTY_AARCH64_POINTER_AUTH \ + (1 << 1) /* Has Pointer Authentication */ +#define AARCH64_SIGN_LINK_REGISTER hint #27 /* PACIBSP */ +#define AARCH64_VALIDATE_LINK_REGISTER hint #31 /* AUTIBSP */ +#else +#define GNU_PROPERTY_AARCH64_POINTER_AUTH 0 /* No Pointer Authentication */ +#if GNU_PROPERTY_AARCH64_BTI != 0 +#define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET +#else +#define AARCH64_SIGN_LINK_REGISTER +#endif +#define AARCH64_VALIDATE_LINK_REGISTER +#endif + +#if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0 +/* clang-format off */ +.pushsection .note.gnu.property, "a"; +/* clang-format on */ +.balign 8; +.long 4; +.long 0x10; +.long 0x5; +.asciz "GNU"; +.long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */ +.long 4; +.long(GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI); +.long 0; +.popsection; +#endif + +#endif /* defined __ASSEMBLER__ */ + +#define IS_CPU_SUPPORT_UNROLL8_EOR3() \ + (OPENSSL_armcap_P & ARMV8_UNROLL8_EOR3) #endif diff --git a/sys/crypto/openssl/powerpc/aes-gcm-ppc.S b/sys/crypto/openssl/powerpc/aes-gcm-ppc.S index 23a8feb24745..51cfac7e45fc 100644 --- a/sys/crypto/openssl/powerpc/aes-gcm-ppc.S +++ b/sys/crypto/openssl/powerpc/aes-gcm-ppc.S @@ -1,531 +1,587 @@ /* Do not modify. This file is auto-generated from aes-gcm-ppc.pl. */ -.machine "any" +.machine "any" .text - - - - -.macro .Loop_aes_middle4x - xxlor 19+32, 1, 1 - xxlor 20+32, 2, 2 - xxlor 21+32, 3, 3 - xxlor 22+32, 4, 4 - - .long 0x11EF9D08 - .long 0x12109D08 - .long 0x12319D08 - .long 0x12529D08 - - .long 0x11EFA508 - .long 0x1210A508 - .long 0x1231A508 - .long 0x1252A508 - - .long 0x11EFAD08 - .long 0x1210AD08 - .long 0x1231AD08 - .long 0x1252AD08 - - .long 0x11EFB508 - .long 0x1210B508 - .long 0x1231B508 - .long 0x1252B508 - - xxlor 19+32, 5, 5 - xxlor 20+32, 6, 6 - xxlor 21+32, 7, 7 - xxlor 22+32, 8, 8 - - .long 0x11EF9D08 - .long 0x12109D08 - .long 0x12319D08 - .long 0x12529D08 - - .long 0x11EFA508 - .long 0x1210A508 - .long 0x1231A508 - .long 0x1252A508 - - .long 0x11EFAD08 - .long 0x1210AD08 - .long 0x1231AD08 - .long 0x1252AD08 - - .long 0x11EFB508 - .long 0x1210B508 - .long 0x1231B508 - .long 0x1252B508 - - xxlor 23+32, 9, 9 - .long 0x11EFBD08 - .long 0x1210BD08 - .long 0x1231BD08 - .long 0x1252BD08 -.endm - - - - - -.macro .Loop_aes_middle8x - xxlor 23+32, 1, 1 - xxlor 24+32, 2, 2 - xxlor 25+32, 3, 3 - xxlor 26+32, 4, 4 - - .long 0x11EFBD08 - .long 0x1210BD08 - .long 0x1231BD08 - .long 0x1252BD08 - .long 0x1273BD08 - .long 0x1294BD08 - .long 0x12B5BD08 - .long 0x12D6BD08 - - .long 0x11EFC508 - .long 0x1210C508 - .long 0x1231C508 - .long 0x1252C508 - .long 0x1273C508 - .long 0x1294C508 - .long 0x12B5C508 - .long 0x12D6C508 - - .long 0x11EFCD08 - .long 0x1210CD08 - .long 0x1231CD08 - .long 0x1252CD08 - .long 0x1273CD08 - .long 0x1294CD08 - .long 0x12B5CD08 - .long 0x12D6CD08 - - .long 0x11EFD508 - .long 0x1210D508 - .long 0x1231D508 - .long 0x1252D508 - .long 0x1273D508 - .long 0x1294D508 - .long 0x12B5D508 - .long 0x12D6D508 - - xxlor 23+32, 5, 5 - xxlor 24+32, 6, 6 - xxlor 25+32, 7, 7 - xxlor 26+32, 8, 8 - - .long 0x11EFBD08 - .long 0x1210BD08 - .long 0x1231BD08 - .long 0x1252BD08 - .long 0x1273BD08 - .long 0x1294BD08 - .long 0x12B5BD08 - .long 0x12D6BD08 - - .long 0x11EFC508 - .long 0x1210C508 - .long 0x1231C508 - .long 0x1252C508 - .long 0x1273C508 - .long 0x1294C508 - .long 0x12B5C508 - .long 0x12D6C508 - - .long 0x11EFCD08 - .long 0x1210CD08 - .long 0x1231CD08 - .long 0x1252CD08 - .long 0x1273CD08 - .long 0x1294CD08 - .long 0x12B5CD08 - .long 0x12D6CD08 - - .long 0x11EFD508 - .long 0x1210D508 - .long 0x1231D508 - .long 0x1252D508 - .long 0x1273D508 - .long 0x1294D508 - .long 0x12B5D508 - .long 0x12D6D508 - - xxlor 23+32, 9, 9 - .long 0x11EFBD08 - .long 0x1210BD08 - .long 0x1231BD08 - .long 0x1252BD08 - .long 0x1273BD08 - .long 0x1294BD08 - .long 0x12B5BD08 - .long 0x12D6BD08 -.endm - - - - -ppc_aes_gcm_ghash: - vxor 15, 15, 0 - - xxlxor 29, 29, 29 - - .long 0x12EC7CC8 - .long 0x130984C8 - .long 0x13268CC8 - .long 0x134394C8 - - vxor 23, 23, 24 - vxor 23, 23, 25 - vxor 23, 23, 26 - - .long 0x130D7CC8 - .long 0x132A84C8 - .long 0x13478CC8 - .long 0x136494C8 - - vxor 24, 24, 25 - vxor 24, 24, 26 - vxor 24, 24, 27 - - - .long 0x139714C8 - - xxlor 29+32, 29, 29 - vsldoi 26, 24, 29, 8 - vsldoi 29, 29, 24, 8 - vxor 23, 23, 26 - - vsldoi 23, 23, 23, 8 - vxor 23, 23, 28 - - .long 0x130E7CC8 - .long 0x132B84C8 - .long 0x13488CC8 - .long 0x136594C8 - - vxor 24, 24, 25 - vxor 24, 24, 26 - vxor 24, 24, 27 - - vxor 24, 24, 29 - - - vsldoi 27, 23, 23, 8 - .long 0x12F714C8 - vxor 27, 27, 24 - vxor 23, 23, 27 - - xxlor 32, 23+32, 23+32 - - blr - - - - - -.macro ppc_aes_gcm_ghash2_4x - - vxor 15, 15, 0 - - xxlxor 29, 29, 29 - - .long 0x12EC7CC8 - .long 0x130984C8 - .long 0x13268CC8 - .long 0x134394C8 +.macro SAVE_REGS + mflr 0 + std 0, 16(1) + stdu 1,-512(1) + + std 14, 112(1) + std 15, 120(1) + std 16, 128(1) + std 17, 136(1) + std 18, 144(1) + std 19, 152(1) + std 20, 160(1) + std 21, 168(1) + std 22, 176(1) + std 23, 184(1) + std 24, 192(1) + + stxv 32+20, 256(1) + stxv 32+21, 256+16(1) + stxv 32+22, 256+32(1) + stxv 32+23, 256+48(1) + stxv 32+24, 256+64(1) + stxv 32+25, 256+80(1) + stxv 32+26, 256+96(1) + stxv 32+27, 256+112(1) + stxv 32+28, 256+128(1) + stxv 32+29, 256+144(1) + stxv 32+30, 256+160(1) + stxv 32+31, 256+176(1) +.endm # SAVE_REGS + +.macro RESTORE_REGS + lxv 32+20, 256(1) + lxv 32+21, 256+16(1) + lxv 32+22, 256+32(1) + lxv 32+23, 256+48(1) + lxv 32+24, 256+64(1) + lxv 32+25, 256+80(1) + lxv 32+26, 256+96(1) + lxv 32+27, 256+112(1) + lxv 32+28, 256+128(1) + lxv 32+29, 256+144(1) + lxv 32+30, 256+160(1) + lxv 32+31, 256+176(1) + + ld 14, 112(1) + ld 15, 120(1) + ld 16, 128(1) + ld 17, 136(1) + ld 18, 144(1) + ld 19, 152(1) + ld 20, 160(1) + ld 21, 168(1) + ld 22, 176(1) + ld 23, 184(1) + ld 24, 192(1) + + addi 1, 1, 512 + ld 0, 16(1) + mtlr 0 +.endm # RESTORE_REGS + +# 4x loops +.macro AES_CIPHER_4x r + vcipher 15, 15, \r + vcipher 16, 16, \r + vcipher 17, 17, \r + vcipher 18, 18, \r +.endm + +# 8x loops +.macro AES_CIPHER_8x r + vcipher 15, 15, \r + vcipher 16, 16, \r + vcipher 17, 17, \r + vcipher 18, 18, \r + vcipher 19, 19, \r + vcipher 20, 20, \r + vcipher 21, 21, \r + vcipher 22, 22, \r +.endm + +.macro LOOP_8AES_STATE + AES_CIPHER_8x 23 + AES_CIPHER_8x 24 + AES_CIPHER_8x 25 + AES_CIPHER_8x 26 + AES_CIPHER_8x 27 + AES_CIPHER_8x 28 + AES_CIPHER_8x 29 + AES_CIPHER_8x 1 +.endm + +# +# PPC_GFMUL128_8x: Compute hash values of 8 blocks based on Karatsuba method. +# +# S1 should xor with the previous digest +# +# Xi = v0 +# H Poly = v2 +# Hash keys = v3 - v14 +# vs10: vpermxor vector +# Scratch: v23 - v29 +# +.macro PPC_GFMUL128_8x + + vpmsumd 23, 12, 15 # H4.L * X.L + vpmsumd 24, 9, 16 + vpmsumd 25, 6, 17 + vpmsumd 26, 3, 18 vxor 23, 23, 24 vxor 23, 23, 25 - vxor 23, 23, 26 - - .long 0x130D7CC8 - .long 0x132A84C8 - .long 0x13478CC8 - .long 0x136494C8 - - vxor 24, 24, 25 - vxor 24, 24, 26 - - - .long 0x139714C8 - - xxlor 29+32, 29, 29 - - vxor 24, 24, 27 - vsldoi 26, 24, 29, 8 - vsldoi 29, 29, 24, 8 - vxor 23, 23, 26 - - vsldoi 23, 23, 23, 8 - vxor 23, 23, 28 + vxor 23, 23, 26 # L - .long 0x130E7CC8 - .long 0x132B84C8 - .long 0x13488CC8 - .long 0x136594C8 + vpmsumd 27, 13, 15 # H4.L * X.H + H4.H * X.L + vpmsumd 28, 10, 16 # H3.L * X1.H + H3.H * X1.L + vpmsumd 25, 7, 17 + vpmsumd 26, 4, 18 + vxor 24, 27, 28 vxor 24, 24, 25 - vxor 24, 24, 26 - vxor 24, 24, 27 - - vxor 24, 24, 29 - - - vsldoi 27, 23, 23, 8 - .long 0x12F714C8 - vxor 27, 27, 24 - vxor 27, 23, 27 - - - .long 0x1309A4C8 - .long 0x1326ACC8 - .long 0x1343B4C8 - vxor 19, 19, 27 - .long 0x12EC9CC8 + vxor 24, 24, 26 # M + + vpmsumd 26, 14, 15 # H4.H * X.H + vpmsumd 27, 11, 16 + vpmsumd 28, 8, 17 + vpmsumd 29, 5, 18 + + vxor 26, 26, 27 + vxor 26, 26, 28 + vxor 26, 26, 29 + + # sum hash and reduction with H Poly + vpmsumd 28, 23, 2 # reduction + + vxor 1, 1, 1 + vsldoi 25, 24, 1, 8 # mL + vsldoi 1, 1, 24, 8 # mH + vxor 23, 23, 25 # mL + L + + # This performs swap and xor like, + # vsldoi 23, 23, 23, 8 # swap + # vxor 23, 23, 28 + xxlor 32+29, 10, 10 + vpermxor 23, 23, 28, 29 + + vxor 24, 26, 1 # H + + # sum hash and reduction with H Poly + # + # vsldoi 25, 23, 23, 8 # swap + # vpmsumd 23, 23, 2 + # vxor 27, 25, 24 + # + vpermxor 27, 23, 24, 29 + vpmsumd 23, 23, 2 + vxor 0, 23, 27 # Digest of 4 blocks + + vxor 19, 19, 0 + + # Compute digest for the next 4 blocks + vpmsumd 24, 9, 20 + vpmsumd 25, 6, 21 + vpmsumd 26, 3, 22 + vpmsumd 23, 12, 19 # H4.L * X.L vxor 23, 23, 24 vxor 23, 23, 25 - vxor 23, 23, 26 + vxor 23, 23, 26 # L - .long 0x130D9CC8 - .long 0x132AA4C8 - .long 0x1347ACC8 - .long 0x1364B4C8 + vpmsumd 27, 13, 19 # H4.L * X.H + H4.H * X.L + vpmsumd 28, 10, 20 # H3.L * X1.H + H3.H * X1.L + vpmsumd 25, 7, 21 + vpmsumd 26, 4, 22 + vxor 24, 27, 28 vxor 24, 24, 25 - vxor 24, 24, 26 - - - .long 0x139714C8 - - xxlor 29+32, 29, 29 - - vxor 24, 24, 27 - vsldoi 26, 24, 29, 8 - vsldoi 29, 29, 24, 8 - vxor 23, 23, 26 - - vsldoi 23, 23, 23, 8 - vxor 23, 23, 28 - - .long 0x130E9CC8 - .long 0x132BA4C8 - .long 0x1348ACC8 - .long 0x1365B4C8 - - vxor 24, 24, 25 - vxor 24, 24, 26 - vxor 24, 24, 27 - - vxor 24, 24, 29 - - - vsldoi 27, 23, 23, 8 - .long 0x12F714C8 - vxor 27, 27, 24 - vxor 23, 23, 27 - - xxlor 32, 23+32, 23+32 - -.endm - - - - -.macro ppc_update_hash_1x - vxor 28, 28, 0 - - vxor 19, 19, 19 - - .long 0x12C3E4C8 - .long 0x12E4E4C8 - .long 0x1305E4C8 - - .long 0x137614C8 - - vsldoi 25, 23, 19, 8 - vsldoi 26, 19, 23, 8 - vxor 22, 22, 25 - vxor 24, 24, 26 - - vsldoi 22, 22, 22, 8 - vxor 22, 22, 27 - - vsldoi 20, 22, 22, 8 - .long 0x12D614C8 - vxor 20, 20, 24 *** 6151 LINES SKIPPED *** From nobody Sun Feb 22 05:14: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 4fJXGT6xMMz6T086 for ; Sun, 22 Feb 2026 05:14: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 4fJXGT42wwz3lMM for ; Sun, 22 Feb 2026 05:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHUA3+QUivJ77NaKKMycdo9TaeIInzhIq06dKNDUyT8=; b=rsfgrbgzgCN6Tx7cj9P9Gslgp0XLnaIpkfPAHGqNo6iiEOZmcJ7lDM6STrfrSbDGbRTacY vs9MjPGcTwuVvpUBza2N6zI9tb65t8i+KVSINPxb3LG2dl+XVBPv3Uo6YsM5X/9TQMHggd ve3vFeURWkjZVRGEtdIF35ugtfcL+top/OLlyM69660GjYZZgVx5KgNgNAk5cws64vDq1T qwhOlwiVAMu4HppkA4/HbbJt3yAMiWD0EkRI/6GQOdm3LIIOISplvGE1sipDtlb5h/GAW+ am4woCugvRMrwEkCPklRpwWy5PDZrmPm5/d33TVlUeDvDGbnIvFOaIe4mjqGvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771737265; a=rsa-sha256; cv=none; b=maBKfMzOMd4ggwoR/LlVdIe8RuwCXJ2hFLXXYbzrH7A36laWpk6A8AFFXZsQm8Hog2DcYe 7hSlPSd/V/2HcOJy4mdRnyyK7tYRKrYNUd6hSxPaWoX/uZFWxM0SguDik8CjqNWNfyS4KB nk3xHZjqs7h9HPe1bmhGZUsOoh+ikopk5LJuervFry9YgrWgxXeuzSE3DIB8SxDqY5RWhM PIRBAXlfhbL83YxaNKgCdk5P67HUHIne4Bydw/jHjXwTfgiR7lWGrh+6fE86BAyAJ+vz2e Q0AfhTDCNiyZWSVnUuLMv9ohBSb82VpX3xaTBUBiGFTq0235d4UIcdu0r4MkJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHUA3+QUivJ77NaKKMycdo9TaeIInzhIq06dKNDUyT8=; b=JtBYybNOJ9eYAnckpECk3wojZp8NXdc60C1j+TpofG2GIwHfBWCbIzFMdwv/tw/p2GXVAt DV/C8dGh0YDDqoQKNXUJTSV+E4lZMdQuU5YIwF42aZkas3CrDS0IaMrBfjpkfR1ptVa7tI GCtcJZPLmpezI4vu8LRhF6cTyZhwF26sQ27mwnaMO4HkTLchf0EQxkYiiXJmBFQwv3xlew 9n+aaZj5SG57LlELS2t/EC6B7ijHBpZ2sGDi3yxf5HGB1fJ6wvrMPHm2VC8Rn4jM1/i2vi ken3UN6eG1dESKEA651282iMwcAKlx1n9SSBT7khFvdB7NFPCMRYR9e8aMv06Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJXGT35D8zVfZ for ; Sun, 22 Feb 2026 05:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32fee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 05:14:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 12eecb3bcc0b - stable/15 - OpenSSL: update vendor sources to match 3.5.5 content List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 12eecb3bcc0be4d7fd35847252c40998806fc551 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 05:14:24 +0000 Message-Id: <699a90b0.32fee.15afd423@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=12eecb3bcc0be4d7fd35847252c40998806fc551 commit 12eecb3bcc0be4d7fd35847252c40998806fc551 Author: Enji Cooper AuthorDate: 2026-01-31 22:06:28 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:34:24 +0000 OpenSSL: update vendor sources to match 3.5.5 content MFC with: f25b8c9fb4f58cf61adb47d7570abe7caa6d385d MFC after: 1 week (cherry picked from commit 1731fc70f7344af08db49b06c63c963fa12ee354) --- crypto/openssl/apps/progs.c | 2 +- crypto/openssl/apps/progs.h | 2 +- crypto/openssl/crypto/params_idx.c | 4 + crypto/openssl/exporters/libcrypto.pc | 2 +- crypto/openssl/exporters/libssl.pc | 2 +- crypto/openssl/exporters/openssl.pc | 2 +- crypto/openssl/include/crypto/bn_conf.h | 12 +- crypto/openssl/include/crypto/dso_conf.h | 10 +- crypto/openssl/include/internal/param_names.h | 4 + crypto/openssl/include/openssl/asn1.h | 671 +++-- crypto/openssl/include/openssl/asn1t.h | 993 ++++--- crypto/openssl/include/openssl/bio.h | 1106 ++++---- crypto/openssl/include/openssl/cmp.h | 450 +-- crypto/openssl/include/openssl/cms.h | 350 +-- crypto/openssl/include/openssl/comp.h | 55 +- crypto/openssl/include/openssl/conf.h | 109 +- crypto/openssl/include/openssl/configuration.h | 50 +- crypto/openssl/include/openssl/core_names.h | 160 +- crypto/openssl/include/openssl/crmf.h | 169 +- crypto/openssl/include/openssl/crypto.h | 523 ++-- crypto/openssl/include/openssl/ct.h | 99 +- crypto/openssl/include/openssl/err.h | 509 ++-- crypto/openssl/include/openssl/ess.h | 45 +- crypto/openssl/include/openssl/fipskey.h | 18 +- crypto/openssl/include/openssl/lhash.h | 559 ++-- crypto/openssl/include/openssl/ocsp.h | 316 +-- crypto/openssl/include/openssl/opensslv.h | 56 +- crypto/openssl/include/openssl/pkcs12.h | 334 +-- crypto/openssl/include/openssl/pkcs7.h | 227 +- crypto/openssl/include/openssl/safestack.h | 308 ++- crypto/openssl/include/openssl/srp.h | 130 +- crypto/openssl/include/openssl/ssl.h | 2909 ++++++++++---------- crypto/openssl/include/openssl/ui.h | 154 +- crypto/openssl/include/openssl/x509.h | 702 +++-- crypto/openssl/include/openssl/x509_acert.h | 90 +- crypto/openssl/include/openssl/x509_vfy.h | 679 ++--- crypto/openssl/include/openssl/x509v3.h | 777 +++--- .../openssl/providers/common/der/der_digests_gen.c | 2 + crypto/openssl/providers/common/der/der_dsa_gen.c | 2 + crypto/openssl/providers/common/der/der_ec_gen.c | 2 + crypto/openssl/providers/common/der/der_ecx_gen.c | 2 + .../openssl/providers/common/der/der_ml_dsa_gen.c | 2 + crypto/openssl/providers/common/der/der_rsa_gen.c | 2 + .../openssl/providers/common/der/der_slh_dsa_gen.c | 2 + crypto/openssl/providers/common/der/der_wrap_gen.c | 2 + .../providers/common/include/prov/der_digests.h | 2 + .../providers/common/include/prov/der_dsa.h | 4 +- .../openssl/providers/common/include/prov/der_ec.h | 4 +- .../providers/common/include/prov/der_ecx.h | 2 + .../providers/common/include/prov/der_ml_dsa.h | 2 + .../providers/common/include/prov/der_rsa.h | 10 +- .../providers/common/include/prov/der_slh_dsa.h | 2 + .../providers/common/include/prov/der_wrap.h | 2 + crypto/openssl/tools/c_rehash | 1 + secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 11 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 7 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 9 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 7 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 15 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 9 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 11 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 9 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 15 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 7 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 11 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 13 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 19 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 15 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 17 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 13 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 19 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 13 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 11 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 15 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 9 +- .../libcrypto/man/man3/BIO_get_rpoll_descriptor.3 | 11 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 11 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 19 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 13 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 19 +- secure/lib/libcrypto/man/man3/BIO_s_dgram_pair.3 | 21 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 9 +- secure/lib/libcrypto/man/man3/BIO_sendmmsg.3 | 53 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 15 +- secure/lib/libcrypto/man/man3/BIO_set_flags.3 | 236 ++ secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 7 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 11 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 15 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 7 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 7 +- secure/lib/libcrypto/man/man3/BN_add.3 | 7 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 7 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 37 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 9 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 9 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 23 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 9 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 7 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 7 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 7 +- secure/lib/libcrypto/man/man3/BN_new.3 | 7 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 13 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 11 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 9 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 9 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 7 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 11 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 13 +- secure/lib/libcrypto/man/man3/CMAC_CTX.3 | 13 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 15 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 9 +- .../man/man3/CMS_EncryptedData_set1_key.3 | 96 + .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 9 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 9 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 13 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 9 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 9 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 13 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 7 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 9 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 7 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 11 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 7 +- .../lib/libcrypto/man/man3/CMS_signed_get_attr.3 | 13 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 7 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 7 +- secure/lib/libcrypto/man/man3/COMP_CTX_new.3 | 25 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 9 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 9 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 23 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 27 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 7 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 9 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 9 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 11 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 13 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 13 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 43 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 13 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 25 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 7 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 7 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 9 +- secure/lib/libcrypto/man/man3/DH_new.3 | 7 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 7 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 13 +- secure/lib/libcrypto/man/man3/DH_size.3 | 17 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 7 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 11 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 9 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 7 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 15 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 9 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 9 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 7 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 11 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 9 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 13 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 7 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 7 +- secure/lib/libcrypto/man/man3/DTLSv1_get_timeout.3 | 7 +- .../lib/libcrypto/man/man3/DTLSv1_handle_timeout.3 | 7 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 25 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 9 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 9 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 9 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 7 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 19 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 13 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 7 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 9 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 11 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 9 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 95 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 13 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 9 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 11 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 15 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 7 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 7 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 11 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 7 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 23 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 7 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 7 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 7 +- .../man/man3/EVP_CIPHER_CTX_get_app_data.3 | 96 + .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 7 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 9 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 25 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 39 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 15 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 13 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 25 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 123 +- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 33 +- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 13 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 49 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 17 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 7 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 59 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 25 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 7 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 7 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get_algor.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 11 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 7 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 17 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 9 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 11 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 7 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 7 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 7 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 15 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 15 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 21 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 7 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 7 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 17 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 13 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_attr.3 | 11 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 7 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 13 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 23 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 25 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 27 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 19 +- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 23 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 17 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 9 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 47 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 43 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 13 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 35 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_SKEY.3 | 27 +- secure/lib/libcrypto/man/man3/EVP_SKEYMGMT.3 | 13 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 17 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 9 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 11 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 7 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 7 +- .../man/man3/EVP_set_default_properties.3 | 17 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 7 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 7 +- secure/lib/libcrypto/man/man3/GENERAL_NAME.3 | 7 +- secure/lib/libcrypto/man/man3/HMAC.3 | 9 +- secure/lib/libcrypto/man/man3/MD5.3 | 7 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 9 +- secure/lib/libcrypto/man/man3/Makefile | 4 + secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 7 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 13 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 7 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 7 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 9 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 11 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 7 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 7 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 13 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 7 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 33 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 19 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 11 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 7 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 7 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 17 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 27 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 17 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 9 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 19 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 7 +- .../lib/libcrypto/man/man3/OPENSSL_load_u16_le.3 | 15 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 37 +- secure/lib/libcrypto/man/man3/OPENSSL_ppccap.3 | 206 ++ secure/lib/libcrypto/man/man3/OPENSSL_riscvcap.3 | 41 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 19 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 15 +- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 15 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 23 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ATAV_set0.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 99 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 9 +- .../libcrypto/man/man3/OSSL_CMP_ITAV_new_caCerts.3 | 19 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 15 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 19 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 17 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 12 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 13 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 29 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 17 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 19 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 7 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 15 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 19 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 7 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 7 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 18 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 15 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 32 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 13 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 11 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 15 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 33 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 19 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 9 +- .../lib/libcrypto/man/man3/OSSL_ERR_STATE_save.3 | 7 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 9 +- .../libcrypto/man/man3/OSSL_GENERAL_NAMES_print.3 | 7 +- secure/lib/libcrypto/man/man3/OSSL_HPKE_CTX_new.3 | 57 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 27 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 11 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 23 +- .../lib/libcrypto/man/man3/OSSL_IETF_ATTR_SYNTAX.3 | 7 +- .../man/man3/OSSL_IETF_ATTR_SYNTAX_print.3 | 7 +- .../man/man3/OSSL_INDICATOR_set_callback.3 | 13 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 13 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 19 +- .../man/man3/OSSL_LIB_CTX_set_conf_diagnostics.3 | 7 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 29 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 7 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 21 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 31 +- .../libcrypto/man/man3/OSSL_PARAM_print_to_bio.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 29 +- .../libcrypto/man/man3/OSSL_QUIC_client_method.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 19 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 7 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 17 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 15 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 7 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 9 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 17 +- secure/lib/libcrypto/man/man3/OSSL_sleep.3 | 7 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 23 +- .../man/man3/OSSL_trace_get_category_num.3 | 7 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 25 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 7 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 15 +- .../libcrypto/man/man3/PBMAC1_get1_pbkdf2_param.3 | 7 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 7 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 19 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 15 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 11 +- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 19 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 7 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 7 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 7 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 9 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 7 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 7 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 7 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_set0_attrs.3 | 7 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 7 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 7 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 7 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 7 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 9 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 7 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 7 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 11 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 7 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 9 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 13 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 7 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 13 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 15 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 7 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 29 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 7 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 7 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 9 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 19 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 9 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 7 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 13 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 13 +- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 11 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 7 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 9 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 9 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 7 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 11 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 13 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 29 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 11 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 7 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 11 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 9 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 11 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 21 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 17 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 13 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 9 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 7 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 13 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 13 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 11 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 9 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 7 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 7 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 7 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 7 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 7 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 7 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 9 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 17 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 11 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 7 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 23 +- .../man/man3/SSL_COMP_add_compression_method.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 7 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 7 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 9 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 80 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 9 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 7 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 7 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 13 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 7 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 45 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 7 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 7 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 7 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 25 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 7 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 7 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 7 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 13 +- .../man/man3/SSL_CTX_set1_cert_comp_preference.3 | 29 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 53 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 11 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 9 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 35 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 7 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 11 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 18 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 17 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 7 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 30 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 21 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 7 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 9 +- .../libcrypto/man/man3/SSL_CTX_set_domain_flags.3 | 15 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 7 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 9 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 9 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 15 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 31 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 13 +- .../man/man3/SSL_CTX_set_new_pending_conn_cb.3 | 9 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 13 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 59 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 17 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 7 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 17 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 13 +- .../man/man3/SSL_CTX_set_security_level.3 | 11 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 13 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 9 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 9 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 17 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 7 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 11 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 13 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 7 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 9 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 7 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 11 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 11 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 21 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 37 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 9 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 13 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 7 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 7 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 13 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 7 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 9 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 9 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 7 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 7 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 7 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 7 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_accept_stream.3 | 7 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 17 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 13 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 7 +- .../man/man3/SSL_export_keying_material.3 | 7 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 11 +- .../lib/libcrypto/man/man3/SSL_get0_connection.3 | 13 +- .../lib/libcrypto/man/man3/SSL_get0_group_name.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_rpk.3 | 21 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 9 +- .../libcrypto/man/man3/SSL_get1_builtin_sigalgs.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 7 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 9 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 13 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 13 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 13 +- .../libcrypto/man/man3/SSL_get_conn_close_info.3 | 17 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 9 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 28 +- .../lib/libcrypto/man/man3/SSL_get_event_timeout.3 | 9 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 7 +- .../lib/libcrypto/man/man3/SSL_get_handshake_rtt.3 | 15 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 13 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 7 +- .../man/man3/SSL_get_peer_signature_nid.3 | 11 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 13 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 7 +- .../libcrypto/man/man3/SSL_get_rpoll_descriptor.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 13 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_get_stream_id.3 | 9 +- .../libcrypto/man/man3/SSL_get_stream_read_state.3 | 23 +- secure/lib/libcrypto/man/man3/SSL_get_value_uint.3 | 39 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 13 +- secure/lib/libcrypto/man/man3/SSL_handle_events.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 7 +- .../lib/libcrypto/man/man3/SSL_inject_net_dgram.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 7 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_new_domain.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_new_listener.3 | 21 +- secure/lib/libcrypto/man/man3/SSL_new_stream.3 | 15 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_poll.3 | 25 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 21 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 23 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 11 +- .../man/man3/SSL_set1_initial_peer_addr.3 | 7 +- .../libcrypto/man/man3/SSL_set1_server_cert_type.3 | 9 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 9 +- .../lib/libcrypto/man/man3/SSL_set_blocking_mode.3 | 9 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 7 +- .../man/man3/SSL_set_default_stream_mode.3 | 21 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 9 +- .../man/man3/SSL_set_incoming_stream_policy.3 | 13 +- .../lib/libcrypto/man/man3/SSL_set_quic_tls_cbs.3 | 12 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 9 +- .../libcrypto/man/man3/SSL_set_session_secret_cb.3 | 11 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 11 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 7 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 61 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 9 +- .../lib/libcrypto/man/man3/SSL_stream_conclude.3 | 15 +- secure/lib/libcrypto/man/man3/SSL_stream_reset.3 | 13 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 9 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 21 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 7 +- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX.3 | 19 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 13 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 7 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 33 +- secure/lib/libcrypto/man/man3/UI_new.3 | 47 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 9 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 11 +- .../lib/libcrypto/man/man3/X509_ACERT_add1_attr.3 | 7 +- .../libcrypto/man/man3/X509_ACERT_add_attr_nconf.3 | 7 +- .../man/man3/X509_ACERT_get0_holder_baseCertId.3 | 11 +- .../lib/libcrypto/man/man3/X509_ACERT_get_attr.3 | 9 +- .../lib/libcrypto/man/man3/X509_ACERT_print_ex.3 | 9 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 7 +- secure/lib/libcrypto/man/man3/X509_ATTRIBUTE.3 | 9 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 7 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 13 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 15 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 11 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 13 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 7 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 11 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 7 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 9 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 19 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 15 +- secure/lib/libcrypto/man/man3/X509_REQ_get_attr.3 | 13 +- .../libcrypto/man/man3/X509_REQ_get_extensions.3 | 9 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 7 +- .../man/man3/X509_STORE_CTX_get_by_subject.3 | 7 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 45 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 19 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 9 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 17 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 20 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 7 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 15 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 47 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 9 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 9 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 17 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 9 +- .../libcrypto/man/man3/X509_check_private_key.3 | 7 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 17 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 9 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 7 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 7 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 15 +- .../man/man3/X509_get0_distinguishing_id.3 | 7 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 9 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 7 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 7 +- .../man/man3/X509_get_default_cert_file.3 | 13 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 17 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 7 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 7 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 7 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 7 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 7 +- secure/lib/libcrypto/man/man3/X509_new.3 | 9 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 9 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 11 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 15 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 13 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 7 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 7 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 11 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 15 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 11 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 18 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 7 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 7 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 15 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 7 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 9 +- secure/lib/libcrypto/man/man5/config.5 | 65 +- secure/lib/libcrypto/man/man5/fips_config.5 | 63 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 61 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 31 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 13 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 7 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 15 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 27 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 15 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 15 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_KDF-ARGON2.7 | 29 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 31 +- secure/lib/libcrypto/man/man7/EVP_KDF-HMAC-DRBG.7 | 13 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 31 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 17 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_KDF-PVKKDF.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 15 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 23 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 35 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 29 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 27 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 49 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 23 +- secure/lib/libcrypto/man/man7/EVP_KEM-EC.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_KEM-ML-KEM.7 | 13 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_KEM-X25519.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 31 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 41 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 13 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 23 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 23 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 23 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-KECCAK.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 7 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 35 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 65 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 33 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-DSA.7 | 25 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-KEM.7 | 33 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 17 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SLH-DSA.7 | 21 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 17 +- secure/lib/libcrypto/man/man7/EVP_RAND-CRNG-TEST.7 | 13 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 11 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 15 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 15 +- secure/lib/libcrypto/man/man7/EVP_RAND-JITTER.7 | 15 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 9 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 13 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 39 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 23 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 23 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 32 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 7 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 35 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 35 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 37 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 51 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 21 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 37 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 11 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 7 +- .../lib/libcrypto/man/man7/OSSL_STORE-winstore.7 | 11 +- secure/lib/libcrypto/man/man7/RAND.7 | 17 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 13 +- secure/lib/libcrypto/man/man7/X25519.7 | 7 +- secure/lib/libcrypto/man/man7/bio.7 | 9 +- secure/lib/libcrypto/man/man7/ct.7 | 7 +- secure/lib/libcrypto/man/man7/des_modes.7 | 17 +- secure/lib/libcrypto/man/man7/evp.7 | 19 +- secure/lib/libcrypto/man/man7/fips_module.7 | 41 +- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 23 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 21 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 17 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 15 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 21 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 25 +- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 7 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 7 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 11 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 22 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 11 +- secure/lib/libcrypto/man/man7/openssl-qlog.7 | 23 +- .../libcrypto/man/man7/openssl-quic-concurrency.7 | 67 +- secure/lib/libcrypto/man/man7/openssl-quic.7 | 134 +- secure/lib/libcrypto/man/man7/openssl-threads.7 | 43 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 15 +- .../libcrypto/man/man7/ossl-guide-introduction.7 | 23 +- .../man/man7/ossl-guide-libcrypto-introduction.7 | 9 +- .../man/man7/ossl-guide-libraries-introduction.7 | 31 +- .../man/man7/ossl-guide-libssl-introduction.7 | 13 +- .../lib/libcrypto/man/man7/ossl-guide-migration.7 | 335 +-- .../man/man7/ossl-guide-quic-client-block.7 | 21 +- .../man/man7/ossl-guide-quic-client-non-block.7 | 33 +- .../man/man7/ossl-guide-quic-introduction.7 | 31 +- .../man/man7/ossl-guide-quic-multi-stream.7 | 53 +- .../man/man7/ossl-guide-quic-server-block.7 | 17 +- .../man/man7/ossl-guide-quic-server-non-block.7 | 21 +- .../man/man7/ossl-guide-tls-client-block.7 | 33 +- .../man/man7/ossl-guide-tls-client-non-block.7 | 41 +- .../man/man7/ossl-guide-tls-introduction.7 | 23 +- .../man/man7/ossl-guide-tls-server-block.7 | 13 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 27 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 9 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 31 +- secure/lib/libcrypto/man/man7/property.7 | 19 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 41 +- secure/lib/libcrypto/man/man7/provider-base.7 | 159 +- secure/lib/libcrypto/man/man7/provider-cipher.7 | 19 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 43 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 13 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 45 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 29 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 23 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 45 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 55 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 31 +- secure/lib/libcrypto/man/man7/provider-object.7 | 43 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 27 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 126 +- secure/lib/libcrypto/man/man7/provider-skeymgmt.7 | 23 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 19 +- secure/lib/libcrypto/man/man7/provider.7 | 13 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 9 +- secure/lib/libcrypto/man/man7/x509.7 | 11 +- secure/usr.bin/openssl/man/CA.pl.1 | 15 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 15 +- secure/usr.bin/openssl/man/openssl-ca.1 | 53 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 37 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 11 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 161 +- secure/usr.bin/openssl/man/openssl-cms.1 | 71 +- secure/usr.bin/openssl/man/openssl-crl.1 | 9 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 7 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 31 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 11 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 13 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 9 +- secure/usr.bin/openssl/man/openssl-ec.1 | 9 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 17 +- secure/usr.bin/openssl/man/openssl-enc.1 | 33 +- secure/usr.bin/openssl/man/openssl-engine.1 | 13 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 7 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 79 +- .../usr.bin/openssl/man/openssl-format-options.1 | 13 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 7 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 41 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 11 +- secure/usr.bin/openssl/man/openssl-info.1 | 7 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 29 +- secure/usr.bin/openssl/man/openssl-list.1 | 27 +- secure/usr.bin/openssl/man/openssl-mac.1 | 21 +- .../openssl/man/openssl-namedisplay-options.1 | 15 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 9 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 39 +- .../openssl/man/openssl-passphrase-options.1 | 9 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 13 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 31 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 11 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 17 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 9 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 7 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 97 +- secure/usr.bin/openssl/man/openssl-prime.1 | 7 +- secure/usr.bin/openssl/man/openssl-rand.1 | 9 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 27 +- secure/usr.bin/openssl/man/openssl-req.1 | 57 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 13 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 9 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 63 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 29 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 9 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 15 +- secure/usr.bin/openssl/man/openssl-skeyutl.1 | 9 +- secure/usr.bin/openssl/man/openssl-smime.1 | 25 +- secure/usr.bin/openssl/man/openssl-speed.1 | 23 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 9 +- secure/usr.bin/openssl/man/openssl-srp.1 | 7 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 11 +- secure/usr.bin/openssl/man/openssl-ts.1 | 33 +- .../openssl/man/openssl-verification-options.1 | 99 +- secure/usr.bin/openssl/man/openssl-verify.1 | 9 +- secure/usr.bin/openssl/man/openssl-version.1 | 11 +- secure/usr.bin/openssl/man/openssl-x509.1 | 69 +- secure/usr.bin/openssl/man/openssl.1 | 48 +- secure/usr.bin/openssl/man/tsget.1 | 23 +- 952 files changed, 15618 insertions(+), 11925 deletions(-) diff --git a/crypto/openssl/apps/progs.c b/crypto/openssl/apps/progs.c index acc204a3e6e7..317acf5bc8b2 100644 --- a/crypto/openssl/apps/progs.c +++ b/crypto/openssl/apps/progs.c @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/apps/progs.h b/crypto/openssl/apps/progs.h index 1b62ec37dec1..2214340fa813 100644 --- a/crypto/openssl/apps/progs.h *** 70670 LINES SKIPPED *** From nobody Sun Feb 22 05:17: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 4fJXLX4fgJz6T0Hk for ; Sun, 22 Feb 2026 05:17: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 4fJXLX2SYvz3mNc for ; Sun, 22 Feb 2026 05:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OwE8NbxvMhP7wymCQhFYq5W3znu36zyMW/lGZy8guE=; b=xtaqQNmUE4qDB4jdxYzjkU3loBrtlJi5llhKdA+tGjpWM8XiiDzOuoFuMAPI6miBLzBybE vn1/aXiuRo2lNyKyib4TLVamfuPucKXK2mAparISpAVW03CrUf+2OqPT/QjtdPcjJSgtqJ B2ccMrxzmGTIocLly8NJpYuHhtohROUlOv6AfYyqS27rzStY5/MvwU65J3SIkVG9qfkYDt HKjVHoXi9OoLoCAJdcs5rjLR5e9NzkjCr+cUCFFl1pcWwZB9/uoAHLIJu8ejijEFj77i3s +TuAL3c3kBk0kPIMbDsaSUWDifiZo23RdfLMOOzT9jzOhLOKl1gVgiOUzagbYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771737476; a=rsa-sha256; cv=none; b=ttiZXeHoaFU/a0TRah6+O6a38xGdMhHV303+S/U8LkQvXlvaO0x7EBclZGPEFh1oPF4ZIf DM/QkXs5+vqmbTSB6KxCogRsbZd3oZRIrb4nHEJabWzY6L0tCKfsC4j5LPboltWc8L9jJn OKFJabGq407dTHIDGpFhMHs8MZt3zxDxD8fhQizBfx5vn7+tEnkNojlrSu1r6o+bXLgdr4 tSY058ymVz5720cRb8HGbiTLSO146UiWtcvBiAXzts8FN8wUx0kbvX7zda/GEnu6UsbO8H DhamKC60ZjC9BwIpWi3yp29mVGcS8wIQwsk+T+KG9MuzeYj2CR3A9gFFvOt46A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OwE8NbxvMhP7wymCQhFYq5W3znu36zyMW/lGZy8guE=; b=l1lkhc+hTwx6DHNpHjyZFNG2PxPpDCwDr/2NODm4a7yd3+xH0RiQr3+FpM/20wkynVwkPD PID+wx2dNbAtb7k41l3a3AVjmbvZy7MP2dj5ZXH+5BXtkI0EO/9T9PfSmmf/+ffYx7hArE cKawnGXLSU/x9lBaZICJHwdmBE00+0yg5maYS67+0qIMG/A6MNveMr9VshM5L29qTxZyX8 TSnQ1XKN+BywYW+APfNp6baXB1gPFr/L8x64jJ98cHJ5Zl5QI3UCFi+psq0o+bVs2BpPfY 1D3rpeuMdaN3zG0nU0Ad0Ng8cOhB7wdfnhitp5gO6+5Xj+y37uUF9Z66cDmN6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJXLX0nmnzVY4 for ; Sun, 22 Feb 2026 05:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3353d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 05:17:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 1a0002e608ff - stable/14 - Revert "Bump CXXSTD to C++17 with GoogleTest tests" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 1a0002e608ff799696247d98ef70d7874dc4e91b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 05:17:56 +0000 Message-Id: <699a9184.3353d.2f22bf5d@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1a0002e608ff799696247d98ef70d7874dc4e91b commit 1a0002e608ff799696247d98ef70d7874dc4e91b Author: Enji Cooper AuthorDate: 2026-02-22 05:17:37 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 05:17:37 +0000 Revert "Bump CXXSTD to C++17 with GoogleTest tests" This reverts commit 1bebef5c953a007244e16a9ba58a10e6137442b8. --- share/mk/googletest.test.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk index af28c5d05ecf..05415775448b 100644 --- a/share/mk/googletest.test.inc.mk +++ b/share/mk/googletest.test.inc.mk @@ -9,6 +9,6 @@ GTESTS_CXXFLAGS+= -frtti # libgmock's, etc, headers. CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private -CXXSTD?= c++17 +CXXSTD?= c++14 NO_WTHREAD_SAFETY= From nobody Sun Feb 22 05:17: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 4fJXLY3XK8z6T0WD for ; Sun, 22 Feb 2026 05:17: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 4fJXLY2B1Rz3mCY for ; Sun, 22 Feb 2026 05:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fRShY0+SK768kh13n1VTD/tMmlE9jJFo/3HjNyHwtnE=; b=Ad3eRt4dqGHw5b4+io5R2NpstcX14ww/f4r2ogxbOVewyLS/sx5RVgEcWpTu6D2EARgRPZ 50NtVE/XHzQLSeNlJ17IXw4ZNHLCK51Qz29NTvWHa/+hnbokqgpGPJ6YqHCueY5KkIk9w9 jH1y95uIP2JPqRBi3kLX03K6usrTlvqs9Mv7cQsHv3k0g7oq6Gcvzpcrdxaec1xvIKYrni Q/nN9LkpXvtyux//Ht+NHsYX9kwEm4mgLE/G0w2mBe4oC011DcgUSV71z5ph9viwPCzzj4 k6i1fZ+ij5CGPUqwf5g9Hlp6ZsdLOnfLuHVx9Q40VtwAZdWIvtMpUfVAgEOiwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771737477; a=rsa-sha256; cv=none; b=RBwEnqDiel7ZrXCZOTYVgMy5f/NclyDJfAiT8lnqzWkCPNmPVv5vIXk88Qg0QtIbmMf3eH NxwCriJzkgvIa0yC/X67LWIjreH+yzITCJGbgZUTZsYCxKh6kJmnZdjxyXPSecSRFPy7z1 30nXoHgu6ol+Z8m2DCPucBOprxZ/rJyEFICfN7Shl6bHEqnpkf5kCsqXh7gnY4WZ467Znr lA5dgCdkqL0S1nRGoHiKiXWC2PFPnIP5d8yQREw2PUmmaNao/dWOR81Ma6cUWNGCxoF+ez nwvDpo61hb8sGJaC1f5G1SoSax0xjH0/1dy523VdkuCHUH8BB1zMKr2S/kAmog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fRShY0+SK768kh13n1VTD/tMmlE9jJFo/3HjNyHwtnE=; b=pQgt+NjGxp9sijOr3euEB0Tx4F+a1s9MewWIgRGVSx2CQlgGtka9u4KJxs2x1jbad67QiT sW6TX8NaFE2x21J37ZmWzIHrF3Blmfh/kY50/wpGX04/ttWxxyXRs1tlogpzfBfY/MN/xS xLOl4aKrHmtnO7UKIBMWK2+47eRkRLZLYndWvDuNwXsqxQoCLeBQ1hBJzVnkbahBWPzQv6 XAlbJb/dnULn9QORMPeNDen5iLu5YAMgbQXwNFOcE4AdqODeD/AG92D9vXUqqRP+BL7Le0 c4oXTIPf51/2yLMtKZwh8FNWaEQ6tNuzPtq/pqqXiMHiIfEqxZCwo4v2L2aJFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJXLY1DzTzVfd for ; Sun, 22 Feb 2026 05:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32357 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 05:17:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: d1a607d8f008 - stable/14 - Revert "gtest.cc: declare fail_if_no_test_linked 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1a607d8f008e64928a0525353c43be4bf08f476 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 05:17:57 +0000 Message-Id: <699a9185.32357.12126097@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d1a607d8f008e64928a0525353c43be4bf08f476 commit d1a607d8f008e64928a0525353c43be4bf08f476 Author: Enji Cooper AuthorDate: 2026-02-22 05:17:39 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 05:17:39 +0000 Revert "gtest.cc: declare fail_if_no_test_linked flag" This reverts commit 5a9164c4539dfea8e1120673b5da038c65b53958. --- contrib/googletest/googletest/src/gtest.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/googletest/googletest/src/gtest.cc b/contrib/googletest/googletest/src/gtest.cc index 0e32774bc6d1..09af15179f1f 100644 --- a/contrib/googletest/googletest/src/gtest.cc +++ b/contrib/googletest/googletest/src/gtest.cc @@ -263,7 +263,6 @@ GTEST_DEFINE_bool_( testing::GetDefaultFailFast()), "True if and only if a test failure should stop further test execution."); -GTEST_DECLARE_bool_(fail_if_no_test_linked); GTEST_DEFINE_bool_( fail_if_no_test_linked, testing::internal::BoolFromGTestEnv("fail_if_no_test_linked", false), From nobody Sun Feb 22 05:17: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 4fJXLZ5dGKz6T09N for ; Sun, 22 Feb 2026 05:17: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 4fJXLZ2rq6z3mHr for ; Sun, 22 Feb 2026 05:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/OsvOj3zRuaosxY+gwqVwWbumtF7JmzBoNwjEie4Mus=; b=XkfTL6kZt9lGx6Du0AToTRc2701xEgRQlwKS4O1IDoYoUklrSwDzoQfRiMKOVg+qlSKWoX dRx3cB8p5nCnbYcyalXUVJtcEagiiwPDYUy8h85DcnJHcGyouowCMfei8ex8u6N4LGdp57 Moq5A5uKX3v4rcBpvlBAACpag63tL4gXaYJ6yXAXXtEevkaBm5e7hkuOVUPmH9RvCRTflx d0j3H4BsuskdMglMGnGvRkOjSp/2RkyBg49I+8Oy9audaDwx+7fL8EbIaYAPl0WvaLE+NN hNphhaTZ0A3HEmL4WYnCrVv1Zwhcy4UlhCzLTxD740rHG2ED7rlkx94rn70Suw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771737478; a=rsa-sha256; cv=none; b=aU8jh7j9k7SaBKe03YwU1k/JYKzFn7GmN8FI3ZTETiOF56qgHZRXzW4CrNbEly2QVrEL9v f0I/g6wxcCGCxeFgo01vYBbgIaBMSfZhg3R+chCxmUxyebelVOQvIXmBKnWr9ARjapCHuy 0jK+J/ru0AV8g//dad9EqvkS/btXrAzqtO3DWXM1En79CDa82BWjgguaR/Yrz3zEwqRILj Hf7isWOA8dD11EAb/bjzlr7ML8UPa1ujX5LFcMi+6C/gYVVePGg1AAPBgfpY2plqwCdzg0 +Bkcuf7C68BKkFJ2uKcyRB7ImH/eFBG4SvgkZQxeMOTwjcr5Z2o9KXK+qoOQIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771737478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/OsvOj3zRuaosxY+gwqVwWbumtF7JmzBoNwjEie4Mus=; b=N/1Z2DT9xCbRG24m4KBXnq7vrhRjjtHu8ZyM36PIi08kEuyyqBN49uuAItkdFWKR1RBbtN lNH0nEqoazr52drSjgQyBZj4hWyDY6BUPG67WtYVGVCJ3xrHC65ILPznzGCS0usq4dW+Ft lRCVitIMSv0jEJf7XYa8sthV2gGiK3Iacu3mbkRMC86g6tJSUpK84waNHSVH8U0ffEUJCM yuypSOIJBweF2yq26Kr4c6UWFeggYthiF1ZkLwRa09LsyCWZ/IVTDneurFgL+IFZKWFNgs 1QdXcVMSzdhM04/iY0onoZ+mAanpy0y16Ygh42drxH/7PHU6zDmrFqo2RqeRaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJXLZ2RGWzVY5 for ; Sun, 22 Feb 2026 05:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e99 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 05:17:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 887f0f125fd1 - stable/14 - Revert "GoogleTest: import 1.17.0" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 887f0f125fd1282c8054b402ad72af371a9f5dec Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 05:17:58 +0000 Message-Id: <699a9186.32e99.543fe4bb@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=887f0f125fd1282c8054b402ad72af371a9f5dec commit 887f0f125fd1282c8054b402ad72af371a9f5dec Author: Enji Cooper AuthorDate: 2026-02-22 05:17:40 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 05:17:40 +0000 Revert "GoogleTest: import 1.17.0" This reverts commit 227baf32d26360137492b108aba06c6a54c0949b. --- contrib/googletest/.github/workflows/gtest-ci.yml | 43 +++ contrib/googletest/.gitignore | 1 - contrib/googletest/.travis.yml | 81 ++++ contrib/googletest/BUILD.bazel | 40 +- contrib/googletest/CMakeLists.txt | 4 +- contrib/googletest/MODULE.bazel | 49 ++- contrib/googletest/README.md | 15 +- contrib/googletest/WORKSPACE | 49 +-- contrib/googletest/ci/linux-presubmit.sh | 76 ++-- contrib/googletest/ci/macos-presubmit.sh | 11 +- contrib/googletest/ci/windows-presubmit.bat | 38 +- contrib/googletest/docs/advanced.md | 120 +++--- contrib/googletest/docs/faq.md | 13 + contrib/googletest/docs/gmock_cook_book.md | 73 +--- contrib/googletest/docs/primer.md | 4 +- contrib/googletest/docs/quickstart-bazel.md | 53 +-- contrib/googletest/docs/reference/actions.md | 3 +- contrib/googletest/docs/reference/assertions.md | 11 +- contrib/googletest/docs/reference/matchers.md | 11 +- contrib/googletest/docs/reference/testing.md | 99 +---- contrib/googletest/fake_fuchsia_sdk.bzl | 36 +- .../googlemock/include/gmock/gmock-actions.h | 119 +----- .../googlemock/include/gmock/gmock-matchers.h | 419 ++++----------------- .../googlemock/include/gmock/gmock-more-actions.h | 16 +- .../googlemock/include/gmock/gmock-spec-builders.h | 10 +- .../include/gmock/internal/gmock-internal-utils.h | 5 + .../googlemock/include/gmock/internal/gmock-port.h | 1 - .../googlemock/src/gmock-cardinalities.cc | 8 +- .../googlemock/test/gmock-actions_test.cc | 78 +--- .../googlemock/test/gmock-function-mocker_test.cc | 4 +- .../test/gmock-matchers-arithmetic_test.cc | 237 ++---------- .../test/gmock-matchers-comparisons_test.cc | 136 +------ .../test/gmock-matchers-containers_test.cc | 336 +---------------- .../googlemock/test/gmock-matchers-misc_test.cc | 105 ++---- .../googlemock/test/gmock-more-actions_test.cc | 49 +-- .../googletest/googlemock/test/gmock-pp_test.cc | 2 +- .../googlemock/test/gmock-spec-builders_test.cc | 7 +- .../googletest/googlemock/test/gmock_link_test.h | 2 +- contrib/googletest/googletest/README.md | 6 +- .../googletest/cmake/internal_utils.cmake | 2 +- .../include/gtest/gtest-assertion-result.h | 7 - .../googletest/include/gtest/gtest-matchers.h | 6 +- .../googletest/include/gtest/gtest-param-test.h | 134 ++----- .../googletest/include/gtest/gtest-printers.h | 39 -- .../googletest/include/gtest/gtest-typed-test.h | 126 ++++--- .../googletest/googletest/include/gtest/gtest.h | 4 +- .../include/gtest/internal/gtest-internal.h | 84 +++-- .../include/gtest/internal/gtest-param-util.h | 62 +-- .../googletest/include/gtest/internal/gtest-port.h | 82 +++- .../googletest/googletest/src/gtest-internal-inl.h | 4 - contrib/googletest/googletest/src/gtest.cc | 191 ++-------- contrib/googletest/googletest/test/BUILD.bazel | 68 +--- .../googletest/test/googletest-filter-unittest.py | 19 - .../test/googletest-json-output-unittest.py | 111 +----- .../googletest/test/googletest-param-test-test.cc | 70 ---- .../googletest/test/googletest-printers-test.cc | 32 +- .../test/googletest-setuptestsuite-test_.cc | 4 +- .../googletest/googletest/test/gtest_unittest.cc | 56 +-- .../googletest/test/gtest_xml_output_unittest.py | 93 ++--- .../googletest/test/gtest_xml_output_unittest_.cc | 22 +- contrib/googletest/googletest_deps.bzl | 14 +- 61 files changed, 916 insertions(+), 2684 deletions(-) diff --git a/contrib/googletest/.github/workflows/gtest-ci.yml b/contrib/googletest/.github/workflows/gtest-ci.yml new file mode 100644 index 000000000000..03a8cc5e287b --- /dev/null +++ b/contrib/googletest/.github/workflows/gtest-ci.yml @@ -0,0 +1,43 @@ +name: ci + +on: + push: + pull_request: + +env: + BAZEL_CXXOPTS: -std=c++14 + +jobs: + Linux: + runs-on: ubuntu-latest + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Tests + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... + + macOS: + runs-on: macos-latest + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Tests + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... + + + Windows: + runs-on: windows-latest + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Tests + run: bazel test --cxxopt=/std:c++14 --features=external_include_paths --test_output=errors ... diff --git a/contrib/googletest/.gitignore b/contrib/googletest/.gitignore index f0df39db1d7e..fede02f65093 100644 --- a/contrib/googletest/.gitignore +++ b/contrib/googletest/.gitignore @@ -8,7 +8,6 @@ bazel-genfiles bazel-googletest bazel-out bazel-testlogs -MODULE.bazel.lock # python *.pyc diff --git a/contrib/googletest/.travis.yml b/contrib/googletest/.travis.yml new file mode 100644 index 000000000000..4e7413a4f9a3 --- /dev/null +++ b/contrib/googletest/.travis.yml @@ -0,0 +1,81 @@ +# Build matrix / environment variable are explained on: +# https://docs.travis-ci.com/user/customizing-the-build/ +# This file can be validated on: +# http://lint.travis-ci.org/ + +sudo: false +language: cpp + +# Define the matrix explicitly, manually expanding the combinations of (os, compiler, env). +# It is more tedious, but grants us far more flexibility. +matrix: + include: + - os: linux + compiler: gcc + sudo : true + install: ./ci/install-linux.sh && ./ci/log-config.sh + script: ./ci/build-linux-bazel.sh + - os: linux + compiler: clang + sudo : true + install: ./ci/install-linux.sh && ./ci/log-config.sh + script: ./ci/build-linux-bazel.sh + - os: linux + group: deprecated-2017Q4 + compiler: gcc + install: ./ci/install-linux.sh && ./ci/log-config.sh + script: ./ci/build-linux-autotools.sh + - os: linux + group: deprecated-2017Q4 + compiler: gcc + env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 + - os: linux + group: deprecated-2017Q4 + compiler: clang + env: BUILD_TYPE=Debug VERBOSE=1 + - os: linux + group: deprecated-2017Q4 + compiler: clang + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 + - os: linux + compiler: clang + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON + - os: osx + compiler: gcc + env: BUILD_TYPE=Debug VERBOSE=1 + - os: osx + compiler: gcc + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 + - os: osx + compiler: clang + env: BUILD_TYPE=Debug VERBOSE=1 + if: type != pull_request + - os: osx + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 + if: type != pull_request + +# These are the install and build (script) phases for the most common entries in the matrix. They could be included +# in each entry in the matrix, but that is just repetitive. +install: + - ./ci/install-${TRAVIS_OS_NAME}.sh + - . ./ci/env-${TRAVIS_OS_NAME}.sh + - ./ci/log-config.sh + +script: ./ci/travis.sh + +# For sudo=false builds this section installs the necessary dependencies. +addons: + apt: + # List of whitelisted in travis packages for ubuntu-precise can be found here: + # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise + # List of whitelisted in travis apt-sources: + # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.9 + packages: + - g++-4.9 + - clang-3.9 + +notifications: + email: false diff --git a/contrib/googletest/BUILD.bazel b/contrib/googletest/BUILD.bazel index 53501454ce4f..e407ae29f44c 100644 --- a/contrib/googletest/BUILD.bazel +++ b/contrib/googletest/BUILD.bazel @@ -83,10 +83,6 @@ cc_library( ) # Google Test including Google Mock - -# For an actual test, use `gtest` and also `gtest_main` if you depend on gtest's -# main(). For a library, use `gtest_for_library` instead if the library can be -# testonly. cc_library( name = "gtest", srcs = glob( @@ -142,19 +138,19 @@ cc_library( }), deps = select({ ":has_absl": [ - "@abseil-cpp//absl/container:flat_hash_set", - "@abseil-cpp//absl/debugging:failure_signal_handler", - "@abseil-cpp//absl/debugging:stacktrace", - "@abseil-cpp//absl/debugging:symbolize", - "@abseil-cpp//absl/flags:flag", - "@abseil-cpp//absl/flags:parse", - "@abseil-cpp//absl/flags:reflection", - "@abseil-cpp//absl/flags:usage", - "@abseil-cpp//absl/strings", - "@abseil-cpp//absl/types:any", - "@abseil-cpp//absl/types:optional", - "@abseil-cpp//absl/types:variant", - "@re2//:re2", + "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/debugging:failure_signal_handler", + "@com_google_absl//absl/debugging:stacktrace", + "@com_google_absl//absl/debugging:symbolize", + "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/flags:parse", + "@com_google_absl//absl/flags:reflection", + "@com_google_absl//absl/flags:usage", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:any", + "@com_google_absl//absl/types:optional", + "@com_google_absl//absl/types:variant", + "@com_googlesource_code_re2//:re2", ], "//conditions:default": [], }) + select({ @@ -171,16 +167,6 @@ cc_library( }), ) -# `gtest`, but testonly. See guidance on `gtest` for when to use this. -alias( - name = "gtest_for_library", - actual = ":gtest", - testonly = True, -) - -# Implements main() for tests using gtest. Prefer to depend on `gtest` as well -# to ensure compliance with the layering_check Bazel feature where only the -# direct hdrs values are available. cc_library( name = "gtest_main", srcs = ["googlemock/src/gmock_main.cc"], diff --git a/contrib/googletest/CMakeLists.txt b/contrib/googletest/CMakeLists.txt index 0567ae7daa32..512e5c3d480f 100644 --- a/contrib/googletest/CMakeLists.txt +++ b/contrib/googletest/CMakeLists.txt @@ -1,10 +1,10 @@ # Note: CMake support is community-based. The maintainers do not use CMake # internally. -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.13) project(googletest-distribution) -set(GOOGLETEST_VERSION 1.17.0) +set(GOOGLETEST_VERSION 1.15.2) if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/contrib/googletest/MODULE.bazel b/contrib/googletest/MODULE.bazel index 5cb0b156f40c..61d5e2223512 100644 --- a/contrib/googletest/MODULE.bazel +++ b/contrib/googletest/MODULE.bazel @@ -32,45 +32,38 @@ module( name = "googletest", - version = "1.17.0", + version = "1.15.2", compatibility_level = 1, ) # Only direct dependencies need to be listed below. # Please keep the versions in sync with the versions in the WORKSPACE file. -bazel_dep( - name = "abseil-cpp", - version = "20250127.1", -) -bazel_dep( - name = "platforms", - version = "0.0.11", -) -bazel_dep( - name = "re2", - version = "2024-07-02.bcr.1", -) +bazel_dep(name = "abseil-cpp", + version = "20240116.2", + repo_name = "com_google_absl") -bazel_dep( - name = "rules_python", - version = "1.3.0", - dev_dependency = True, -) +bazel_dep(name = "platforms", + version = "0.0.10") + +bazel_dep(name = "re2", + repo_name = "com_googlesource_code_re2", + version = "2024-07-02") + +bazel_dep(name = "rules_python", + version = "0.34.0", + dev_dependency = True) # https://rules-python.readthedocs.io/en/stable/toolchains.html#library-modules-with-dev-only-python-usage python = use_extension( "@rules_python//python/extensions:python.bzl", "python", - dev_dependency = True, -) -python.toolchain( - ignore_root_user_error = True, - is_default = True, - python_version = "3.12", + dev_dependency = True ) -# See fake_fuchsia_sdk.bzl for instructions on how to override this with a real SDK, if needed. -fuchsia_sdk = use_extension("//:fake_fuchsia_sdk.bzl", "fuchsia_sdk") -fuchsia_sdk.create_fake() -use_repo(fuchsia_sdk, "fuchsia_sdk") +python.toolchain(python_version = "3.12", + is_default = True, + ignore_root_user_error = True) + +fake_fuchsia_sdk = use_repo_rule("//:fake_fuchsia_sdk.bzl", "fake_fuchsia_sdk") +fake_fuchsia_sdk(name = "fuchsia_sdk") diff --git a/contrib/googletest/README.md b/contrib/googletest/README.md index 598cf31242b7..f50c670534d5 100644 --- a/contrib/googletest/README.md +++ b/contrib/googletest/README.md @@ -2,18 +2,27 @@ ### Announcements +#### Live at Head + +GoogleTest now follows the +[Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support). +We recommend +[updating to the latest commit in the `main` branch as often as possible](https://github.com/abseil/abseil-cpp/blob/master/FAQ.md#what-is-live-at-head-and-how-do-i-do-it). +We do publish occasional semantic versions, tagged with +`v${major}.${minor}.${patch}` (e.g. `v1.15.0`). + #### Documentation Updates Our documentation is now live on GitHub Pages at https://google.github.io/googletest/. We recommend browsing the documentation on GitHub Pages rather than directly in the repository. -#### Release 1.17.0 +#### Release 1.15.0 -[Release 1.17.0](https://github.com/google/googletest/releases/tag/v1.17.0) is +[Release 1.15.0](https://github.com/google/googletest/releases/tag/v1.15.0) is now available. -The 1.17.x branch [requires at least C++17]((https://opensource.google/documentation/policies/cplusplus-support#c_language_standard). +The 1.15.x branch requires at least C++14. #### Continuous Integration diff --git a/contrib/googletest/WORKSPACE b/contrib/googletest/WORKSPACE index 0ae5dee92baf..218e6c2e8c2b 100644 --- a/contrib/googletest/WORKSPACE +++ b/contrib/googletest/WORKSPACE @@ -1,34 +1,4 @@ -# Copyright 2024 Google Inc. -# All Rights Reserved. -# -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * 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. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "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 COPYRIGHT -# OWNER OR CONTRIBUTORS 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. - -workspace(name = "googletest") +workspace(name = "com_google_googletest") load("//:googletest_deps.bzl", "googletest_deps") googletest_deps() @@ -36,12 +6,13 @@ googletest_deps() load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "rules_python", - sha256 = "2cc26bbd53854ceb76dd42a834b1002cd4ba7f8df35440cf03482e045affc244", - strip_prefix = "rules_python-1.3.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.3.0/rules_python-1.3.0.tar.gz", + name = "rules_python", + sha256 = "d71d2c67e0bce986e1c5a7731b4693226867c45bfe0b7c5e0067228a536fc580", + strip_prefix = "rules_python-0.29.0", + urls = ["https://github.com/bazelbuild/rules_python/releases/download/0.29.0/rules_python-0.29.0.tar.gz"], ) -# https://github.com/bazelbuild/rules_python/releases/tag/1.1.0 + +# https://github.com/bazelbuild/rules_python/releases/tag/0.29.0 load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() @@ -54,8 +25,8 @@ http_archive( http_archive( name = "platforms", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz", ], - sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f", + sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee", ) diff --git a/contrib/googletest/ci/linux-presubmit.sh b/contrib/googletest/ci/linux-presubmit.sh index 6491e79844b8..6d2b3fb573a0 100644 --- a/contrib/googletest/ci/linux-presubmit.sh +++ b/contrib/googletest/ci/linux-presubmit.sh @@ -31,68 +31,51 @@ set -euox pipefail -readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20241218" -readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250205" +readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20240523" +readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20230120" if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" fi if [[ -z ${STD:-} ]]; then - STD="c++17 c++20" + STD="c++14 c++17 c++20" fi -# Test CMake + GCC -for cmake_off_on in OFF ON; do - time docker run \ - --volume="${GTEST_ROOT}:/src:ro" \ - --tmpfs="/build:exec" \ - --workdir="/build" \ - --rm \ - --env="CC=/usr/local/bin/gcc" \ - --env=CXXFLAGS="-Werror -Wdeprecated" \ - ${LINUX_LATEST_CONTAINER} \ - /bin/bash -c " - cmake /src \ - -DCMAKE_CXX_STANDARD=17 \ - -Dgtest_build_samples=ON \ - -Dgtest_build_tests=ON \ - -Dgmock_build_tests=ON \ - -Dcxx_no_exception=${cmake_off_on} \ - -Dcxx_no_rtti=${cmake_off_on} && \ - make -j$(nproc) && \ - ctest -j$(nproc) --output-on-failure" -done - -# Test CMake + Clang -for cmake_off_on in OFF ON; do - time docker run \ - --volume="${GTEST_ROOT}:/src:ro" \ - --tmpfs="/build:exec" \ - --workdir="/build" \ - --rm \ - --env="CC=/opt/llvm/clang/bin/clang" \ - --env=CXXFLAGS="-Werror -Wdeprecated --gcc-toolchain=/usr/local" \ - ${LINUX_LATEST_CONTAINER} \ - /bin/bash -c " - cmake /src \ - -DCMAKE_CXX_STANDARD=17 \ - -Dgtest_build_samples=ON \ - -Dgtest_build_tests=ON \ - -Dgmock_build_tests=ON \ - -Dcxx_no_exception=${cmake_off_on} \ - -Dcxx_no_rtti=${cmake_off_on} && \ - make -j$(nproc) && \ - ctest -j$(nproc) --output-on-failure" +# Test the CMake build +for cc in /usr/local/bin/gcc /opt/llvm/clang/bin/clang; do + for cmake_off_on in OFF ON; do + time docker run \ + --volume="${GTEST_ROOT}:/src:ro" \ + --tmpfs="/build:exec" \ + --workdir="/build" \ + --rm \ + --env="CC=${cc}" \ + --env=CXXFLAGS="-Werror -Wdeprecated" \ + ${LINUX_LATEST_CONTAINER} \ + /bin/bash -c " + cmake /src \ + -DCMAKE_CXX_STANDARD=14 \ + -Dgtest_build_samples=ON \ + -Dgtest_build_tests=ON \ + -Dgmock_build_tests=ON \ + -Dcxx_no_exception=${cmake_off_on} \ + -Dcxx_no_rtti=${cmake_off_on} && \ + make -j$(nproc) && \ + ctest -j$(nproc) --output-on-failure" + done done # Do one test with an older version of GCC +# TODO(googletest-team): This currently uses Bazel 5. When upgrading to a +# version of Bazel that supports Bzlmod, add --enable_bzlmod=false to keep test +# coverage for the old WORKSPACE dependency management. time docker run \ --volume="${GTEST_ROOT}:/src:ro" \ --workdir="/src" \ --rm \ --env="CC=/usr/local/bin/gcc" \ - --env="BAZEL_CXXOPTS=-std=c++17" \ + --env="BAZEL_CXXOPTS=-std=c++14" \ ${LINUX_GCC_FLOOR_CONTAINER} \ /usr/local/bin/bazel test ... \ --copt="-Wall" \ @@ -100,7 +83,6 @@ time docker run \ --copt="-Wuninitialized" \ --copt="-Wundef" \ --copt="-Wno-error=pragmas" \ - --enable_bzlmod=false \ --features=external_include_paths \ --keep_going \ --show_timestamps \ diff --git a/contrib/googletest/ci/macos-presubmit.sh b/contrib/googletest/ci/macos-presubmit.sh index 5370ed60d3d8..70eaa74fb490 100644 --- a/contrib/googletest/ci/macos-presubmit.sh +++ b/contrib/googletest/ci/macos-presubmit.sh @@ -31,9 +31,6 @@ set -euox pipefail -# Use Xcode 16.0 -sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer - if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" fi @@ -43,20 +40,20 @@ for cmake_off_on in OFF ON; do BUILD_DIR=$(mktemp -d build_dir.XXXXXXXX) cd ${BUILD_DIR} time cmake ${GTEST_ROOT} \ - -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_CXX_STANDARD=14 \ -Dgtest_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ -Dcxx_no_exception=${cmake_off_on} \ -Dcxx_no_rtti=${cmake_off_on} - time make -j$(nproc) + time make time ctest -j$(nproc) --output-on-failure done # Test the Bazel build # If we are running on Kokoro, check for a versioned Bazel binary. -KOKORO_GFILE_BAZEL_BIN="bazel-8.0.0-darwin-x86_64" +KOKORO_GFILE_BAZEL_BIN="bazel-7.0.0-darwin-x86_64" if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" chmod +x ${BAZEL_BIN} @@ -70,7 +67,7 @@ for absl in 0 1; do --copt="-Wall" \ --copt="-Werror" \ --copt="-Wundef" \ - --cxxopt="-std=c++17" \ + --cxxopt="-std=c++14" \ --define="absl=${absl}" \ --enable_bzlmod=true \ --features=external_include_paths \ diff --git a/contrib/googletest/ci/windows-presubmit.bat b/contrib/googletest/ci/windows-presubmit.bat index e2664c538da6..1adc1a16ffa8 100644 --- a/contrib/googletest/ci/windows-presubmit.bat +++ b/contrib/googletest/ci/windows-presubmit.bat @@ -1,6 +1,6 @@ SETLOCAL ENABLEDELAYEDEXPANSION -SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-8.0.0-windows-x86_64.exe +SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-7.0.0-windows-x86_64.exe SET PATH=C:\Python34;%PATH% SET BAZEL_PYTHON=C:\python34\python.exe @@ -11,18 +11,21 @@ SET CTEST_OUTPUT_ON_FAILURE=1 SET CMAKE_BUILD_PARALLEL_LEVEL=16 SET CTEST_PARALLEL_LEVEL=16 -SET GTEST_ROOT=%~dp0\.. +IF EXIST git\googletest ( + CD git\googletest +) ELSE IF EXIST github\googletest ( + CD github\googletest +) + IF %errorlevel% neq 0 EXIT /B 1 :: ---------------------------------------------------------------------------- :: CMake -SET CMAKE_BUILD_PATH=cmake_msvc2022 -MKDIR %CMAKE_BUILD_PATH% -CD %CMAKE_BUILD_PATH% +MKDIR cmake_msvc2022 +CD cmake_msvc2022 -%CMAKE_BIN% %GTEST_ROOT% ^ +%CMAKE_BIN% .. ^ -G "Visual Studio 17 2022" ^ - -DCMAKE_CXX_STANDARD=17 ^ -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^ -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^ -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^ @@ -37,8 +40,8 @@ IF %errorlevel% neq 0 EXIT /B 1 %CTEST_BIN% -C Debug --timeout 600 IF %errorlevel% neq 0 EXIT /B 1 -CD %GTEST_ROOT% -RMDIR /S /Q %CMAKE_BUILD_PATH% +CD .. +RMDIR /S /Q cmake_msvc2022 :: ---------------------------------------------------------------------------- :: Bazel @@ -47,26 +50,11 @@ RMDIR /S /Q %CMAKE_BUILD_PATH% :: because of Windows limitations on path length. :: --output_user_root=C:\tmp causes Bazel to use a shorter path. SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community - -:: C++17 -%BAZEL_EXE% ^ - --output_user_root=C:\tmp ^ - test ... ^ - --compilation_mode=dbg ^ - --copt=/std:c++17 ^ - --copt=/WX ^ - --enable_bzlmod=true ^ - --keep_going ^ - --test_output=errors ^ - --test_tag_filters=-no_test_msvc2017 -IF %errorlevel% neq 0 EXIT /B 1 - -:: C++20 %BAZEL_EXE% ^ --output_user_root=C:\tmp ^ test ... ^ --compilation_mode=dbg ^ - --copt=/std:c++20 ^ + --copt=/std:c++14 ^ --copt=/WX ^ --enable_bzlmod=true ^ --keep_going ^ diff --git a/contrib/googletest/docs/advanced.md b/contrib/googletest/docs/advanced.md index 9b1220a1e09a..240588a83b4e 100644 --- a/contrib/googletest/docs/advanced.md +++ b/contrib/googletest/docs/advanced.md @@ -286,7 +286,7 @@ For example: ```c++ TEST(SkipTest, DoesSkip) { GTEST_SKIP() << "Skipping single test"; - FAIL(); // Won't fail; it won't be executed + EXPECT_EQ(0, 1); // Won't fail; it won't be executed } class SkipFixture : public ::testing::Test { @@ -298,7 +298,7 @@ class SkipFixture : public ::testing::Test { // Tests for SkipFixture won't be executed. TEST_F(SkipFixture, SkipsOneTest) { - FAIL(); // Won't fail; it won't be executed + EXPECT_EQ(5, 7); // Won't fail } ``` @@ -405,51 +405,6 @@ EXPECT_TRUE(IsCorrectPointIntVector(point_ints)) For more details regarding `AbslStringify()` and its integration with other libraries, see go/abslstringify. -## Regular Expression Syntax - -When built with Bazel and using Abseil, GoogleTest uses the -[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX -systems (Linux, Cygwin, Mac), GoogleTest uses the -[POSIX extended regular expression](https://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax. To learn about POSIX syntax, you may want to read this -[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended). - -On Windows, GoogleTest uses its own simple regular expression implementation. It -lacks many features. For example, we don't support union (`"x|y"`), grouping -(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among -others. Below is what we do support (`A` denotes a literal character, period -(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular -expressions.): - -Expression | Meaning ----------- | -------------------------------------------------------------- -`c` | matches any literal character `c` -`\\d` | matches any decimal digit -`\\D` | matches any character that's not a decimal digit -`\\f` | matches `\f` -`\\n` | matches `\n` -`\\r` | matches `\r` -`\\s` | matches any ASCII whitespace, including `\n` -`\\S` | matches any character that's not a whitespace -`\\t` | matches `\t` -`\\v` | matches `\v` -`\\w` | matches any letter, `_`, or decimal digit -`\\W` | matches any character that `\\w` doesn't match -`\\c` | matches any literal character `c`, which must be a punctuation -`.` | matches any single character except `\n` -`A?` | matches 0 or 1 occurrences of `A` -`A*` | matches 0 or many occurrences of `A` -`A+` | matches 1 or many occurrences of `A` -`^` | matches the beginning of a string (not that of each line) -`$` | matches the end of a string (not that of each line) -`xy` | matches `x` followed by `y` - -To help you determine which capability is available on your system, GoogleTest -defines macros to govern which regular expression it is using. The macros are: -`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death -tests to work in all cases, you can either `#if` on these macros or use the more -limited syntax only. - ## Death Tests In many applications, there are assertions that can cause application failure if @@ -461,7 +416,7 @@ corruption, security holes, or worse. Hence it is vitally important to test that such assertion statements work as expected. Since these precondition checks cause the processes to die, we call such tests -*death tests*. More generally, any test that checks that a program terminates +_death tests_. More generally, any test that checks that a program terminates (except by throwing an exception) in an expected fashion is also a death test. Note that if a piece of code throws an exception, we don't consider it "death" @@ -507,12 +462,6 @@ verifies that: exit with exit code 0, and * calling `KillProcess()` kills the process with signal `SIGKILL`. -{: .callout .warning} -Warning: If your death test contains mocks and is expecting a specific exit -code, then you must allow the mock objects to be leaked via `Mock::AllowLeak`. -This is because the mock leak detector will exit with its own error code if it -detects a leak. - The test function body may contain other assertions and statements as well, if necessary. @@ -554,6 +503,51 @@ TEST_F(FooDeathTest, DoesThat) { } ``` +### Regular Expression Syntax + +When built with Bazel and using Abseil, GoogleTest uses the +[RE2](https://github.com/google/re2/wiki/Syntax) syntax. Otherwise, for POSIX +systems (Linux, Cygwin, Mac), GoogleTest uses the +[POSIX extended regular expression](https://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) +syntax. To learn about POSIX syntax, you may want to read this +[Wikipedia entry](https://en.wikipedia.org/wiki/Regular_expression#POSIX_extended). + +On Windows, GoogleTest uses its own simple regular expression implementation. It +lacks many features. For example, we don't support union (`"x|y"`), grouping +(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among +others. Below is what we do support (`A` denotes a literal character, period +(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular +expressions.): + +Expression | Meaning +---------- | -------------------------------------------------------------- +`c` | matches any literal character `c` +`\\d` | matches any decimal digit +`\\D` | matches any character that's not a decimal digit +`\\f` | matches `\f` +`\\n` | matches `\n` +`\\r` | matches `\r` +`\\s` | matches any ASCII whitespace, including `\n` +`\\S` | matches any character that's not a whitespace +`\\t` | matches `\t` +`\\v` | matches `\v` +`\\w` | matches any letter, `_`, or decimal digit +`\\W` | matches any character that `\\w` doesn't match +`\\c` | matches any literal character `c`, which must be a punctuation +`.` | matches any single character except `\n` +`A?` | matches 0 or 1 occurrences of `A` +`A*` | matches 0 or many occurrences of `A` +`A+` | matches 1 or many occurrences of `A` +`^` | matches the beginning of a string (not that of each line) +`$` | matches the end of a string (not that of each line) +`xy` | matches `x` followed by `y` + +To help you determine which capability is available on your system, GoogleTest +defines macros to govern which regular expression it is using. The macros are: +`GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If you want your death +tests to work in all cases, you can either `#if` on these macros or use the more +limited syntax only. + ### How It Works See [Death Assertions](reference/assertions.md#death) in the Assertions @@ -733,7 +727,7 @@ Some tips on using `SCOPED_TRACE`: ### Propagating Fatal Failures A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the *current function*, not the entire test. For +when they fail they only abort the _current function_, not the entire test. For example, the following test will segfault: ```c++ @@ -1929,20 +1923,6 @@ the `--gtest_also_run_disabled_tests` flag or set the You can combine this with the `--gtest_filter` flag to further select which disabled tests to run. -### Enforcing Having At Least One Test Case - -A not uncommon programmer mistake is to write a test program that has no test -case linked in. This can happen, for example, when you put test case definitions -in a library and the library is not marked as "always link". - -To catch such mistakes, run the test program with the -`--gtest_fail_if_no_test_linked` flag or set the `GTEST_FAIL_IF_NO_TEST_LINKED` -environment variable to a value other than `0`. Now the program will fail if no -test case is linked in. - -Note that *any* test case linked in makes the program valid for the purpose of -this check. In particular, even a disabled test case suffices. - ### Repeating the Tests Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it @@ -2402,7 +2382,7 @@ IMPORTANT: The exact format of the JSON document is subject to change. #### Detecting Test Premature Exit -Google Test implements the *premature-exit-file* protocol for test runners to +Google Test implements the _premature-exit-file_ protocol for test runners to catch any kind of unexpected exits of test programs. Upon start, Google Test creates the file which will be automatically deleted after all work has been finished. Then, the test runner can check if this file exists. In case the file diff --git a/contrib/googletest/docs/faq.md b/contrib/googletest/docs/faq.md index 4e958384673a..c7d10b5006ba 100644 --- a/contrib/googletest/docs/faq.md +++ b/contrib/googletest/docs/faq.md @@ -511,6 +511,19 @@ However, there are cases where you have to define your own: list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) +## Why does ASSERT_DEATH complain about previous threads that were already joined? + +With the Linux pthread library, there is no turning back once you cross the line +from a single thread to multiple threads. The first time you create a thread, a +manager thread is created in addition, so you get 3, not 2, threads. Later when +the thread you create joins the main thread, the thread count decrements by 1, +but the manager thread will never be killed, so you still have 2 threads, which +means you cannot safely run a death test. + +The new NPTL thread library doesn't suffer from this problem, as it doesn't +create a manager thread. However, if you don't control which machine your test +runs on, you shouldn't depend on this. + ## Why does GoogleTest require the entire test suite, instead of individual tests, to be named `*DeathTest` when it uses `ASSERT_DEATH`? GoogleTest does not interleave tests from different test suites. That is, it diff --git a/contrib/googletest/docs/gmock_cook_book.md b/contrib/googletest/docs/gmock_cook_book.md index 9e59b4cf438c..f1b10b472d27 100644 --- a/contrib/googletest/docs/gmock_cook_book.md +++ b/contrib/googletest/docs/gmock_cook_book.md @@ -177,7 +177,7 @@ class StackInterface { template class MockStack : public StackInterface { ... - MOCK_METHOD(int, GetSize, (), (const, override)); + MOCK_METHOD(int, GetSize, (), (override)); MOCK_METHOD(void, Push, (const Elem& x), (override)); }; ``` @@ -936,8 +936,8 @@ casts a matcher `m` to type `Matcher`. To ensure safety, gMock checks that floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and -3. When `U` is a non-const reference, `T` must also be a reference (as the - underlying matcher may be interested in the address of the `U` value). +3. When `U` is a reference, `T` must also be a reference (as the underlying + matcher may be interested in the address of the `U` value). The code won't compile if any of these conditions isn't met. @@ -3387,9 +3387,9 @@ With this definition, the above assertion will give a better message: #### Using EXPECT_ Statements in Matchers -You can also use `EXPECT_...` statements inside custom matcher definitions. In -many cases, this allows you to write your matcher more concisely while still -providing an informative error message. For example: +You can also use `EXPECT_...` (and `ASSERT_...`) statements inside custom +matcher definitions. In many cases, this allows you to write your matcher more +concisely while still providing an informative error message. For example: ```cpp MATCHER(IsDivisibleBy7, "") { @@ -3419,14 +3419,14 @@ itself, as gMock already prints it for you. #### Argument Types -The type of the value being matched (`arg_type`) is determined by the context in -which you use the matcher and is supplied to you by the compiler, so you don't -need to worry about declaring it (nor can you). This allows the matcher to be -polymorphic. For example, `IsDivisibleBy7()` can be used to match any type where -the value of `(arg % 7) == 0` can be implicitly converted to a `bool`. In the -`Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an `int`, -`arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be -`unsigned long`; and so on. +The type of the value being matched (`arg_type`) is determined by the +context in which you use the matcher and is supplied to you by the compiler, so +you don't need to worry about declaring it (nor can you). This allows the +matcher to be polymorphic. For example, `IsDivisibleBy7()` can be used to match +any type where the value of `(arg % 7) == 0` can be implicitly converted to a +`bool`. In the `Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an +`int`, `arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will *** 5160 LINES SKIPPED *** From nobody Sun Feb 22 06:16: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 4fJYdc40y0z6S5xv for ; Sun, 22 Feb 2026 06:16: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 4fJYdc3RBrz3rjZ for ; Sun, 22 Feb 2026 06:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771740964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CpTfKWADSZ1LM0LYixcmBVMmUAKf8SQlwl9l6Y7/0g8=; b=uY6sZ+qycm0zeqKvILtVzLG3Ak2iJY2JDhKS8csIRfd2CdldxgJDdCEUsHkZ7JRzk12F51 ZxCGjJMZQMzUDpr28E0ON5hcCVeMkB01oV5JS7j2Gy5mf8AnA1SRE8KstAJsXmGGuPt5tR 8cX8UkcUME2jGEqi6LM2O6vXb0JKewYh31dgl9JEROthy8iKXdsvR8a3XSatYn+u6NJvQB mXkmEoo6baasRdR7ah0GO3S3bQNjTxu4eGstmi2z+/m5zNvmkZHjPo/6VkqaAIFIrHX6rx qSvVpeZu2G7ztHo86IG4pZ8+ZqRibqdgWC0Yi0VuMSDdqLpv2Nr1Ctlswws37A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771740964; a=rsa-sha256; cv=none; b=jrkYT+OZ7HJky+arfIxDBZFxaon5aKqUIhKwosWH5GsEIewW76bAFi4d7hIYAIHCLAYvZu 1QQx51T8nBdezt4828kjfEkt0hWJT7D2mADhzef8oVUD99hGoRxN4QjXBIb6weUSp2IWHi y+pNgfkzuW5KBedttp2uB0uw8EWDRQnNBEfd88WgksZQii5dE0WG1NwnPglPjPXDIcWgYs HduBSfGhtxJwLRKmqG8QbPes91kXaddq3z/xUXqJIoWgMOIGrPYddd4vj4apdEoB+UzJxF qrSYNVLk130RfcxVb4xvfgq8OZkgXvBjGJGf3E/S48RTzGGsI+gIfMA5wAqqNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771740964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CpTfKWADSZ1LM0LYixcmBVMmUAKf8SQlwl9l6Y7/0g8=; b=NiBKuPEjwbPN6tZ2bGqLXHf3mc3aCzCdkd2TD6aWve7761sLNHht8B+i33IqYJhVucttKw ol9/NWPyjmMIBiT5NYNstykZn+/JIdGt/jDI4PmNE85GajR4nxl0Dqs7fEBn8GSzQy1zp6 EhvWSSMeKUribgqWKWuFlqc3mZPMDfTduO+f1ReuqTTjWMuraILE4TBRONNK8hEqvZSk0X CW7hK8hxeKC0W6qT+SEg5XatoC1LpTxPeumS0ykjz3dbFEygYVDIYok6np4sPND6RRWhqj lhR57trdy8ZA4OzM0fwl34u8ANyX8nP5L9iMxI/T1vs3uEENpHlGmv8SzykOOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJYdc2vLjzYmk for ; Sun, 22 Feb 2026 06:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3917f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 06:16:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 06aeb11f54cf - stable/15 - t_ptrace_wait.c: clean up trailing whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 06aeb11f54cf0d3a6f6b720ce585854eb41c65f1 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 06:16:04 +0000 Message-Id: <699a9f24.3917f.3d3db8bb@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=06aeb11f54cf0d3a6f6b720ce585854eb41c65f1 commit 06aeb11f54cf0d3a6f6b720ce585854eb41c65f1 Author: Enji Cooper AuthorDate: 2026-02-08 23:40:56 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 06:15:58 +0000 t_ptrace_wait.c: clean up trailing whitespace This is being done to aid with future potential updates of this file. MFC after: 1 week (cherry picked from commit fa3519d068d95f87e773d27f96e9f1e18f70075a) --- contrib/netbsd-tests/kernel/t_ptrace_wait.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/netbsd-tests/kernel/t_ptrace_wait.c b/contrib/netbsd-tests/kernel/t_ptrace_wait.c index 9d08c0e9648d..af364390dd25 100644 --- a/contrib/netbsd-tests/kernel/t_ptrace_wait.c +++ b/contrib/netbsd-tests/kernel/t_ptrace_wait.c @@ -524,7 +524,7 @@ ATF_TC_BODY(attach3, tc) _exit(exitval_tracee); } PARENT_TO_CHILD("Message 1", parent_tracee, msg); - + printf("Before calling PT_ATTACH for tracee %d\n", tracee); ATF_REQUIRE(ptrace(PT_ATTACH, tracee, NULL, 0) != -1); @@ -6109,7 +6109,7 @@ ATF_TC_BODY(signal6, tc) printf("Before calling %s() for the forkee - expected exited\n", TWAIT_FNAME); TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0), - child2); + child2); validate_status_exited(status, exitval2); @@ -6120,11 +6120,11 @@ ATF_TC_BODY(signal6, tc) printf("Before calling %s() for the child - expected stopped " "SIGCHLD\n", TWAIT_FNAME); - TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); validate_status_stopped(status, SIGCHLD); - printf("Before resuming the child process where it left off and " + printf("Before resuming the child process where it left off and " "without signal to be sent\n"); ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); @@ -6135,7 +6135,7 @@ ATF_TC_BODY(signal6, tc) validate_status_exited(status, exitval); printf("Before calling %s() for the child - expected no process\n", - TWAIT_FNAME); + TWAIT_FNAME); TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); } #endif @@ -6240,7 +6240,7 @@ ATF_TC_BODY(signal7, tc) printf("Before calling %s() for the forkee - expected exited\n", TWAIT_FNAME); TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0), - child2); + child2); validate_status_exited(status, exitval2); @@ -6251,11 +6251,11 @@ ATF_TC_BODY(signal7, tc) printf("Before calling %s() for the child - expected stopped " "SIGCHLD\n", TWAIT_FNAME); - TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); validate_status_stopped(status, SIGCHLD); - printf("Before resuming the child process where it left off and " + printf("Before resuming the child process where it left off and " "without signal to be sent\n"); ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); @@ -6266,7 +6266,7 @@ ATF_TC_BODY(signal7, tc) validate_status_exited(status, exitval); printf("Before calling %s() for the child - expected no process\n", - TWAIT_FNAME); + TWAIT_FNAME); TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); } #endif @@ -6356,11 +6356,11 @@ ATF_TC_BODY(signal8, tc) printf("Before calling %s() for the child - expected stopped " "SIGCHLD\n", TWAIT_FNAME); - TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); validate_status_stopped(status, SIGCHLD); - printf("Before resuming the child process where it left off and " + printf("Before resuming the child process where it left off and " "without signal to be sent\n"); ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); @@ -6371,7 +6371,7 @@ ATF_TC_BODY(signal8, tc) validate_status_exited(status, exitval); printf("Before calling %s() for the child - expected no process\n", - TWAIT_FNAME); + TWAIT_FNAME); TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); } From nobody Sun Feb 22 06:21: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 4fJYmC2t4Xz6S6D9 for ; Sun, 22 Feb 2026 06:21: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 4fJYmC1n0Hz3sP6 for ; Sun, 22 Feb 2026 06:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771741307; 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=AkISZpnCUkEpTifLPzyjJazppID5zQyH3Ozi277rz4I=; b=eAFqWoNmB3HMlcOVvptg0zdDNUwNDKQJVZPi+rnqmNqNw9Fc7p4hpsaZF3eiqfAK/0tH89 BO559Rq095NrlQEPeMQX6ptNgDAx076lAQBsNxeJFrHajWmF+MztzDYyDh9T7tpTt9dCxU jRCZJ9VHsorrdkzQdyemjyYI8McN5/tMWU7FAdWFKL0Ctj6T5YjnGNZC2UYcaucTYyNlyu cUpN5Vg3aX6Gn9U+kfDPJPDF9DduC9Lhd/1WPX8yRXRJgieRgCAWxxYfRzfk4lMbflvbc5 FZ+Uz79Ci8HFG9YhRKTaDY6d6eVe5TwZcKx3uNzvd3m0rz9XiRI/S8U/T71NDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771741307; a=rsa-sha256; cv=none; b=Yj+z0Q1EsOrHGetJX1v/iZo2yLuITI1FBpPq7KKLP8G8aWNZvTjkB403kUhmkH5gZCmfgm pZyZH92cES2b91OjfnUbf8Wg2wjr3+9KsZn3fn+hbgWvZCF42jgv/d9p8Lfr0jx7vO13f1 TK4SYPx+oJSKfpW6bQebvrhpTc15h0iS4OCJ2/FpLUUbyhtk/BdHk+iYq7WJ2+802sYD7h 3P27rYheb6lebdrW9nMlGAsh00Hqy35smmQJO6yHQBBM6uLlt2ApkKQ3Eqh1joSd/FT8hM 4w+NpWmVeX5TLSOVQxlQo/XoaSuuQeBeg8NTprj9M9gc5AUUPkKzEUz/skphbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771741307; 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=AkISZpnCUkEpTifLPzyjJazppID5zQyH3Ozi277rz4I=; b=Hs8CAZkLOIkw+gOgN9Q6boGrj8cVMcxaN34sdtqHqOBZnb5741RByroRqXkUxzdOiWCVEl hCF+MY/ZGLmhQcQouuC2bpYQWtq3rnkFUIgqLaSfw526+EsqZx2bY58NVJJhkJb91SzCIn nPUzuGMyVNi3t9k63xmXeLpxdFmcflKo61cPKlpY89y3XBLz27h3Svu1K3bTkLCxtN3wXm 3i88+1W/+WawLuXYnKSfEV67tPzC4ZnIrlqVNr6iwS1h7xTzMpwPUlGRgwflowh0ZGkciu QzBbHC0jrS0VCLxLTwCrA8TSLclSlWJKzBszI5zDZzbbXLHW7tlQ8IET3kpOhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJYmC14m7zYnj for ; Sun, 22 Feb 2026 06:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a3ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 06:21:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Enji Cooper Subject: git: 14a7a135d7ac - stable/14 - asmc(4): Stop building it on i386, as it supports only 64-bit chipsets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 14a7a135d7ac32670c3656ebcf1f56f28e29c8f5 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 06:21:42 +0000 Message-Id: <699aa076.3a3ad.5157fcb6@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=14a7a135d7ac32670c3656ebcf1f56f28e29c8f5 commit 14a7a135d7ac32670c3656ebcf1f56f28e29c8f5 Author: Olivier Certner AuthorDate: 2026-01-12 09:37:24 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 06:21:10 +0000 asmc(4): Stop building it on i386, as it supports only 64-bit chipsets Reported by: ngie Fixes: fde9fe18219f ("i386: Fix kernel compilation after introduction of ASMC_DEBUG option") Sponsored by: The FreeBSD Foundation (cherry picked from commit 8342d9f7b5f13d0623861cb8b88caf10a15571f6) --- sys/conf/files.amd64 | 1 + sys/conf/files.x86 | 1 - sys/modules/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 0da06d7a0997..71a663b79978 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -110,6 +110,7 @@ crypto/openssl/amd64/sha256-x86_64.S optional ossl crypto/openssl/amd64/sha512-x86_64.S optional ossl crypto/openssl/amd64/ossl_aes_gcm.c optional ossl dev/amdgpio/amdgpio.c optional amdgpio +dev/asmc/asmc.c optional asmc isa dev/axgbe/if_axgbe_pci.c optional axp dev/axgbe/xgbe-desc.c optional axp dev/axgbe/xgbe-dev.c optional axp diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 33da95a65ba4..94758d66a773 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -66,7 +66,6 @@ dev/amdsbwd/amdsbwd.c optional amdsbwd dev/amdsmn/amdsmn.c optional amdsmn | amdtemp dev/amdtemp/amdtemp.c optional amdtemp dev/arcmsr/arcmsr.c optional arcmsr pci -dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc diff --git a/sys/modules/Makefile b/sys/modules/Makefile index dfcb31f74106..b185744527d8 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -764,7 +764,6 @@ _amdsbwd= amdsbwd _amdsmn= amdsmn _amdtemp= amdtemp _arcmsr= arcmsr -_asmc= asmc .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _blake2= blake2 .endif @@ -822,6 +821,7 @@ _x86bios= x86bios .if ${MACHINE_CPUARCH} == "amd64" _amdgpio= amdgpio +_asmc= asmc _ccp= ccp _enic= enic _iavf= iavf From nobody Sun Feb 22 08:39: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 4fJcrm0pzTz6Snbk; Sun, 22 Feb 2026 08:40:56 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fout-b8-smtp.messagingengine.com (fout-b8-smtp.messagingengine.com [202.12.124.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJcrl28Zzz44m8; Sun, 22 Feb 2026 08:40:55 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=QP19ClOx; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="l4Bz62/0"; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.151 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfout.stl.internal (Postfix) with ESMTP id AF0B11D0013B; Sun, 22 Feb 2026 03:40:53 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 22 Feb 2026 03:40:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1771749653; x=1771836053; bh=OS00r0n0vq iZoXEBgDFGSXmdp/n7q7cd8FhUr1Au1ns=; b=QP19ClOx+5kCmyc6TA5v5VJJcS /Kdqx6BF+8mlHsATnsZvroHFomTYRvE58uQExOlLAJAvb6a9QVJrESHWT4GPb5T7 YUf6Xba1Tz8uQImLQ17NJGY35Kh77G/mm6jrc3wRkRCkMan2hz+0ndZx+wRh1lVW qfnWcyuYBzE+aMFZoao8/+gvaJwhP2lPLvRgnHnjTUHmBaL09+UV4G6mpan6kV1o z/L5I154HmbwfjHYVzdNvSUQM37Gc4gEbp2NcmxG6owlxUU8DAri1jVdwILPFPsK LW8KEj8i08dTISJqIkFVSSc54qJy0d84LUGQC9S8tpHPoXzKG7IlE85CB5CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1771749653; x=1771836053; bh=OS00r0n0vqiZoXEBgDFGSXmdp/n7q7cd8Fh Ur1Au1ns=; b=l4Bz62/0MI4mf2YHRGfhY/pVxr8UdKP0pbktCm53jHpsZQM0XRz Y9UCrQx6cLmq5pykOvgZeif3QXgRr73O+2QtY8qNzYBPNwqKnjVRRMFAFDRwgVDf RKhFLyB55dHgiGndCykAwJlhBXHbCNWPjaLw/2dlPJaivQwtGtZzd4PO2FajHGQD i6i0v5zLiS5lV3esAZiMtg1raRrPIf+Rq/X1I8wrNfaX2iHUZ3J0ZV/6Q9ZsitKc jsHFDX26SsRDT1I2sKrlOMudO+llH7jHiQ26YNlb4uPA+OvODfMn9P1bSKP91Hk4 U6W1olRmUp6ewrCK1lo+PV23TroA61bTM0g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvfeefkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffkhffvvefujghffgggtgesthdtredttdervdenucfhrhhomhepfdfjvghrsggv rhhtucflrdcuufhkuhhhrhgrfdcuoehhvghrsggvrhhtsehgohhjihhrrgdrrghtqeenuc ggtffrrghtthgvrhhnpeefhfehffegvdehuedtuefgkeefieffieejhfeggeekgeevjeeg feffgeeglefhtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghrsggvrhhtsehgohhj ihhrrgdrrghtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtph htthhopegsrghpthesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhm mhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmh hithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvhdq tghomhhmihhtshdqshhrtgdqsghrrghntghhvghssehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Feb 2026 03:40:52 -0500 (EST) Date: Sun, 22 Feb 2026 09:39:39 +0100 Message-ID: <871pidmat0.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Baptiste Daroussin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 297d5bf89067 - stable/15 - ncurses: merge update to ncurses 6.6 In-Reply-To: <6996cfd3.1c403.1e98d5da@gitrepo.freebsd.org> References: <6996cfd3.1c403.1e98d5da@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.151:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-branches@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4fJcrl28Zzz44m8 X-Spamd-Bar: -- On Thu, 19 Feb 2026 09:54:43 +0100, Baptiste Daroussin wrote: > > The branch stable/15 has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=297d5bf8906776137aeac82e48ca2e87944d95b7 > > commit 297d5bf8906776137aeac82e48ca2e87944d95b7 > Author: Baptiste Daroussin > AuthorDate: 2026-01-14 13:48:32 +0000 > Commit: Baptiste Daroussin > CommitDate: 2026-02-19 08:53:57 +0000 > > ncurses: merge update to ncurses 6.6 > > 6.6 is ABI compatible with 6.5 (tested with abidiff) > Remove html documentation to ease updates > > MFC After: 1 month > > (cherry picked from commit 68ad2b0d7af2a3571c4abac9afa712f9b09b721c) > --- > ObsoleteFiles.inc | 21 + [...] > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index a81407a93453..7067dab2ad03 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc [...] > +# 20251215: Remove intrinsic utilities > +OLD_FILES+=usr/bin/alias > +OLD_FILES+=usr/bin/bg > +OLD_FILES+=usr/bin/cd > +OLD_FILES+=usr/bin/fc > +OLD_FILES+=usr/bin/fg > +OLD_FILES+=usr/bin/getopts > +OLD_FILES+=usr/bin/hash > +OLD_FILES+=usr/bin/jobs > +OLD_FILES+=usr/bin/read > +OLD_FILES+=usr/bin/type > +OLD_FILES+=usr/bin/ulimit > +OLD_FILES+=usr/bin/umask > +OLD_FILES+=usr/bin/unalias > +OLD_FILES+=usr/bin/wait This seems to be wrong. 4100bd6caa66434bc901ca48d7364bc2b5fe2cfd was not merged to stable/15. From nobody Sun Feb 22 09:47: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 4fJfL42nXPz6StWB for ; Sun, 22 Feb 2026 09:47: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 4fJfL42Lp5z4Fdc for ; Sun, 22 Feb 2026 09:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771753676; 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=p5jL5Jy0l+sUSwxJYfgneBnA1e5WZ7UNfA3bzwuFouk=; b=lr/PLtSRYIY7ca1pGzU0K+0iuMDpQJ4bsPdWDVm3PHayrTvtrDOiY0bUrMqVnVfyQH6o0N fOsfg10dQg4mLmLR7BbUMeCrhsLPpQi+BVd+452estwDc9+vZ/moUzWgMG6Dd+p2VUONWY kZf6nOvkS9lMOeYNQ4f/zhLytNMS7zxIxKnzSXj3itztRxZtZVFOQB3qPeoaDpUzmlYGJy 2wcZtNneT6246Bj4hBAVuEQidbrqtLe2XY1sGDEtoeo+6FuGJdwguTtvrbrc7sTjXkPRlb OH8AmWqBN2GlnDwUXPVFaXTg5Ry87qbPNJgvCQ8b9hwrA39aDXJKUJhAD7LHVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771753676; a=rsa-sha256; cv=none; b=qfKj+/lRQxpIHiGmRAyM8eWTxgVAQT7kaLAg+tKZpM2ZKYViEcgMeW012JolUHAp6Guf45 nzR7P+xtqztAJHn+mhZEFZ/KS3GRhZD2z5fLLmco0xx/mYm6OjtbHj3Ba1VqPnkZs0KaRP hD+nFBedcUQ+jqGJlCHjXefpYm41u+GvY48DpZGqvrA/jOI/ZojjrV5bBfaeiffHNqfLbR zmJCC7iThEfhVmXA/0BsehYZRykzqWPbKEOx19DR9ZyhUn+wO0mmLgVK1XiecK+Y3lYJ6+ xOqRsg+GpjsqXW8F253lhEko/bMhDIiwpXQahXHe9cYU6GzDLS7m+42tZ0XpUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771753676; 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=p5jL5Jy0l+sUSwxJYfgneBnA1e5WZ7UNfA3bzwuFouk=; b=WdijI/xXXwrLnmr6zHjWnv544t1hgUKXuWi0lpAMPvKQtoQ+y/FW0chjOxpXFnS5jDlZlb iUEFsvYtvPnNXYQwlN51qRqw4C3HIvMgoJ8u9ZIGHWgdXLgJA3Wlmepigb3gJxCNz8hKdA kljVZd1RGKLXIbIvZXTEDbxjYCFzkUhyQQbGepKM230eSAPrubOGb+pONnuYsgGVI7GdHL +akHSoEHMb/Ao6oRwSTn9GOrUqkb1+qbXvyeUZygf4830iOdWSTmeXGmD66GoKbTiQpyVL fnovzCbEYvynaytpJtXYz1HlpjKlqyu5Eimz9YarscfSOWyY5d7XfnTSpatKUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJfL41ydMzg7R for ; Sun, 22 Feb 2026 09:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27a40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 09:47:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: ea75f726c432 - stable/15 - icmp6: clear csum_flags on mbuf reuse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea75f726c432586632818bbcd84397ed126fd0a1 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 09:47:51 +0000 Message-Id: <699ad0c7.27a40.148bcb15@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ea75f726c432586632818bbcd84397ed126fd0a1 commit ea75f726c432586632818bbcd84397ed126fd0a1 Author: Timo Völker AuthorDate: 2026-02-19 14:15:10 +0000 Commit: Michael Tuexen CommitDate: 2026-02-22 09:47:12 +0000 icmp6: clear csum_flags on mbuf reuse When icmp6 sends an ICMPv6 message, it reuses the mbuf of the packet that triggered the ICMPv6 message and prepends an IPv6 and ICMPv6 header. For a locally generated packet with checksum offloading, the mbuf still has csum_flags set indicating that a SCTP/TCP/UDP checksum has to be computed and inserted. Since this not the case anymore, csum_flags need to be cleared. PR: 293227 Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D55367 (cherry picked from commit ada4dc77577f7162353e8c2916ba5c258b6210f0) --- sys/netinet6/icmp6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index f98381499b2d..9f2e44f3f6e0 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2133,6 +2133,7 @@ icmp6_reflect(struct mbuf *m, size_t off) m->m_flags &= ~(M_BCAST|M_MCAST); m->m_pkthdr.rcvif = NULL; + m->m_pkthdr.csum_flags = 0; ip6_output(m, NULL, NULL, 0, NULL, &outif, NULL); if (outif) icmp6_ifoutstat_inc(outif, type, code); From nobody Sun Feb 22 12:10: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 4fJjVM3fQ6z6T4dB for ; Sun, 22 Feb 2026 12:10: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 4fJjVM36Qtz3FwW for ; Sun, 22 Feb 2026 12:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JT5Yk5Tys8cUh3Zfw4ERx9s/sgmULRPGiaDgzfcIvM0=; b=oc3qYV90Mk1qSwXi+g/vpJ9VaecLzwX3i+QVG5G0roPV6soQVDkqt3TT/6y7L6OfxhZk6i pYCy0kuEp+1K3VXWSgquEz1sms2SpcqKw/rlLOlL6HeDRZFjQDo2+y1U3LxoP1xnL+DkCK 4JaNKXGLzqgoR7tRndyYS+FTYpgES/eEnvugL0A86E+SR9GZIY9pDBuckkC/xMXkBXGxXT HasR335uUkqrNj3yZtbZvRShOcQ6guSV66mzAr5yK5/vt3wP0XKm43Lr6ISeulmO9cQyfa cYKUc64gCPA+MNINuPE2XkJI3nzjxyIOYa4HanzYkRSeOJMhCQmMJlAID8k7zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762219; a=rsa-sha256; cv=none; b=P1SvOtXPGnp94w5YeWWwumjc80nDxgL1Cyp1ZZxTvH3AfHwgBRNc5KE/PQ0cnyuoAxZiW2 34ZGkhukbeGJO8qRR+GctzaRVkxWwod8T6HqZmvvP+/TsfA5zFOLdajQmT5heaHKE7DqNZ 1e+6xIkmc8YQAT8p4Dy1nQoop4BhFnS8D7ect64Dd0qVjvqqt2MnbiVnju2qn/pJA4vp2x YZlzU9xdrSRPg0HSVs8/dBz0fss8etEzCjOisdwopHnv9W7OURWpUPw9YYWsBi0gXNBzIV DVA20YSojMN4eR7Y53r3SNA+S+mfUYS4f0HxlZaNqZmEzjushOSBquShEX9Vag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JT5Yk5Tys8cUh3Zfw4ERx9s/sgmULRPGiaDgzfcIvM0=; b=bJyzO732OEXe3ALxAlAsO9mcxitcTtmQyHRbI+AZCq4zgnxooWi6fHSIsb4QgU/F/1XM6t c9AvjwbQhkbIpHNX/jD2bxArKimMJ251NlM4VLGSW/PpaKXKJRz7DcB+rxDuWsVukwsBkb kksXZDao/voQHKIUE9lZhs+Ren98eRa+wNriaRFmEcHJKF+3/+KSzviJkKEXbIpMcVvAbl 6jN0IUJsOawfudJgPbST+6lzTWsLojiaIYL+Je13XEf32ytmSjFOfCbCgZB+7FU6+fpRgu gvb/V5nPjGpYxvxZvrr2B/DdQickmIy2eiYiYYh+VyrHGTSUv0uhZZPEl+ceQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjVM2YgtzkLB for ; Sun, 22 Feb 2026 12:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:10:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c975f3b3a5e2 - stable/15 - libsa/geli: Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c975f3b3a5e286c1bc4cad60f72f1da9ea813582 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:10:19 +0000 Message-Id: <699af22b.3fb16.52b3c60d@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c975f3b3a5e286c1bc4cad60f72f1da9ea813582 commit c975f3b3a5e286c1bc4cad60f72f1da9ea813582 Author: Gordon Bergling AuthorDate: 2026-02-07 05:20:16 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:08:38 +0000 libsa/geli: Fix a typo in an error message - s/crypo/crypto/ (cherry picked from commit fa567fe7c537950fe48e35fa3b0827af4a45ec57) --- stand/libsa/geli/geliboot_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/geli/geliboot_crypto.c b/stand/libsa/geli/geliboot_crypto.c index 6cb47d5572c3..a7780471d090 100644 --- a/stand/libsa/geli/geliboot_crypto.c +++ b/stand/libsa/geli/geliboot_crypto.c @@ -47,7 +47,7 @@ geliboot_crypt(u_int algo, geli_op_t enc, u_char *data, size_t datasize, err = rijndael_makeKey(&aeskey, !enc, keysize, (const char *)key); if (err < 0) { - printf("Failed to setup crypo keys: %d\n", err); + printf("Failed to setup crypto keys: %d\n", err); return (err); } From nobody Sun Feb 22 12:10: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 4fJjVN4gdrz6T4dC for ; Sun, 22 Feb 2026 12:10: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 4fJjVN3cvxz3FvC for ; Sun, 22 Feb 2026 12:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tRf9lCGFNjlETTILfiHOC/J8/o1wZvzbiHNQ80aUJU=; b=QClsZ2TYd063Ro/m1UZDWmYTyUUEkIPM0nEV0MISyZvhm7aK9LYmUTu2moScEUT3i9eOXD hCu74fpsECh39sqbiSvnbdaO9+OxGsnf0IvjxyCE3gt7gpp2WgMCfdMEtcpddBMGiTjCxB jCYaMO+Qt2A8vNPp5GP633ugy61VK7qlIbPOWWILbGFpSboaA033KH/Ma5f750cPSUiBm3 uQvqyzL3dBaI7YimtZ7tr9exZzAzFLFHhHGEBWrzQQDtXMUyPUH/kKsa/GdKYbRgsv8xw6 BeXTFA2fRGRU+ujwjzl5O+ZmtjwDjqNayAENEUR3yauoxY1K9TLK7zOkUQpy1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762220; a=rsa-sha256; cv=none; b=Sq82iv/yxVjg3nwi237pqt09aUxbk7c9mFZkddaKCrGM7N0G+9rytbxy1GuhW1jKHeqA/U gaqXebp4PWSVc8dONrW2GPWskRIoK8uuNteRyYL9TPmhW3tWfmvEJQcj4aknLr2IbePaWN Ta+fr5pVHxNq2ka0JoRapWQxPf5XvrHf1vWP8YYl7W01TOlRuxNOv5bqJNOV3DqTeYFAPx pSACUVISvTOM0CxS4UiHrThcmqB311TQJyCs2xVW0ZnGcGjjPJKOwOxWlUzMcKwaNG2RR2 8qIs/aUkRaoLEZ53Zr3lxD/mhydkr7fS4VrWUDdowwOJaPbDcyQfpeVGuGjhgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tRf9lCGFNjlETTILfiHOC/J8/o1wZvzbiHNQ80aUJU=; b=cenQutOfq8SMr7kQOjSiVoINkgTuCLnq3nxUlRxqnqXCAd9t+qJy9QxUDBoF405zXgde2B m4u0afZ+qvGKXn9PQuXA6SHzXO5mX11MGM+s1EdxvyqNyAdtG4fEVGt+lRGTCnHqb8bLxm 7y0tPlkUtRlNEa/K96Avc2xXes6ZcLPzae78K4Fd7PT3w4qrDQD+v1Sgxu4GmyLD+pt9F2 0fUqE3s8xhrVuevma1qAPxQS9DbzSP8RDXZ20rrknRNqIKVIaq3f8xfVpousXov5gxHktF h+FxCUH3yuUNop3KOKux/KYTlPSZ3FL/qdukIAXmT30eWZ2G6ecNqmz4mlji4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjVN31LczkCW for ; Sun, 22 Feb 2026 12:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ea46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:10:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 81672edc315b - stable/15 - mlx(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 81672edc315b69413b19a4f7fc18a8fc4c9ab89f Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:10:20 +0000 Message-Id: <699af22c.3ea46.35eece71@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=81672edc315b69413b19a4f7fc18a8fc4c9ab89f commit 81672edc315b69413b19a4f7fc18a8fc4c9ab89f Author: Gordon Bergling AuthorDate: 2026-02-08 12:01:27 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:08:52 +0000 mlx(4): Fix a typo in a source code comment - s/segements/segments/ (cherry picked from commit 3e46676638ac089c71e8424961449895c0babcfb) --- sys/dev/mlx4/mlx4_core/mlx4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_main.c b/sys/dev/mlx4/mlx4_core/mlx4_main.c index ca63d1d12ba6..302b9d9cc2f4 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_main.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_main.c @@ -135,7 +135,7 @@ static struct mlx4_profile default_profile = { .num_cq = 1 << 16, .num_mcg = 1 << 13, .num_mpt = 1 << 19, - .num_mtt = 1 << 20, /* It is really num mtt segements */ + .num_mtt = 1 << 20, /* It is really num mtt segments */ }; static struct mlx4_profile low_mem_profile = { From nobody Sun Feb 22 12:10: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 4fJjVP4wQDz6T4pM for ; Sun, 22 Feb 2026 12:10: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 4fJjVP3m0xz3G27 for ; Sun, 22 Feb 2026 12:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnp5DBT7HlOkBxZGj58I7JczZ5ZkXtY1HYX9GsS+g3M=; b=BV68eVts5wli60BMoR1N+ub9qJ+kD4iCZDlkal014m6Enms3RVy1SIhyK3yz05XozSv5bt wPqf0ImiF5+bRBQU5nHDE82sBLYDXlmhIQuqaRHeJ51sCWHZ8t9dnfje1jMshW2OpVXi0A TXksgKZZX0GPblRnlcPWlweYnxvaxonEhjLhZeLCIaZDmKQ/yUe1pp+tOxjbFKw9rmueqZ y2eM6QbULwKLVCNxszXDeJDVu9nK0qvj2H1Hq6pGzzgYIqImXd+Da/zr05OQ8nzFQbC2Pw p53aTgtYp7TXT5vUbMmgeZFdR8kH3nGgVzr7G7xscrDCNOyi9opnuYZMfdp+kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762221; a=rsa-sha256; cv=none; b=UhFNOrSuwBWcpnlDh7xuwkQEA0NDC9Mjj5tyCRAnwGhME3kE34oCqZyZjuq03QTxeAIemJ 21IxVQb2Z6e+nakH3DSAMiJp4d9ZpZvybWytBYbe78jPT9x7GEDvU45Vh9OpwD6K5gohKr cB0jvUI6oHK7jmxABQQkj/C76utMLmsxe5lTEQXhZGauuW/b1Jnhb1RVb6Vf88Um1Cdh7y HjIjoW7tbbpxpN7PlEfJ1f0HfFC/A+En2tqQ1WKl2jYaKDaLPdMxAC+gAx+SLw7agqv2LM sQndzCDLmJ/PdB6qQ6N/JwFSvIoeLxW5Iu6tvYDVtXw4WoRC7c3LmL5rKPHrPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnp5DBT7HlOkBxZGj58I7JczZ5ZkXtY1HYX9GsS+g3M=; b=PQ3ZMRb2Qv/3/PkjBvoAjE7KS/ezEweFkuH9vwNcPZGUyZLb1XoDgFiyMBFRf/A7lJtvvo x1gEDRqWYdpgJpMPWdAFJ00ki4UO+NaGqQEJpD4cQT+wYXbT+bvyM6Pq4baILboItR35We XI2KNyUg4QS4+wEo8XMUwdpCEhOW+/WQDZWtmNlpNKRKixARMjmpxZEGZJ08y1hlNwqaYa lhydXMeRxb24lZDrwnrcpaDiJRBjFzcfvtHXWCMKXQQzgNG4TBv1/WMNC/AT0Frm6/sSt+ g8hRA7anmopaQSFMLEADGNG4EwhL0xX45W4qmLOBoe0qjFKo26LZNJHeiXIDfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjVP3L1pzkRL for ; Sun, 22 Feb 2026 12:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ea4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:10:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 76f7f0555809 - stable/15 - qlnxe(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 76f7f055580996304c0eab7911355a8061342581 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:10:21 +0000 Message-Id: <699af22d.3ea4a.7b168526@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=76f7f055580996304c0eab7911355a8061342581 commit 76f7f055580996304c0eab7911355a8061342581 Author: Gordon Bergling AuthorDate: 2026-02-08 12:00:39 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:09:07 +0000 qlnxe(4): Fix a typo in a source code comment - s/segement/segment/ (cherry picked from commit ff08ad36c2acb3553b9f585a9bd01fd1306bfd7e) --- sys/dev/qlnx/qlnxe/ecore_cxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/ecore_cxt.c b/sys/dev/qlnx/qlnxe/ecore_cxt.c index 6ace59ed68ce..153aa956396b 100644 --- a/sys/dev/qlnx/qlnxe/ecore_cxt.c +++ b/sys/dev/qlnx/qlnxe/ecore_cxt.c @@ -733,7 +733,7 @@ enum _ecore_status_t ecore_cxt_cfg_ilt_compute(struct ecore_hwfn *p_hwfn, * block in the ILT client. This is later used to * configure the CDU segment offset registers and * results in an FL command for TIDs of this - * segement behaves as regular load commands + * segment behaves as regular load commands * (loading TIDs from the working memory). */ line = p_cli->pf_blks[CDUT_SEG_BLK(i)].start_line; From nobody Sun Feb 22 12:10: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 4fJjVQ6TBTz6T4jM for ; Sun, 22 Feb 2026 12:10: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 4fJjVQ4QnKz3G8n for ; Sun, 22 Feb 2026 12:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jm5PuNTfv9ecw6MBq7mUzl4G6P/DCqPo1VCfm2+UyXk=; b=frIuEccXK74aGn1TVLS0gCtGbPqzDy/9iSZCxNSLvXUvBHN7pYb+hGGFdO2aW4Ses7eoO3 lwnAEZdgxFArP5+benSwhIG1s0LcnHYfyCRRauwcX6r5jDUoM0EEV4KNnD+MdP4o0MvV0K QOpHEhcBU1aj5llXQ5Rgbhwyh5IgiE1SS0lEe4wXoI7F4Vrua4itBDhrcBImw/3z5OdhPI cfnQn4x1u6KrRKz+shEyGEDYKwG4lfRV+9MR3IDQRh6bZ67md1Gf/0y5GCRfVF5z2OukrP UsEn0b253fBPPo7oFxaFIAX755OP9EsRZKTcFuQssb3M1wPKpAEO2/2Why3T+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762222; a=rsa-sha256; cv=none; b=IGi6A3lsnE3auENf91YvrPHN/BlYtI+BwgeKmJxDRNzWmqzW+MosxAZTbnT3VaIPIchJmA 7LGNoSlTn827NmCYNpCDM0OMMSx18GeynGhFe2dUA48tk9xvdKHnWDkn7veVURHHhB5M7r yr/eBrFmRBd1Hbvmrn1FPIjnUlOsiLCCpOwjxElY8eh+Ce4N+sSRNjqDu6X0bo+FHDGpbu fSZ0bj/uxT0fmmezSzeZWw3c5PhRWwWgrCxeFZHOQkyikeDr7ky9GunnF9JCc1VqQpugsX yYiV9zZ3dVdhD70/TYtH3o0Qshnjxt0xUSBRS7M5fE/wV1IoOcV9p3Ipatjyaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jm5PuNTfv9ecw6MBq7mUzl4G6P/DCqPo1VCfm2+UyXk=; b=DW+KeO9DlWiPC+AE1THndPZPQ2rGA2XJ5Qgv5gwr4/G+XP1GIa+YvwmtP2AM0t9mGX6Bw5 siRpstKBW8Eg9YemkC6SDAIazixxFX+9LWLWiwjpMkP288BHElSg1WGdiIoY51Hx+AY4cw BRvdbI+8n1yCpXg5vs7I8/+4AHJvzzavwRyOQKUxBXJcE1TJT2r/U/YDLmoqzsWXF7OVHk SOt4YeP5mpTyBOgrAc6GVFTSpBSvmBaPIJoW+EEb76modqZhfcGtFcGO62w3EyduXC++uz ZZlVuW7Bk2htrj62iBheRbBu7IlAFhZBB01tz4LAZQj9bMftYp3fj8LN/t63XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjVQ40FVzkLD for ; Sun, 22 Feb 2026 12:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:10:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c58658ef0d49 - stable/15 - kern: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c58658ef0d497bb99ba8a7443a05a5ab171eb7c4 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:10:22 +0000 Message-Id: <699af22e.3fe78.5aba4a26@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c58658ef0d497bb99ba8a7443a05a5ab171eb7c4 commit c58658ef0d497bb99ba8a7443a05a5ab171eb7c4 Author: Gordon Bergling AuthorDate: 2026-02-08 11:59:37 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:09:22 +0000 kern: Fix a typo in a source code comment - s/segement/segment/ (cherry picked from commit f87ab066722f3ffb19885ed501a7a136355340a2) --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index f1d848e95f18..7410efca4807 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1986,7 +1986,7 @@ __elfN(puthdr)(struct thread *td, void *hdr, size_t hdrsize, int numsegs, */ phdr = (Elf_Phdr *)((char *)hdr + ehdr->e_phoff); - /* The note segement. */ + /* The note segment. */ phdr->p_type = PT_NOTE; phdr->p_offset = hdrsize; phdr->p_vaddr = 0; From nobody Sun Feb 22 12:10: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 4fJjVR65w9z6T4dM for ; Sun, 22 Feb 2026 12:10: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 4fJjVR4rvpz3G4X for ; Sun, 22 Feb 2026 12:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Cumtpkyg5jDlfYhHZLp+ZU3DEvXxoq47wgfkCWxvSY=; b=XZF46lmXIkucUuszjjn32ESfp3C2mBqJmL3Ci9glzlGSdr3/Lomyys3YMajyI2AXm8rrqN mYMrQfotE4MNfi6b149x+6oU9gsjup/rGR7uRP099gn3oDVWl2+YUgNDbTagR0BRRkvZFC ZaqWSMGnvfnLdCHh3CKbsxIKHXaj+yUKviC8SjhMoIKyKlrtuFbhFs3/hyRcWgm++jiIer S4GYqqQHD12Ape/PadNwpFxgrIowxTi2PVmo8ZguOw24VNY6lafdAaqOTLQ8TK5vh5Wqej ranuTHM9qNVmx+vnVyJbC4PqenwVuli5llsvq/GzXilvbM5mNoALXkLRFHrMBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762223; a=rsa-sha256; cv=none; b=aVkXbimXJk/fEWA/7L2U9nsQ5jO35Lnj5SWc5+e1nlp8PYO8SK8pYiSiRPO/ziTnKAzIIj wLNQWIAhTmcWpOdt9Has7P4ThXDn+ZvIfNRrOM3rc3l1n4Gh4m0oRRdmRK5hjt8HFc26f7 gk9PA1NlYv2X1VA2FSl6cAM3Y0Y9cr7XZJ52cokyYHrGEwKyuDWmHFQ4Xt/cXJbDxUF7xB Y0IxXo2cfoa0XjnZ82rXwfZ6+PcH97f+ZzEKNXr+vUtoyoMyrdwoOsIbbl3cfrI+eJ7Tai +lkwNDh9qb/2dXmJAsCQ97zM8HjLg9RGSr81N9C8qlbJShoQfUKxiXjBl2xftQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Cumtpkyg5jDlfYhHZLp+ZU3DEvXxoq47wgfkCWxvSY=; b=dTa84htach1KYPxm8gyh05k6ihBzrjonywLIjzaK/+5r6HWh3R9hhs1IIxijMyRyr5XNze sW3Mqr7dOOSxgwUkbf8Ui/DLDqYiyR0KmXnnJOW9mU9InSNnIs1/UiGFdNNh4rSiBG+05H 65qzTt6uzibkhYEgsVRza7HWht6o3DoCa64NCP5w7T/Y8yh0+VbsFROEZgUpjJoU5nG9LA QxGiAbdU5BJbxlDO6eg6bcIWsTtVBGSyMeR0WTgPZojvlSm1I8wLR4DFlcey/2a3OGqxcX NS35VQmSB+YGcpbGu+SkuPR3HhoMfm4X5p6jgmMKCzXalmIccVa1Nst6JBlJhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjVR4Q0Szkg5 for ; Sun, 22 Feb 2026 12:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd38 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:10:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fc775e4f8fef - stable/15 - arm/broadcom: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fc775e4f8fef5b57cb71a0bbedba8ee9df2f93b3 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:10:23 +0000 Message-Id: <699af22f.3fd38.7916ead0@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fc775e4f8fef5b57cb71a0bbedba8ee9df2f93b3 commit fc775e4f8fef5b57cb71a0bbedba8ee9df2f93b3 Author: Gordon Bergling AuthorDate: 2026-02-08 11:58:39 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:09:38 +0000 arm/broadcom: Fix a typo in a source code comment - s/preceeded/preceded/ (cherry picked from commit 8aa4fa7bf9b36a873aa2fd3cc22e8e15b97ea81e) --- sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c index a4cbef7d528f..880de290d30d 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c @@ -419,7 +419,7 @@ bcm_bsc_fill_tx_fifo(struct bcm_bsc_softc *sc) } while (sc->sc_resid > 0 && (status & BCM_BSC_STATUS_TXD)); /* * If a repeat-start was pending and we just hit the end of a tx - * buffer, see if it's also the end of the writes that preceeded + * buffer, see if it's also the end of the writes that preceded * the repeat-start. If so, log the repeat-start and the start * of the following read, and return because we're not writing * anymore (and TXD will be true because there's room to write From nobody Sun Feb 22 12:10: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 4fJjVT0D70z6T4rY for ; Sun, 22 Feb 2026 12:10: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 4fJjVS5Dvjz3Fyk for ; Sun, 22 Feb 2026 12:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUO+ls2fzpne6b3pFf9qIVtDjrCClWp+OmB/5x8J8AU=; b=EvAWDbgo00vSyeWtAH1PMh8tuLpF5T1j1jMGo9KmLiiNsfo6KnUJtP/lQTPjUCV3s8fLcj gS1GHiIjPHNq4XQgPqrTBDxGlll6ty41OXEzc7/2bWijvifHbvi8XXqeRh8nAk3M3FghgA Mzh0auoOe2pauEGb/GvB0VPCI+5liMBtS32xR7svC2vxK6CrAZebFhpi1BCxG8Bl7QJSDS pdH79nI5wnr6Ab/7iLkHA3m4XH0mbERiPCWla+Up3bpPgVI6h2WqdDDSP6raKPTuH5P7S4 4NLkEGR5rcK3c4Qe1PjfuN6tZeWdKcOBU03UTFOPCaLv2iMwThcs5GXet/4iVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762224; a=rsa-sha256; cv=none; b=gZ6lF4E1VjzEAdBGyT4Y044UmVtqjOK7J3weeA4+J4HYdzlDyY6/dsVGQDzGZ6yzE80bDt LQDogfNu3gN0s0hN8FuJu5mJQac+EpO1Y5pbgyusM+haYYjhRSqEsixbIDR6ssWaaFtjjY nWdxfSUgMEmlza5G/WHa7MvaLn3KnOGfyzRANYtB03H6NfArYeeOtvMDuj4LBRQYht57FF cqJi3YMm7w0EclEB9yfH1abjENB6hFFDF2K9uU7EsuvaxLv16vOoXhUup8BHk213qWBPGH LN2uukV6UAemLlYnMF6TUFvEoTwzKNnF27sLY9NV3wENCcSi2a206x1AgNhJjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUO+ls2fzpne6b3pFf9qIVtDjrCClWp+OmB/5x8J8AU=; b=Jn8gF8TDlm2sKszxYszu9tjRieWpHZ1aJqG8dIOijpKwZhwY5abRciUWXEhAvHJPood7B8 9PfPSoxfowKVyIyRqPRzRhZqVAohL68cXTWTZTG51ROSQUkQgbATAljwevryr/r4v0dyiU fadr5sdIdvIkcIeu9/8NP9b/tOFqaMTYm5SDJTeKL8sbPGwDAO2qIrIHCUG1Jtr1IrkOYA 4cN6gQi6jlSEqEzXU0RP3NRd0t6CYY4NCx5GR9Au3bYAuUGzbhJ+s81MY5hUMxH5537g7D u9le9ehI4u3WPWXtmShQtVUdDbWV6Q9UnxJxGFsODyAVRe87pbGUjkcQbbS9Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjVS4n6MzkHh for ; Sun, 22 Feb 2026 12:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 402a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:10:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1d4fdd51dd30 - stable/15 - nfsserver: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d4fdd51dd309a7b01850d034777f976927d93f2 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:10:24 +0000 Message-Id: <699af230.402a3.48d53ba4@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1d4fdd51dd309a7b01850d034777f976927d93f2 commit 1d4fdd51dd309a7b01850d034777f976927d93f2 Author: Gordon Bergling AuthorDate: 2026-02-08 12:02:40 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:09:53 +0000 nfsserver: Fix a typo in a source code comment - s/preceeded/preceded/ (cherry picked from commit afe666a8db82c42fe0b8d55d3142c9d305d1bc28) --- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index cb8bbc45b379..845949b8f630 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4202,7 +4202,7 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp) /* * Parse out the address fields. We expect 6 decimal numbers * separated by '.'s for AF_INET and two decimal numbers - * preceeded by '.'s for AF_INET6. + * preceded by '.'s for AF_INET6. */ cp = NULL; switch (af) { From nobody Sun Feb 22 12:11: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 4fJjWK0qvWz6T4pl for ; Sun, 22 Feb 2026 12:11: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 4fJjWJ6vLxz3Hpy for ; Sun, 22 Feb 2026 12:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcqOOIEuMgWG1CJSNGsqpoM7/aN+oG5zpThWyxXAp18=; b=fvjTEbYNZtSkZqBX/2zd/ciWwZFjZFYZQhICRJkh+CbhLOzKBYldVNd++g0LaQVfVZG1KX 0JjY/3Y6P+jgKLXEunT+acpHu/Y16kZLRb9oP/pE63KS/qKzzStpoxCarcYKFndE0ikITW KE3YBmHKk+NrPkijmp1FLgtgsTsiLH1eE0szP65PYAv6o0s2Pur7PsTTBs0XP7yO8NQ4sC vQDYcMWb9ZdfORoOIhv6fEV0mscSLxsYGd2yl8E77mJ+B2vbadSIvlK9ADUIlCwkt3j6pI oTmlIkySk4J/tg4U/Diwz17fTMf3hz53zbFySyQDNJKZrFM03PnnaX+Uj9NLwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762269; a=rsa-sha256; cv=none; b=q311pdpmGIvCxvWK4GwuZ0JRb1289yM6zDAhk2szmY2J6cadcCW3+BedfeUESN6p+ZHv5U B5aZ4hPzE7YXMs3s2uavt5KhAQHsL7JUC04aEYIpkwHLtooaXnp3Fv5kN1LKRe8FLEKS80 EuEg6ag2/Ngafo4zN0JCW/UgDANVzxEOkQzCgNI0dEQpb1rzEXg0s6fzrhwFuZFGnv2Bdu h/ma9VE4D7o1rH0tkv/8QM6DFeRaKRzkkzbxLLIfgeYa0g4tY2RRznlFqBw79SUjs4VwnY oU5gmPs31XZTnDqaQwU5XQVWcGtIhOK3xCenfQ0KL7aOIPKlJVnL7qnjkn6Zhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcqOOIEuMgWG1CJSNGsqpoM7/aN+oG5zpThWyxXAp18=; b=LedgqS1SchNWzWBktJLiKaz2sKEzSOw+jrT8CY0KEfVp3jzcDmKgILjBc+DmZlNvbMtx1Q imQrw8V3sJ+Wi+vV+pbWup5hzy8u8ZL8/GJnBQPZEiyGr64iBR16m+7j2dsZF6cBCn068L 7b1soCGCfnbOERzi1coMnjlVH4LB22ZhB9kUMQe58JG7detPE2xd41RSUj1XGUw+Wdq81w JboZHxUPD354iLqi5XyLRSnGPNpu6DWbyeLCW3AvoNjEM1DvNpsHovAIJZFTopqe0Z/5pN 5tf8XBv/NSlv3cjubrPuA0b4unw5rEKBE6YNm3uRFnb6GG5WVx+A1beHJDzYQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjWJ6RPQzkgP for ; Sun, 22 Feb 2026 12:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eae4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:11:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1550f85824c2 - stable/14 - libsa/geli: Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1550f85824c23a135b1effc90fbfd6e67763eb7f Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:11:08 +0000 Message-Id: <699af25c.3eae4.728eb543@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1550f85824c23a135b1effc90fbfd6e67763eb7f commit 1550f85824c23a135b1effc90fbfd6e67763eb7f Author: Gordon Bergling AuthorDate: 2026-02-07 05:20:16 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:10:42 +0000 libsa/geli: Fix a typo in an error message - s/crypo/crypto/ (cherry picked from commit fa567fe7c537950fe48e35fa3b0827af4a45ec57) --- stand/libsa/geli/geliboot_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/geli/geliboot_crypto.c b/stand/libsa/geli/geliboot_crypto.c index 6cb47d5572c3..a7780471d090 100644 --- a/stand/libsa/geli/geliboot_crypto.c +++ b/stand/libsa/geli/geliboot_crypto.c @@ -47,7 +47,7 @@ geliboot_crypt(u_int algo, geli_op_t enc, u_char *data, size_t datasize, err = rijndael_makeKey(&aeskey, !enc, keysize, (const char *)key); if (err < 0) { - printf("Failed to setup crypo keys: %d\n", err); + printf("Failed to setup crypto keys: %d\n", err); return (err); } From nobody Sun Feb 22 12:11: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 4fJjX44Tkcz6T4jf for ; Sun, 22 Feb 2026 12:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJjX43vl4z3JJJ for ; Sun, 22 Feb 2026 12:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQpgRbr43HEBP809wKG+AeXQ16CRzeDQrIyY+/Pc7uc=; b=JioZGjCP+BR0qV3R52uxiLV7IRBhzK2BqU/Xv16u5dT+uaA77NZYRscOPJn8QETm8gCaVJ LE2Yo4thfdFPONBX88l7sqE2lp89eAFImlqfGETx4KnmIi48zd+Vjc50KgpTk5PY8d+gK0 91ZjRSRKXSX7zJK7omhwdAZgrjhoP4+WNoa3MCYe8HBYrEryjZWvbWP5QbSXMVmPcksZc8 jidD1LSME2MBKCgu9kK4Jct+hE8bD8zIfqU3LSMGO+B1uEtr53UOiHDJWcWk9t2lrBsFBm oIPImoazE0lQIWAn1ZuXZ/t4xquSiDdeMgyDbrrmAd7ple4XAHZxjgAi0JvshA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762308; a=rsa-sha256; cv=none; b=tJtu9AJjPl945UBiTcfMGs+zeLiAH9cyi8H6ecZYaiSv2s5BV/bARk8FdhQAU+pMzfiBOC pgTb0FGBT8Oi7i/9iyKgcwBwWNmdxfyLKKUOdQWmzzOH4yXD/Bc/5n83mZr9Dq3bKJPfzt kVfUPRnYqe1znR1fMCeDtIMdIDrFZiqIAkPA9pkxccIcY46e7QqjN6/sbsHzYHdflVkeVN YT7wMyXi75G6G4Q/qWUxaiIstZq4kaeAXUpBjOFjTAUEtxvNZywWkUqT0uGeA+jsmiD1wr loKmAJXg6GRLZSfs7LYC08FvRVXkbrJSYKDAx3NW2SEWfxoLJ1rb8F8SFyOOHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQpgRbr43HEBP809wKG+AeXQ16CRzeDQrIyY+/Pc7uc=; b=v05zsUGsmRVWAUgaYASvZKlLKeTpFfDK3gVIVY0abLS0Dz20A2V4P42A/Y4ZMYt4gbnC70 1k4P/gs7JMOUO2btcCWqnXw1jUT5AKGn0Svdp0cv7adjhV4dYeXwBwj2Y+nwY2NSRevXAC uqTe4u2i+LkGF6HJmlWEpJY2a5adK4n8bKW3qMXplg3mrMD+d2Df3c8QQt2QF9Unw2qNZF npPosLOKKg17xuvOEjRnWrFuLpKXYWFePBqEvrasTAiBf3jDwwbCpEs9NSzfwcD69QJPiS mgb4zjFQ+jrF6FHk5nlLQLTTmgj5I/Kf/Fks8oYTYHgLKrZaUhv/wkABeCMuYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjX43LmKzkrp for ; Sun, 22 Feb 2026 12:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4015f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:11:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a8947e2256b8 - stable/14 - mlx(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a8947e2256b8420e8498ff89f8ea16a7b68bfec5 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:11:48 +0000 Message-Id: <699af284.4015f.4fa34be0@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a8947e2256b8420e8498ff89f8ea16a7b68bfec5 commit a8947e2256b8420e8498ff89f8ea16a7b68bfec5 Author: Gordon Bergling AuthorDate: 2026-02-08 12:01:27 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:11:21 +0000 mlx(4): Fix a typo in a source code comment - s/segements/segments/ (cherry picked from commit 3e46676638ac089c71e8424961449895c0babcfb) --- sys/dev/mlx4/mlx4_core/mlx4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_main.c b/sys/dev/mlx4/mlx4_core/mlx4_main.c index ca63d1d12ba6..302b9d9cc2f4 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_main.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_main.c @@ -135,7 +135,7 @@ static struct mlx4_profile default_profile = { .num_cq = 1 << 16, .num_mcg = 1 << 13, .num_mpt = 1 << 19, - .num_mtt = 1 << 20, /* It is really num mtt segements */ + .num_mtt = 1 << 20, /* It is really num mtt segments */ }; static struct mlx4_profile low_mem_profile = { From nobody Sun Feb 22 12:12: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 4fJjXv3hRHz6T4xp for ; Sun, 22 Feb 2026 12:12: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 4fJjXp2z6Nz3Jdv for ; Sun, 22 Feb 2026 12:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWRRsAafB7us+Yq3g01R1JWZpxlSyPRny9Y0HuyFD2Q=; b=qg0BdQtSj0Fu0WhHPnyDl4gEnSdEG+ZywYybe2MR+/V9egjYrgnzWpKpM8emZQ0LmnjgYL cnEIZs93xTL0U1mmEgS0xJs5pfc1U4ruvg3KKr5PNIcBgMmZgmYWdWojRHWxhMC18x2jA8 +mE+Ygr6CzW+gr9vb1R/LqF52wY9Rgs35zhTA1lcv75/4n8d+C48cCcFJt6ROc5l2jgBWn erqLp2Lq+tVEPK7Mtg1fnfvNTfoonYZSKRFe+sf/oZxTErtV4JoP2o036b72psHlrSz7ta EvoRdn4n2roRn7d9bRFWNXzh3AJC2Ov846qEv6VBPJw+lDpqeOwA2gEH17RrHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762346; a=rsa-sha256; cv=none; b=pORgLksTd2F6dv2mZA4/Dbp/tJ6nV38xd5SrngE8/8j/pbplw7NQHiSaFuUBSsil2MrXZO +93dvd+mz2I/0PtAJLuMymMDsvkvG+ABbj4zZvvtskPH6d7+TkpUUOAwJZNoo+s3w/EViy uBAdMrK0Ojrq97Y7pjHmOD8fkJNyraZi+i3WuMZBG9R62RGJE6m1ULTyoZoAwIsVt1d771 1e7Mfy/NORQuPstN/93qj4sqGJaUKVERAF1iwKr0Prnzwp1GCuYRY3aPVEztQ/PvFZWVZm pcVDHugyptc8ZDjrSp3TPMKbNpnegreKqeJBc3w3/S+vCtKXPbxVjHgvoC0wRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWRRsAafB7us+Yq3g01R1JWZpxlSyPRny9Y0HuyFD2Q=; b=u7nX9cpRDOklg3ZFmi5hpIiEfYdd2MtXw6PrmLIUJvPPe9kN6XrjksVDbOPEuyPR4iJHQo ITXJlKzi1VDJhdphjsllo7SppPE2mnEAdA96st/Q3HwM8ePBexmQRAjlhDYxXcdqis7FBJ M3WN5DW1ICRkQVnpb4Ih1z8GrNb9wvfTCj2L2+Is/37ZpMFoTLhhY+HduJVVn3UdrDELD2 vC1ya9SSWA7SJ5pmLljqZRWphcnYlGT2wNorgV3MDQy8xo0myYLDveB42VeeyY1kRe+RY1 rGmvvI+VcVoXM6Azyx9qCYxKPE2qPhZRmAEUzZzJNBzjo6RG2AgRvE+3o6IN7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjXp2LjVzjmP for ; Sun, 22 Feb 2026 12:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:12:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1bada46ec13c - stable/14 - qlnxe(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1bada46ec13c2dd899e0a29515a6e0db41d20c4f Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:12:26 +0000 Message-Id: <699af2aa.3fd97.75aadb8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1bada46ec13c2dd899e0a29515a6e0db41d20c4f commit 1bada46ec13c2dd899e0a29515a6e0db41d20c4f Author: Gordon Bergling AuthorDate: 2026-02-08 12:00:39 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:12:00 +0000 qlnxe(4): Fix a typo in a source code comment - s/segement/segment/ (cherry picked from commit ff08ad36c2acb3553b9f585a9bd01fd1306bfd7e) --- sys/dev/qlnx/qlnxe/ecore_cxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/ecore_cxt.c b/sys/dev/qlnx/qlnxe/ecore_cxt.c index 6ace59ed68ce..153aa956396b 100644 --- a/sys/dev/qlnx/qlnxe/ecore_cxt.c +++ b/sys/dev/qlnx/qlnxe/ecore_cxt.c @@ -733,7 +733,7 @@ enum _ecore_status_t ecore_cxt_cfg_ilt_compute(struct ecore_hwfn *p_hwfn, * block in the ILT client. This is later used to * configure the CDU segment offset registers and * results in an FL command for TIDs of this - * segement behaves as regular load commands + * segment behaves as regular load commands * (loading TIDs from the working memory). */ line = p_cli->pf_blks[CDUT_SEG_BLK(i)].start_line; From nobody Sun Feb 22 12:13: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 4fJjYf12Y9z6T5Ht for ; Sun, 22 Feb 2026 12:13: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 4fJjYf00Plz3JrN for ; Sun, 22 Feb 2026 12:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LahaK1If8FvrkhOyDiFxcx7iBeqsVRP1tPLldtL4cR8=; b=I3jgo6UDf7nmFwl9DZRDwADRlM35NloxwbWnVriMgjS4MdPZqwuq0HvKtgNF1Shqz+mthe +IY7usw3JPNYQ3eeQ+Ihl4cn8NX/2s6Dmk+WNqhU+aMhavlCmSpZQ39XBnaofThJU09OE2 2ok2RjAhus2mgd0PzwqrSH/+jJ1oHar2McV7y2Q0jo9udSUBVYyXBgxFQ/rLOED795b5vV e0+jJ5Er/NN/lDBg1WdEmmzfRSTZQ/BcIF9/KeVINMZK/8O3Ah+kyTXj2oqGz4cAMKA0Rv VEVd0q8rgUkHG3cnHOvtvHXKJ/TK976svJCyW0nGHS5xGB2OurobpJfyBvK6qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762390; a=rsa-sha256; cv=none; b=sWqNi6fvbH/53kIldPr/pFCPGkjjD3oWhVMU1rCmt0peYf/8o1Wf6+Ijpnbl+WjD0YR9S+ c1wEgMaTWy8HYOziK60QYqIMpbGxU+B/3W5N9nlavdNW1MeClS2b31Au/DNobRZobVPxw2 TFlFjxPsalXEL0p4+nHJFYH38YOm9IbuVdUg3OG9OHRFsZreCk1glDMfinvcLrjZznoOV9 WaDmyBslNyN4bThbEbcQ+/CR5sxBb1bUItGccDoZ6NZ5aX/GLj3QqyNsDFpUDpIO7fUBc5 Com380nWiiniHEyxT6+W7QDbIuNt5c39OuzZ7RfIKxeueW/AJ0X/IpeTYB+FbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LahaK1If8FvrkhOyDiFxcx7iBeqsVRP1tPLldtL4cR8=; b=aweCYuZqlym4aoajh89m7EpRiua+FoqbuKR69MAgIwQqeOLB7eFPv7KM6t1QEyg2gQetp6 oZME8p8gIF0JyDSgMAYg3uBp66Ut6Ejn9ZWgrm8Feh3GyZUjHSqRwKsVo6d85Qi8uBMBrP Us1SVnsah8gUdsMvTDuPlFoBayJf1KbiYCs0IMq9J+TpXzvvJxbshHgraVZtB9QUgal7v3 3kUJ7kbM/Hx7SB1E/PpCoLLqtg76TGSZe5rjUHjSuo9dJtt0K+j3s499dMi7iX1849rJbw u35AGjgciyrygmsTLRswRr7WMhzTltkbwrWp5EpZADp4Y+ER7MCiuthJ1gXZJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjYd6btFzjmR for ; Sun, 22 Feb 2026 12:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4001a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:13:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bec15cbae4e9 - stable/14 - kern: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bec15cbae4e9ec0abda7452af454b075674a8ccc Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:13:09 +0000 Message-Id: <699af2d5.4001a.3fe8ea28@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bec15cbae4e9ec0abda7452af454b075674a8ccc commit bec15cbae4e9ec0abda7452af454b075674a8ccc Author: Gordon Bergling AuthorDate: 2026-02-08 11:59:37 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:12:44 +0000 kern: Fix a typo in a source code comment - s/segement/segment/ (cherry picked from commit f87ab066722f3ffb19885ed501a7a136355340a2) --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index ea74c07cbc48..a71359a929fb 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1962,7 +1962,7 @@ __elfN(puthdr)(struct thread *td, void *hdr, size_t hdrsize, int numsegs, */ phdr = (Elf_Phdr *)((char *)hdr + ehdr->e_phoff); - /* The note segement. */ + /* The note segment. */ phdr->p_type = PT_NOTE; phdr->p_offset = hdrsize; phdr->p_vaddr = 0; From nobody Sun Feb 22 12:13:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJjZV5nkHz6T5LL for ; Sun, 22 Feb 2026 12:13: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 4fJjZV4x90z3KNS for ; Sun, 22 Feb 2026 12:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bBaka+IavqMjVUa+6MjDfv3lDKtyk/ONHhgPsZ78d3w=; b=C/Y8ICDVGEhy9HcvOaRje3nxFppHKfiVbTJXfEq8Krg0CthJOxHz6YsqdqktRGtXKye5g5 F80410aEadxvuUOeXdne+azOsWpRVzPJHGfHNX6kgKwCrWTAGQDFMSulKM4ICG82fgYXF4 5Ds7RfcC5gmEkascYWX3RlFrcdlIPPpX71WOEKcAvu+CAMalhK9RpA6FTt6J9oM2RQvlRO fqaXRbLGJ8XXYAPHrJ6PXxl+ewvsfnEy/99FOgVW0X88x559ApPmHhSR1VNWE10WlKEC0/ zoChr1BHPlrhtfJUxLvdogNhurBE2ZpkZZGIDKvhN7A1bX1+OTRijeuj71WMhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762434; a=rsa-sha256; cv=none; b=FNp9avS8yzkcni8msn/MrKqK7odAVW+YKIHAHBDvQ4by9ebryEt0kI4KP2ugFWAtZMjoMG q0Tsuf2OMZSB/7qwus/WRUJ7vd7XWh63lY2a9BB97yIGlMKtLTUqluREOxTvUwX7Q7yq0X dK1vU7BydwoMb6zWT9G4Q7cS9/XcnwQSJH4YBVNXcVm+rR8TpDBr2O2UKMQ4AWLo4V488g cl3C8g6s6SC+jZpznRqtX+BxHwJJAusGlZ11+oE/+S5up0NKRkmKdQ34qW56i8utXZznZC +hkVoN7aly4sJ28QmgMoYuIbIW5sZu8J9HXdLOdn1Yh3cxUYAOwWciYNyKhCfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bBaka+IavqMjVUa+6MjDfv3lDKtyk/ONHhgPsZ78d3w=; b=o01H6K6x9CqAjwln7I3VbBUpoWxWc3IPiFuPaP/qB+uHQNjs52iACye+lsh8BaLjl+zzh4 ADKN5b4KTRKN8doOtv6ulOSUEv63cDvLBkhqlwBHDjoJF03IVi1l7KoA1KgH8SumfMLuwh 87ih9UPMGlL7qIH1c88rGgjCrAudNFzmluTCLOAOqxAsoWJ7V9g60FHC0tn9ajC9CVmG5v FZZr8vZbW4GICsOu55q6f0b6dl7RCANjN5Rh1ouxgTwhiVHkPtj0NyAizIlIw4pH2ea1tS EZd0zU1AZXp+2VC84PCOwCEhDk3ZiG1yCpw2pu1kb+u/9s2iytK6nQ27K4pVdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjZV4WVczkLq for ; Sun, 22 Feb 2026 12:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4001e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:13:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 01667ffeeba4 - stable/14 - arm/broadcom: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01667ffeeba441b26cef27535f10ba5d488ba0ed Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:13:54 +0000 Message-Id: <699af302.4001e.6098e6fa@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=01667ffeeba441b26cef27535f10ba5d488ba0ed commit 01667ffeeba441b26cef27535f10ba5d488ba0ed Author: Gordon Bergling AuthorDate: 2026-02-08 11:58:39 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:13:29 +0000 arm/broadcom: Fix a typo in a source code comment - s/preceeded/preceded/ (cherry picked from commit 8aa4fa7bf9b36a873aa2fd3cc22e8e15b97ea81e) --- sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c index 7d14a5c26c4d..c98d42eb82bb 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c @@ -420,7 +420,7 @@ bcm_bsc_fill_tx_fifo(struct bcm_bsc_softc *sc) } while (sc->sc_resid > 0 && (status & BCM_BSC_STATUS_TXD)); /* * If a repeat-start was pending and we just hit the end of a tx - * buffer, see if it's also the end of the writes that preceeded + * buffer, see if it's also the end of the writes that preceded * the repeat-start. If so, log the repeat-start and the start * of the following read, and return because we're not writing * anymore (and TXD will be true because there's room to write From nobody Sun Feb 22 12: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 4fJjbx4pYrz6T4kt for ; Sun, 22 Feb 2026 12: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 4fJjbr4C2nz3Kgw for ; Sun, 22 Feb 2026 12: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=1771762504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frcq7VQkvpkakQWNRxZY5ybd0KI+6HhmDCBk/9tbijY=; b=Hw47pOQwQ9Sk+FbCKmXOZwFdngaRbqFAMaQB3ztIXrmY8JZsa77YEOXssjeUwBzEcNpcRg DUCI9hmm45uHDhOHjCwdJ6w4f6YG1O+czHyDuuVG9ASlktYLgQtM3GnaUNXWng5NdU4bAz Qv4WEASs3DqPJ9G8RMM3KNCmBooTEOMLtvYG1Da2GcwsYRFXpNkgtKQVjo7vrZKYwptA4d RDx9MwCTB9utrFAuyfX/a5ItklI+s8ZS+vSibVvWQPY0x6EBHHpmGnyJJWjMLOViKL1qmg uJy86D8DWCFzwg5Gar6J4lzPQg30haOtQ96gJ3QtPJCQlrKRgOFpQrPbIr/L1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771762504; a=rsa-sha256; cv=none; b=Wvinpgc2i766D6oixxgqcRqbxib+ePVPlTd5QfwWtSVd4fwBobjuB2lysfrm8aJLHQ/c/J mD+5tHfE+Q0kLKIHsBD5hF8XSPzsmoaUQq86nnt/CfeP6hkqBDFbO4hvXFnHuIPcJwFK7f c6ydegpu/5Udx3/3vVm3VxQqcKcEviRXE/0kcGRAcIM/7qVt872QKglWli4CDjK3qeIrXU Eb9OcxKDdNKK3IMG6E56ZzBBiBXymT9VRcaFXSTw6dwysFisq5fPo891uElH9kwFPzw+RP T6aiO73b4pu9w4KQR/eeJcgE13f/RsoZn457GmqJA0xxiwdZuLTyQMVVjHxRSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771762504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frcq7VQkvpkakQWNRxZY5ybd0KI+6HhmDCBk/9tbijY=; b=Y4M0R8rdcn91/zd3d4Phf1BqgA8R485CAgWZ4wQ6bUkMZkfRX6dK2EClDfbrNFtZFLsS2A xcIMnATv5eKjI8A5c+x52mUhjATPXcVlan7U4bmabVddxVuT2gUM4HDMqqgQ/R9DJ0fLR+ C5LPjubKjtTF7KPgRRAYiTRKiEL4N3fXKN/FFNmCgYjMNtAeN21i25ddMVVJt93puzcYyp 1LCK0YXD8J1Mm47KwRdpG/jpuhR3M6vmserBnSsk30HkOpYf6OEVmZn6RGO+xdW4XkN/vW E3F+YHEMZ5f4D5kfUBtcuFTC9GBPQC3WClZOMSIHZ0a0ePtbUjyM3Vzbr1evJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJjbr3gxfzks7 for ; Sun, 22 Feb 2026 12:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ddc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 12:15:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3b57acd89410 - stable/14 - nfsserver: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b57acd89410235cce444948c2135e6fbfc9cb83 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 12:15:04 +0000 Message-Id: <699af348.3ddc6.336d2697@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3b57acd89410235cce444948c2135e6fbfc9cb83 commit 3b57acd89410235cce444948c2135e6fbfc9cb83 Author: Gordon Bergling AuthorDate: 2026-02-08 12:02:40 +0000 Commit: Gordon Bergling CommitDate: 2026-02-22 12:14:12 +0000 nfsserver: Fix a typo in a source code comment - s/preceeded/preceded/ (cherry picked from commit afe666a8db82c42fe0b8d55d3142c9d305d1bc28) --- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index ece924630514..cb957698bce9 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4197,7 +4197,7 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp) /* * Parse out the address fields. We expect 6 decimal numbers * separated by '.'s for AF_INET and two decimal numbers - * preceeded by '.'s for AF_INET6. + * preceded by '.'s for AF_INET6. */ cp = NULL; switch (af) { From nobody Sun Feb 22 18:51: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 4fJtPD5ZQGz6TZmY for ; Sun, 22 Feb 2026 18:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJtPD4w29z47Vc for ; Sun, 22 Feb 2026 18:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771786288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1Jfi9O728py7TGAI3on5x4PmW22yI6nUucDMXIZgEQ=; b=yBHKbnAQx693Lp1fU/UsUr1MJRW6pp2kRBNEPP1JVB5fDGGyKDeTPt7K+Y6NLc7R0q0ank NXJyHUsinRNPn8894Rdxz4PRHoGJZEt4Qlx11L/KWYS18+UDy1OoXxFcBaPIgq/u9mDns5 Jul+Kb1vlUrEZe4YTrZzrbjprarzXx5/zhxG10qXp1HMYHf9QQ29XVgaSTgLGlquGkQqNh RllJIoMYilVleekpkXpz1xHna5nE2Q0YoGVfsTJZJA/MNA3u9SgbFAAYnCBmE7hqOYV7Ld pOlk1e8aT6rxJ6gJSItgFvorYuUp3TBfEcRygecTdWnbyfgukfcu9Wjtbbe4KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771786288; a=rsa-sha256; cv=none; b=P1XF/OrRb4xVwfP8tqfBRLwaQvcfb5+k04MganrTulr8c0yvzdV3XZETLZ9PK8xNd5oIlX IIpL2sfmSW9lhu4Yglj9/b9c+uHg3LPMd0PH9yyPVacWd0WydWQ6xvzR3jCrEB7yZ18vH6 THCIz7j1mkfYcfPez8m1gwOJz4ifSnDy5UBg+nmNkzUu80ydYgpJDfe24GXszIxqmLh8/P P/u+1cRcnvEfbcBMM3ExNuSEqPThGiebONZ7mVQ8iU+I+waV2e69gF8D4rK57rwMEFPYxt uBVx6dFfq70MXwf4Q272CUExPCuhqOxCUY3jcN4+w1l1SbvbOSQfmndfmWz8Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771786288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1Jfi9O728py7TGAI3on5x4PmW22yI6nUucDMXIZgEQ=; b=GS3LF8OCkioMfjNsjh5Gcu2yg1MNO0zecrmFuNdrLAZ3ev3wnW0ZDXNQpnldKAffGAAhgi 0FVTxXUzzr1b95I0ycTj1EEOcXNl/5ycKKASciqnUsWMXNPU091j+Ttmb/+SeemlBp34Q4 nRrQOQsYcnRLI4Av+4nk9DMwjhV/5oROeGRnR+RVRoFtpB0dxE+35ljfegINhn3f3atRjx NXEYA3TFbPb/E3+ieT1pt4Gg891R4YYHyxp6Zs7cbysV07w+tPoFzEhzSW7k8MRFfe5aaU fiy66KopqJdbA5U3yTXaSHLvSOf2sNl6RPp2x1p0y/W9gA2PTB8SJBGcdv7kjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJtPD4TCMzx5y for ; Sun, 22 Feb 2026 18:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 416b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 18:51:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: b49d30adb87b - stable/14 - asmc: unbreak build: add missing curly brace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: b49d30adb87ba1442812e80efae1f9ab297f204b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 18:51:23 +0000 Message-Id: <699b502b.416b3.4dfba726@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b49d30adb87ba1442812e80efae1f9ab297f204b commit b49d30adb87ba1442812e80efae1f9ab297f204b Author: Enji Cooper AuthorDate: 2026-02-08 23:51:51 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 18:51:17 +0000 asmc: unbreak build: add missing curly brace Fixes: d76bb14e022 ("chore: asmc: additional style(9) cleanup") (cherry picked from commit 9ccdf3f36e014f0060ea192ffed91a7679003355) --- sys/dev/asmc/asmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index f2c42ba814e2..b6b98b1c8953 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -1133,7 +1133,7 @@ out: device_printf(dev, "%s for key %s failed %d times, giving up\n", __func__, key, try); mtx_unlock_spin(&sc->sc_mtx); - else { + } else { char buf[1024]; char buf2[8]; mtx_unlock_spin(&sc->sc_mtx); From nobody Sun Feb 22 18:51: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 4fJtPR19JMz6TZx2 for ; Sun, 22 Feb 2026 18:51: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 4fJtPR0KKwz47Yg for ; Sun, 22 Feb 2026 18:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771786299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHnxnWujQ2lCR416RRNYOrrqLAYUEijINXAUHFa33SY=; b=QJGUGGNYEJpXNKd82OzjS+6ars9X+IOMdBS19neg/smgtu6WnDywmNnJMj/FtUkp9O1wou X50omjveLTbZi+mUIrGTQ/gmV+/SQPfVaD+FoVc9+werW2x8iONavEWpH/lMhWM/VAPnlh gTizMkbpjfG2k207lWh32sVEPc+dIP9vV5/mhRvZ8gtAss0YKyMpa7YxiAjqAu3oDr4WJz 981r/Qcv8RSnG6JyQHofRCvaApo8Ch0bGPb8E9QXPhGtdr9jWoVqNNWnespxJ1IfIbI651 oZ/CFpNpspjSL+jqMESeDPvFwfc+MluDKfOe4sCBC5jMWUDxjs8aYeW8LjRrVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771786299; a=rsa-sha256; cv=none; b=usG9fWGnh28IyTqYofT993sijHuj8EzMSqNZquZ1oGN2ZDEQN3AnwkP+r2iLMLbv4ORQqp 7tipO44KPs7MNsJ4vm5ovDlbK6UgYJ9H52dWlomOsdPfBIhCqoXAIh3mT9t8HAVh8FcS66 ixjQBRanWS+Yjl0W57BW1L9xg6wVLnxzgY4ZSceLem5xvv9UJStZJ/U9nnhIRZneAxhtMh tDU0XadNOvuHL23O8tPDiutBvgUuLVzMR9XuKhZ0NtCj9WHbqWgczppBlihLmJrlU//dYI Maecr8/S84oAPzDIanGti9Udr906tYMcqEi1GegiYkoDAVze33/wng9uDKuTBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771786299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHnxnWujQ2lCR416RRNYOrrqLAYUEijINXAUHFa33SY=; b=JwYgNXvXI0eUMFWm1KCrQc1T6NMOTS8qQX0bTfKA7hbJ5Lsv62b7kFJE8nUC6F69/A1PB5 eF6Um2BI5XsDxCepRimYnkkQTXwfgeqDJ9b2qVTaf4SOlMAFea+sgT6Ht5fC90AV6H9odZ dQNvXUj2vS+dE55Yd1c+1nVh6ZTJu1J8QjmgeKQ/EuVRcP7uoWqbvA+gF0CwbmItuC7l1v 8//sT4kWsmLocu9QiQf2gsdM9+x53i6ZN5ZKLRJb8JlLoeH/joxSA5OlEsVPQvD+IbZjY7 vPxFfxnS3UpqsPh4k/kxa99e1LXeeuJgCh3qijblKbyFg1U6B9Xdow1JChfsPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJtPQ6wd2zwrL for ; Sun, 22 Feb 2026 18:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4172e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 18:51:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 1459b69f0482 - stable/15 - asmc: unbreak build: add missing curly brace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 1459b69f0482df6bec0fbbb1b84f3f8e0f1875d9 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 18:51:38 +0000 Message-Id: <699b503a.4172e.13dde15d@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1459b69f0482df6bec0fbbb1b84f3f8e0f1875d9 commit 1459b69f0482df6bec0fbbb1b84f3f8e0f1875d9 Author: Enji Cooper AuthorDate: 2026-02-08 23:51:51 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 18:51:33 +0000 asmc: unbreak build: add missing curly brace Fixes: d76bb14e022 ("chore: asmc: additional style(9) cleanup") (cherry picked from commit 9ccdf3f36e014f0060ea192ffed91a7679003355) --- sys/dev/asmc/asmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index f2c42ba814e2..b6b98b1c8953 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -1133,7 +1133,7 @@ out: device_printf(dev, "%s for key %s failed %d times, giving up\n", __func__, key, try); mtx_unlock_spin(&sc->sc_mtx); - else { + } else { char buf[1024]; char buf2[8]; mtx_unlock_spin(&sc->sc_mtx); From nobody Sun Feb 22 20:23: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 4fJwRF6L43z6Thmx for ; Sun, 22 Feb 2026 20:23: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 4fJwRF5WRjz3KPk for ; Sun, 22 Feb 2026 20:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771791801; 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=CRN3llJngW234ipXiJ8fEshiCxUqCSfQLzvXCSw+nt8=; b=hrqi+Yf7h7I7v1EN8vfvJc1xGWPqHJmsbFOB2jPZHN2gpGeqYTKfJL+4UJt6dtlg8FcxE7 Wz7dsoxsJ2tDUGcj1TGlMehmxEKV8Nfv68V3SN6mKNZLSVkRNU1VxYf+xIcr2Lq7aQ67xJ 8GpP3nhC8sNju40YK6jtR/oS1FdYU1hGRHvfu9XJzy733PiIhLijrLMdT5IWi+xLvdP+Hh VnTqLLzXTLcbCoyMizHQQiLWBFlScmp6CUzUYJO9VX6KT8duDk4KXB+zb/8xkKi8XHi2Jw y8hQG/2kvmDCLfKP341bYOF80vSIR5Xzn6rg9E3/T7Qb8ueUO9MqqTE36TKfGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771791801; a=rsa-sha256; cv=none; b=eHvr81kHOh2/2lHjCxlVbliYNLAAYcWy792vJbuVQnmQSw/n1MSZuBcgxY+zXYnE8x3PS3 gWAU1WAWony1pb9pOl1zaokMkroU3MxoWvZ4yYd4VWvM8SKE8rbuVXPj/n5eIEjI1VIqSq D3MGWNMv49RqcrX+cUt2fcd/oDC5ZNKiCAaDek06MIaT2aMUKS8IodFNDX7lF7+Sz+3dnX Gp/40y45vAmL9gz5wFhCfNQpjXInDSth5UgxEtWsS/B31mjyzQrxKR8yNOAx/d7qrX7o7b w7Eiv+GbRnLgX765CUwSjL9wfKcXXQ9kFxtYd/wv5FExgxOz+swCn7Hei2NE1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771791801; 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=CRN3llJngW234ipXiJ8fEshiCxUqCSfQLzvXCSw+nt8=; b=g/TnvxnJeQFqzPK/IsVatAnMDwFccW6XWxgcV0TjuVrST57yykQPX4ifMyLMxMb9LYuHsa 4Z2+JU1ubd95EayIL+jlBe755tz3iWBFUAZXVRWrlT98xlSGIw8YHoq3MIqhR5dlO3iIV+ nhAsrQHca6bsfaf74Av/Vrk7LboAG7Bn/+Gx9bgC1ASNMiU539g8LjlQjJc12IXSfRAECl H7m3Iz2QP8N4fjY+r17/CVdfsR/nqYdlAyuqY/YOciUuf8hL3uHbGsiZV1aUrcAucc1v3g zlwV4FlnRhcDh5sBMyHUibStIDsE0i/nB8aZS8nPcwhiYscrqmyrnZFjWg+7pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJwRF50HNz10P9 for ; Sun, 22 Feb 2026 20:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a917 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 20:23:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Anagh Verma From: Enji Cooper Subject: git: 64633a533e71 - stable/14 - kern_syscall_deregister: document syscall 0 no-op 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64633a533e712882d86a1afbbe49ff7b8990f525 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 20:23:21 +0000 Message-Id: <699b65b9.1a917.4c6d7d9f@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=64633a533e712882d86a1afbbe49ff7b8990f525 commit 64633a533e712882d86a1afbbe49ff7b8990f525 Author: Anagh Verma AuthorDate: 2026-01-06 07:42:56 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 20:23:16 +0000 kern_syscall_deregister: document syscall 0 no-op logic Document syscall #0 being handled specially in `kern_syscall_deregister(..)`: it's a reserved syscall and not dynamically registered, and hence does not need to be deregistered in the function. Co-authored-by: ngie@ MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54326 (cherry picked from commit f384784289dba13b90138a89d3df3a8ea063aff9) --- sys/kern/kern_syscalls.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index e330f8a2ba09..2dfe162f6c2e 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -162,8 +162,14 @@ kern_syscall_deregister(struct sysent *sysents, int offset, { struct sysent *se; - if (offset == 0) - return (0); /* XXX? */ + if (offset == 0) { + /* + * Syscall #0 is reserved and is not dynamically registered. + * Treat deregistration as a no-op to simplify module unload + * paths. + */ + return (0); + } se = &sysents[offset]; if ((se->sy_thrcnt & SY_THR_STATIC) != 0)