From nobody Mon Oct 20 02:35:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqffb0Vh3z6D11R; Mon, 20 Oct 2025 02:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqffZ6skvz42B0; Mon, 20 Oct 2025 02:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760927719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oMePEV6N1FnVLuM1EeIkHgUTcxeNHuHyEHIGrqWrrw4=; b=v+RfqIiiDCkAXxUERtT0s40tIGG4EGUssBbj5aSII0wcJd4Bq6rTsgppljFR3HSeXJBHRc a8h7mXW61Km2c71kaUw2VH8do0M6I+TlQxdCThvtJlGiNUjxKXsZ0MSYyW43MgNAeTRIKs 6n+ELyUd0zUFpEQp6xSU/iebUlOs4MMRWSDqiAGv0kJKFwtvX7gKV+6Hc37PpCwaqRJpN0 QTFDlEbXmLUDTmTjFRW6rk4QOJbmSxExNnsR7mGtK+3y36viK12ZLZdMW75/ouwplLLuWR f7soBzUrh64i+sa5ttvqrD3aiNQOqyj1CVUk3n1HVJzZ1yGRDSyh3B0bG4SpNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760927719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oMePEV6N1FnVLuM1EeIkHgUTcxeNHuHyEHIGrqWrrw4=; b=s/z+rcljbIS1PwK6xXe/GPLv9SA4G16OMYjGf0bmVmF0JPYv0mXWvqPH6FMnytg/YZoUpU 9QCl1K7abJ/egmD4KHbz+TbIOv6W2RIBfpu/QRHhUVJ87yvxxfb/4AJ0MBhiJ2vwaJlXmd Cq6NU8fq3OZAxm1FydTLDuDYZbjyh9iSMT1ZVPDi4WuTW1WXHK+zlN6yZ4uNV4ee9H7RY1 rb36PKe0+/DQsX5LIBdP0aTrXBf9levq9upjkDhGVTgDl6T3Q35Nn7DF8LwV8pAsDtWlt5 Q3y/cTbqa2ZgcMAZ9f3qoqHId67XoeAfuFs66FOpfNUp127K/aymoyi2vfZhWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760927719; a=rsa-sha256; cv=none; b=lfrf6ZCVxd2EPrnfBV5zZDe0oHD5tK4rsnm9/+EGt2G0kwWb7+ch1P0N4Wq+o94GN6DQPm FZlIM+JZsh0ikdBxy+2bLR8yFABCitgJBAQxlYQUdvNRBwEv5oFfsfpaSx90Kq+t+MXrDT rgPDOE7Lr06iZjqAS/oP6iJ5o3dRRQyq28kgQadeFTi4laQYwOUwpl78yaQF/XC0Ml8jUZ 0OnaGtR7156C2GIhmA9r/X9D/GYE6zresbb6+PM5cXPWTOYrB0kUQSd3GVp/8eVX2FZeaV bMgtQEk12eiLOrDKd/v9MIJC9eNi5mKXj/a5HOPAXuS8koboObw8s67r5wiiAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqffZ6PFszv87; Mon, 20 Oct 2025 02:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K2ZIIP091886; Mon, 20 Oct 2025 02:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K2ZINV091883; Mon, 20 Oct 2025 02:35:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 02:35:18 GMT Message-Id: <202510200235.59K2ZINV091883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 2f461ddd784b - main - geom: fix glabel status not showing components List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f461ddd784b4abdb7f88701d20fc45f658c42f5 Auto-Submitted: auto-generated The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=2f461ddd784b4abdb7f88701d20fc45f658c42f5 commit 2f461ddd784b4abdb7f88701d20fc45f658c42f5 Author: Brad Davis AuthorDate: 2025-10-18 00:31:12 +0000 Commit: Brad Davis CommitDate: 2025-10-20 02:35:06 +0000 geom: fix glabel status not showing components Also fix some typos and move a couple NULL checks earlier. Reviewed by: mckusick, Johan Söllvander, markj, kevans, adrian Fixes: 0d4642a67e59f8da5e00a05001c342bdad2a806f MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53180 --- sbin/geom/core/geom.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 1a4f7e1f061a..2de696ce6a43 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -1189,10 +1189,11 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) gotone = len = 0; xo_open_instance("status"); LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { + if (cp->lg_provider == NULL) + continue; + cstate = status_one_consumer(cp, "state"); csyncr = status_one_consumer(cp, "synchronized"); - if (cstate == NULL && csyncr == NULL) - continue; if (!gotone || script) { if (!gotone) { xo_emit("{:name/%*s} {:status/%*s} ", @@ -1206,14 +1207,17 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) xo_open_instance("components"); if (cstate != NULL && csyncr != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n", + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", len, "", cp->lg_provider->lg_name, cstate, csyncr); } else if (cstate != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state})\n", + xo_emit("{P:/%*s}{:component} ({:state})\n", len, "", cp->lg_provider->lg_name, cstate); - } else { - xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n", + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); } xo_close_instance("components"); gotone = 1; @@ -1224,7 +1228,7 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) xo_emit("{:name/%*s} {:status/%*s} ", name_len, name, status_len, status); xo_open_list("components"); xo_open_instance("components"); - xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A"); + xo_emit("{P:/%*s}{d:component}\n", len, "", "N/A"); xo_close_instance("components"); } xo_close_list("components"); @@ -1258,11 +1262,11 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) } gotone = len = 0; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - cstate = status_one_consumer(cp, "state"); - csyncr = status_one_consumer(cp, "synchronized"); - if (cstate == NULL && csyncr == NULL) + if (cp->lg_provider == NULL) continue; + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); if (!gotone || script) { if (!gotone) { xo_emit("{:name/%*s} {:status/%*s} ", @@ -1276,14 +1280,17 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) xo_open_instance("component"); if (cstate != NULL && csyncr != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n", + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", len, "", cp->lg_provider->lg_name, cstate, csyncr); } else if (cstate != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state})\n", + xo_emit("{P:/%*s}{:component} ({:state})\n", len, "", cp->lg_provider->lg_name, cstate); - } else { - xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n", + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); } xo_close_instance("component"); gotone = 1; @@ -1294,7 +1301,7 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) xo_emit("{:name/%*s} {:status/%*s} ", name_len, name, status_len, status); xo_open_list("components"); xo_open_instance("components"); - xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A"); + xo_emit("{P:/%*s}{d:component}\n", len, "", "N/A"); xo_close_instance("components"); } xo_close_list("components"); From nobody Mon Oct 20 04:29:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB10gY0z6D99V; Mon, 20 Oct 2025 04:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB074M5z3Cs5; Mon, 20 Oct 2025 04:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0mHy0AWxPnvuEjCnZOShUqCqJik1EcnROJhcYUoj2I=; b=NL+rSQEDtc5rK6WvU5Eru2KKsL4+nQsOI4YLjwJc5kqcDIdsyMCG64pVXqgDKOqrT0O3xP ab0ey40UYZaf1+FmMVn4lKHS2vIV7pWHyYhiOzXlXrD8RHzwi2uig1ONFTGXnD5OhyQsKy BWH+DjgwVAwMah1mB07nramWoF+WgnEd276q+9QAvikRw+GJWM3BzkmgVuUFl72yYpdUez 7lizV0mxk70sSATghQoU862oc8bgIV0rGH3WADCOufLjJRAh9TqnosIgPLtyP8tsrlswFZ KdIz3MVkR77yRL+Ks8g6d7ZIj7k+I7saOPPJRFV73tP4TN3XCdpW+eLF2y+YtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0mHy0AWxPnvuEjCnZOShUqCqJik1EcnROJhcYUoj2I=; b=yssr7ylr86bXsYoERzlc0LMedWi4Zsv8nreeJMjy9cVhrq/pOuRatTZrmFc/vcUOEvLbXu LzWNYiiDZOz8apVgqNo7ac1PVqiGyn4N8tBWZB/BSu3RtCU6omRhgfkU6BDaO+a59v10BQ ghaYP9/k2mg8ni6zgXTlvF3hRIYEy7ILasgsBeGqdhSWNLXqgHL+gaWUTVot0yltnsfbDq hIYLc3eLbhRidC3pe757G/1/K7UrX+w4JXc3KMzZTnI54lD/gro3LIzXNNdBFzR3CivvWl 2PMxcWdLJ7FkE5tm7vHXpvNUySRz+eE6HCQLCHC64tO+zSJKoXyUysLzeWU5JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934553; a=rsa-sha256; cv=none; b=Y8C/Qmxi+i4ZeH10UextbfNFa30jmYp9ufwTLLLmLRyQyZ/rdphJtEiQCzyI7hYlaV3+ZN Mx9BUjaXhpKuiXZvDyc2c37/X6aZeZ77Ohia2QzPRLFLjX8zXZoBCSxZ979m+gKJOGJ+Ys O7EFl9sooC6PNCaUvk8LejmnTZdJfg00Jj0cbTvFoGJYBYtVmTqdC/AU2SOKQKT3QY8jlE EU/mVXhNGsyTr1mGWN1Q/SJ0Dazo7m2F1vEzBJbAWPlVcHaWVIrAxor7AsnAW/d+bZrBwu WG20oQ6khUaZMLihJw2k3doBlIJXoDWDrRjZw4acAzUaFUXJ4wsQ37W9gl5aww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB06byxzy97; Mon, 20 Oct 2025 04:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TCi2001835; Mon, 20 Oct 2025 04:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TCqI001832; Mon, 20 Oct 2025 04:29:12 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:12 GMT Message-Id: <202510200429.59K4TCqI001832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 790c27317ec1 - main - linux: Make the macro LINUX_IOCTL_SET public List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 790c27317ec1a997a4e5c2bdee9e4acc610c8e3c Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=790c27317ec1a997a4e5c2bdee9e4acc610c8e3c commit 790c27317ec1a997a4e5c2bdee9e4acc610c8e3c Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:41 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:41 +0000 linux: Make the macro LINUX_IOCTL_SET public There're some other drivers want to register and unregister linux ioctl handler. Move the macro LINUX_IOCTL_SET from tdfx_linux.h to linux_ioctl.h so that they can also benefit it. While here, rename the declaration of linux ioctl function to be consistent with the name of the handler. Meanwhile, drop a comment about the macro, since its function is obvious. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/compat/linux/linux_ioctl.h | 12 ++++++++++++ sys/dev/tdfx/tdfx_linux.c | 2 +- sys/dev/tdfx/tdfx_linux.h | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index ccc25bc919ab..8345b7e4b719 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -823,4 +823,16 @@ int linux32_ioctl_register_handler(struct linux_ioctl_handler *h); int linux32_ioctl_unregister_handler(struct linux_ioctl_handler *h); #endif +#define LINUX_IOCTL_SET(n, low, high) \ +static linux_ioctl_function_t n##_linux_ioctl; \ +static struct linux_ioctl_handler n##_linux_handler = { \ + n##_linux_ioctl, \ + low, \ + high \ +}; \ +SYSINIT(n##_ioctl_register, SI_SUB_KLD, SI_ORDER_MIDDLE, \ + linux_ioctl_register_handler, &n##_linux_handler); \ +SYSUNINIT(n##_ioctl_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, \ + linux_ioctl_unregister_handler, &n##_linux_handler) + #endif /* !_LINUX_IOCTL_H_ */ diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c index f3410106bad2..777144d21bb6 100644 --- a/sys/dev/tdfx/tdfx_linux.c +++ b/sys/dev/tdfx/tdfx_linux.c @@ -42,7 +42,7 @@ LINUX_IOCTL_SET(tdfx, LINUX_IOCTL_TDFX_MIN, LINUX_IOCTL_TDFX_MAX); * Linux emulation IOCTL for /dev/tdfx */ static int -linux_ioctl_tdfx(struct thread *td, struct linux_ioctl_args* args) +tdfx_linux_ioctl(struct thread *td, struct linux_ioctl_args* args) { cap_rights_t rights; int error = 0; diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h index b87cb41f38fe..9d012c12274b 100644 --- a/sys/dev/tdfx/tdfx_linux.h +++ b/sys/dev/tdfx/tdfx_linux.h @@ -35,18 +35,6 @@ #include #include -/* - * This code was donated by Vladimir N. Silynaev to allow for defining - * ioctls within modules - */ -#define LINUX_IOCTL_SET(n,low,high) \ -static linux_ioctl_function_t linux_ioctl_##n; \ -static struct linux_ioctl_handler n##_handler = {linux_ioctl_##n, low, high}; \ -SYSINIT(n##register, SI_SUB_KLD, SI_ORDER_MIDDLE,\ -linux_ioctl_register_handler, &n##_handler); \ -SYSUNINIT(n##unregister, SI_SUB_KLD, SI_ORDER_MIDDLE,\ -linux_ioctl_unregister_handler, &n##_handler); - /* Values for /dev/3dfx */ /* Query IOCTLs */ #define LINUX_IOCTL_TDFX_QUERY_BOARDS 0x3302 From nobody Mon Oct 20 04:29:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB21Dlrz6D9Pb; Mon, 20 Oct 2025 04:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB20fNvz3DCX; Mon, 20 Oct 2025 04:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAgWT00uP7+ubUtl/STwGG2WSW30j4VqWtOxWMJsOws=; b=FQEDXOqDBTlfbabXU4y2fYrRGIZDiZSn6xgkR6Vq+8uSBHCbbLmKYX7WBlAiZd0au57xAG nWaDRKIbLbMygGIXBTE9hmYF0z9jZDgHTnphMmkwKiiLfEWGRbzr+UgOcJFej8wz8iLFgv SRYB3bA/R60cHTSsd8JTHDOdgocfXcLAKSmS2Ko/5fB3ujOact9gR/sFBOcZy/OLvQgDWE jGE8blsRzd6HlxNa99i0CpxTpwKkIVp/DZa+JnjiCIcQcB3vU6f0ikvCoh2GLAh/Q8C5uZ r2Pl0yGZynWDdRZgasJuB+UTtwYVdPmLCvJhJBnWbSlOKZ2LA0SV3PfuoJdSeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAgWT00uP7+ubUtl/STwGG2WSW30j4VqWtOxWMJsOws=; b=HSY26CqpZy6wuOSPL4F1YpsfnIZicTjW2sCGjG/JnB1Hd5akja9u/EpkBEzsNICfmc5XW3 zTk/g6IVZpRx3/LMjaj9ICYsQWSP29MWTZEFyiEzVL2s82drnj/FpCzN0iVGG8E5FvzgeC p5o5tnNvIk2vZJG3ygc6qZuWpFHRNLa9RxiT2hcRvO+o/pxLZUFn1vcSBOi8nqvyKUl4LY 9DtVW44EzSLrWPy+bcEee/67Dq+Rjf9lzFqW5RwWx1v+B6Kjl1LsnJ+GNsk8rHNkJW1riF U3ZHTRR448Ysv775KZXLrhsajj1J9cNe3Bd1p9RNFVC8sVPmLyLEzX9fiVibbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934554; a=rsa-sha256; cv=none; b=f8jsie6AgBclRNvpcnX5YW4JqAzgy7b+2CFUPB8Ne6ECoD8Lrx3/eGXgYI9vvPS3G+MWo8 Ve0Wpb/3G3yFRwlIJ2mXpxXdLvpbhTh1LAAb/Su8B5cp1yY37cWf/YhOqD9aHw/CYuvADr B85pjJ34xwbj+oAWttzzJ0mvwfEtpyoLZqjLOGgSoi7+svcbDnstRCkuMT7J6/4dt98+5G 0AM5jdURTItk2Cf0C8yPFljMukHuALiqIelZcsukV/qSDsRLQmC0voDCacpHJ8wMt5D1ZE 6D1l9SnF5YnUBTzMyRJKt2rNZzuFUkeqPcGfJsIeU/eC/jwWnFRgRXv2ebqHWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB206fWzy98; Mon, 20 Oct 2025 04:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TD4B001875; Mon, 20 Oct 2025 04:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TDCl001870; Mon, 20 Oct 2025 04:29:13 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:13 GMT Message-Id: <202510200429.59K4TDCl001870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 8350f46d9808 - main - sgx: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 8350f46d9808e6183d5f6bd4aa73d4d4e563b574 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8350f46d9808e6183d5f6bd4aa73d4d4e563b574 commit 8350f46d9808e6183d5f6bd4aa73d4d4e563b574 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:41 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:41 +0000 sgx: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/amd64/sgx/sgx_linux.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/amd64/sgx/sgx_linux.c b/sys/amd64/sgx/sgx_linux.c index 6ecef9207a38..d389edc1b2b0 100644 --- a/sys/amd64/sgx/sgx_linux.c +++ b/sys/amd64/sgx/sgx_linux.c @@ -92,16 +92,7 @@ out: return (error); } -static struct linux_ioctl_handler sgx_linux_handler = { - sgx_linux_ioctl, - SGX_LINUX_IOCTL_MIN, - SGX_LINUX_IOCTL_MAX, -}; - -SYSINIT(sgx_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &sgx_linux_handler); -SYSUNINIT(sgx_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &sgx_linux_handler); +LINUX_IOCTL_SET(sgx, SGX_LINUX_IOCTL_MIN, SGX_LINUX_IOCTL_MAX); static int sgx_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB33c8qz6D99X; Mon, 20 Oct 2025 04:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB32NZ7z3DJB; Mon, 20 Oct 2025 04:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW+QnajdAKQxTvfhAz7D0XwA0++dN15g6hCeaVIbbHA=; b=ixR7ysIPj2n2bOPlxwKXapBzqIMy/MkVSHqxMyYhniayJ2yxOrPriEiAEi3BF+uqAECKfY m5o9xo6mZtBYcOWFtruKXBTaSawsg1ZCIGnNd24avprE40emLfDBzYMlyfTs+0gstHHZrY GcVtVN9gxKLRfpE3DnVD88so+XGJT74Yj6wYhPRgGLMxvZtd3Zt3Us6vcWN/lEa6vW6YhZ kPOet9yb4M7UxOT/eRAf4HoBVOgcn8QIx6OhQ179zQb09XWqlSQj29VIIJNCl1T0KEjt5I ZW0RHyJDNkRYlMooDfiVupc0CxU836VgObhRMpGh4DiKQGUDcbejKDOkM9ozdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW+QnajdAKQxTvfhAz7D0XwA0++dN15g6hCeaVIbbHA=; b=cX3V6Cce5Lqmieew2gSBRKsU98Mm0rFMoVhv/jITxRJDTSCPSKcTgpYqivSffMkDHVGv55 NnPDsUj+ql4hogHMAx1qvU2G10nCWbtnOB+JVKH4iDTcHuuhxPHgKP09bn5q/AgrzVOGHE a7U7/1yYkpVcUmDDor5ta/Ib0d8vCVWWhfaGR4tloiY3WcoCl6t+G+jeZAZrYme5XSg2fq qgx1pr6JeJKp2I/g2ZHPA/+2tr+qKU/Ct/UN2fpGTlXOFLcIVmVxcz/Osrn/Xa1d9RLcMg rMY5eY6JvPlsUC9pLsoupm2x5PpedaE5OYkwfmtJr+ogETUKhHrETJrx7iSlkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934555; a=rsa-sha256; cv=none; b=ddKHkRudTF8to4HgUVeMdSv8/Jicr3BLIHZi1Kngaj+WopRQL69pmE6bDT1jGtBJ+41pKE lXMAnGRmyaNmNNQtfWe3YpKB+z5As832ggYr75XC6yFkt8GaArkbR+pVZeng8Vg1KpKT75 yykW0cu9PsZjRLQdPjvKr7Tbv7am29BUU54zFlDrY78bqwo7gHy6vvMzPzYVboqIikMcJl 4r6/u3yi7+TN7lIdWN3wNuUQU5ddKypoX3ENvIgrOm6OtGaDfRnrKpAdzeXjbqnG1i0JpR bsst/7gJaiy6Bn2OZI5SHfVjKJNwlx7R4E2gHeJudBn8IU0XaPYQf0zlVE9HFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB314R5zy0K; Mon, 20 Oct 2025 04:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TF5u001924; Mon, 20 Oct 2025 04:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TF4U001921; Mon, 20 Oct 2025 04:29:15 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:15 GMT Message-Id: <202510200429.59K4TF4U001921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: db1844a0e1bc - main - aac: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: db1844a0e1bcafeb974215033ed682e7fa18cac8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=db1844a0e1bcafeb974215033ed682e7fa18cac8 commit db1844a0e1bcafeb974215033ed682e7fa18cac8 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 aac: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/aac/aac_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c index 609315f50939..65008c562342 100644 --- a/sys/dev/aac/aac_linux.c +++ b/sys/dev/aac/aac_linux.c @@ -52,15 +52,7 @@ #define AAC_LINUX_IOCTL_MIN 0x0000 #define AAC_LINUX_IOCTL_MAX 0x21ff -static linux_ioctl_function_t aac_linux_ioctl; -static struct linux_ioctl_handler aac_linux_handler = {aac_linux_ioctl, - AAC_LINUX_IOCTL_MIN, - AAC_LINUX_IOCTL_MAX}; - -SYSINIT (aac_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &aac_linux_handler); -SYSUNINIT(aac_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &aac_linux_handler); +LINUX_IOCTL_SET(aac, AAC_LINUX_IOCTL_MIN, AAC_LINUX_IOCTL_MAX); static int aac_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB44tGjz6D9MJ; Mon, 20 Oct 2025 04:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB42VNqz3DJJ; Mon, 20 Oct 2025 04:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9bbQ2GQAG2C+zD7tXr4byYL7R3HKnupcy2HQuQN9Uo=; b=yxqOpOUmJHJ5Q4SKlBY/YtnRQ7yzj3v1Kc9npZw1PfTaJGwiA5f4LHObFNVflCx79sK1g9 RCHZ57XSrjCoiALHDczZaTRmT4zKLietCSeCm7cyqXMUcUuMUpBmVy3F8ZZySxfDIqtySh PWr5NER7WD9CgLM0zFIV5R8RsowbEZCUZVXoYGibBmXz8nA0hGz1ahxZKr9fLl+5md/HnX PKwEEq2verLZGTph7uzJ6azFXgYOA8aF30Q/PFOzjdzK42tL9CNr+++qxChp2JjZFt+oDn L6eMprIIE7We2UY+U176KKJPco26eaoylvsUzlmZwtFp410jtfqYjttdR1UxWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9bbQ2GQAG2C+zD7tXr4byYL7R3HKnupcy2HQuQN9Uo=; b=Jqtk6+cKWG0T4MGEDGBmv/B8O6cTYZFBsFYJi9ZhS9BIaXOKgUPDgYRXR8sBIFgulxb7N8 KZ0zx60w/zbwxgcYkkfBd9/7TiQJr1mKO870Wbd5tv6wEU/Z0oIJIl9KkcTMtcGLKW17Ox E9c1DRgEJ2clUldxEZCU3dyIAX4ulPL/oXmwujX1eCHHknOmXV/Ly1gRmomK3bU8+i7732 DKCwB4VsEoQdqbzq4KmzDUGQFFI4FmXzBGhc9VFZrnUGcv2cYezxLvkJh88TRLv1so+pHR KudRhjLTnb6N4/o/QKTVMSj1MpdHTeQQ2X6T44sKG514Kd0cKFuWRhG/frmlVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934556; a=rsa-sha256; cv=none; b=TCTKMNG1Yw+ubuydo27zR7eVcQx9wMW6C+7XwI/2a0BGLna/8pyRWLHqTlDpnOR+dUTOq0 2L1UQwmA+hv9Dfby12P5ZxL6FFAP0hj4qciu4qQdwxpwUm1Gh1DI0ULvVLcGBXqb7hf8vp sZIw058UBRxdtrAzWmB/mKXeeDrPiMNIzIoeKuKLi68JeQAcOHhnEWowTaYz9WMtv4UEnR PgZcIlySBBIzkVJB168Kv5t6ASIHbcbYyty7cUHnvuOTVRn/OYKTWZ1LiIitEKHa5VHAj4 EXh+djm5S3Yj9djafjFR8/fVFmc/kGQ3DQ7CkF0xurNykgLot4KrJBKmWie9yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB424dDzy0L; Mon, 20 Oct 2025 04:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TGWQ001959; Mon, 20 Oct 2025 04:29:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TGhJ001955; Mon, 20 Oct 2025 04:29:16 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:16 GMT Message-Id: <202510200429.59K4TGhJ001955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ff29e5bc53e6 - main - aacraid: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ff29e5bc53e6fafc49d1caceed88cbc9e9223189 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ff29e5bc53e6fafc49d1caceed88cbc9e9223189 commit ff29e5bc53e6fafc49d1caceed88cbc9e9223189 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 aacraid: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/aacraid/aacraid_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/aacraid/aacraid_linux.c b/sys/dev/aacraid/aacraid_linux.c index 267dd84c65d5..6b6259ed7059 100644 --- a/sys/dev/aacraid/aacraid_linux.c +++ b/sys/dev/aacraid/aacraid_linux.c @@ -54,15 +54,7 @@ #define AAC_LINUX_IOCTL_MIN 0x0000 #define AAC_LINUX_IOCTL_MAX 0x21ff -static linux_ioctl_function_t aacraid_linux_ioctl; -static struct linux_ioctl_handler aacraid_linux_handler = {aacraid_linux_ioctl, - AAC_LINUX_IOCTL_MIN, - AAC_LINUX_IOCTL_MAX}; - -SYSINIT (aacraid_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &aacraid_linux_handler); -SYSUNINIT(aacraid_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &aacraid_linux_handler); +LINUX_IOCTL_SET(aacraid, AAC_LINUX_IOCTL_MIN, AAC_LINUX_IOCTL_MAX); static int aacraid_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB56yWcz6D9Ps; Mon, 20 Oct 2025 04:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB54GfNz3D6s; Mon, 20 Oct 2025 04:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1D8xKEzlQse0ggufJYREATxaUFCpPsyeuZorbtiSbk=; b=viVcsoRQ0s6B2WrOxpHOCwpFi6ecSEYq76HnigjS+dx1O306yVv9joKVsw3U99Fx0gnL1P ZZ269XnIrQaTlX8FgETOw/qFwyoDR8hddP4rFdb0VKbpVxKCvZdx7RdWEBIP5kMU/LT/Xh bkURa8lOVnE+6KYZFZMjA6VYxnNiakjXH2/X5RNameoDR+G7Yla7HkjwqJdCTx8zkO2+tJ N3mbLEy07dCmeqo538jSeEhMk/NOA7tykWPzUQkyOWSrQyAdmuMK9OY/D9G2zIQdymJ0by nTv1+rWW/nVm2OZ+W/1MvcEot3r6d9YF/jfuTwIyEJOt0nnBoQde8IbBx7MFIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1D8xKEzlQse0ggufJYREATxaUFCpPsyeuZorbtiSbk=; b=ex5mtUlwbqTWgAb/ISKlrwIcKE6XSwsLWSzSZKRYCZXgsPlc4eCVTwR+rjk3EFtxLFt99x V2kaCXC8m8111bFj622Tk3xwrZ1QiRichcO403HhdrV/DIsFBYFc+d9reSLbogW2sqtPdE UE9JN/gLuFlOsP7XbJbthMlcHhCtQC4KnrCu1i9s/hQXyYN5z5clso3XWYX6U/5MeylTqX NO81kPBux8fyi2jHij3prC9l4+x3w+yFa5h7OjNr/pNnkT0n0qeZqAY691swRjOnhE9JFu vse/khf+YNUelVrVbFHBflfut1nrqRGYb6rTvCKiQ3lmXmeQNX3MEshjHPjHTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934557; a=rsa-sha256; cv=none; b=bS2BjlI7rTf/bgzh3cjfHU8SKUQn4Z/b61AdpnPoO1+3Q7Dd0/rE+ErANOH/Fwf+XV+qCe Kwl2djlDZMycXiXdQzx6NCzBahVyipUB19Iay4nV+n1XklTfZRHBATL4jgxZ2j2OwjavCu yd8GKwsxT2uWRtHUeQeimK9F9GcZU24t9gipIXyCgmnsjeSQC+VYNRSKlbBiwrMyM7UH6+ lVZZR/d0bK61C5t9eEKRROesr+I9DRZtM6nwd0AqP/Qk6iQB6D1lTOaYV2Xy31qvaBAw6W doxQtajRoN2OgrL3dwO1vGNVcHtPxfwaRY8ZD1JopsAYEmXCVEAnLZ80U5TF7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB52phRzy0M; Mon, 20 Oct 2025 04:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4THG3001993; Mon, 20 Oct 2025 04:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TH1b001990; Mon, 20 Oct 2025 04:29:17 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:17 GMT Message-Id: <202510200429.59K4TH1b001990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: cb0116af7ac7 - main - ipmi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: cb0116af7ac794238b0fa569f2722607924fcad6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cb0116af7ac794238b0fa569f2722607924fcad6 commit cb0116af7ac794238b0fa569f2722607924fcad6 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 ipmi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/ipmi/ipmi_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/ipmi/ipmi_linux.c b/sys/dev/ipmi/ipmi_linux.c index 05eb30a0aa77..58872de12003 100644 --- a/sys/dev/ipmi/ipmi_linux.c +++ b/sys/dev/ipmi/ipmi_linux.c @@ -66,15 +66,7 @@ #define L_IPMICTL_SET_MY_LUN_CMD _IOW(IPMI_IOC_MAGIC, 19, unsigned int) #define L_IPMICTL_GET_MY_LUN_CMD _IOW(IPMI_IOC_MAGIC, 20, unsigned int) -static linux_ioctl_function_t ipmi_linux_ioctl; -static struct linux_ioctl_handler ipmi_linux_handler = {ipmi_linux_ioctl, - IPMI_LINUX_IOCTL_MIN, - IPMI_LINUX_IOCTL_MAX}; - -SYSINIT (ipmi_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &ipmi_linux_handler); -SYSUNINIT(ipmi_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &ipmi_linux_handler); +LINUX_IOCTL_SET(ipmi, IPMI_LINUX_IOCTL_MIN, IPMI_LINUX_IOCTL_MAX); static int ipmi_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB66Gbbz6D9MM; Mon, 20 Oct 2025 04:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB64c6Mz3DM8; Mon, 20 Oct 2025 04:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzRJIMBzDQIBj2uaxZHe6KeLaJdGmjMG4zviaB1JEhY=; b=jhEVKoOnQTYytT7TpupPdEl87YTQV8e5O1bW50zS4UEtsYY53AAO5R7h+1Z1q4JsEFfhdG qPB2hzt89k7O+Ojap/97gniwTz+m4hXJNZUdqCvrNx57RdU29MMlI3g+hhS6AepON4+fTy aOkaW5H6GcMUCWD1I/yTUvAepRo05f1fX2OpIbm0JGv6btacNBWskyvrMqfqpkPVE2qwWF RfPo2dwCSOR/eYf+pot3BOVsbOX3TBblTVH0flIJNjIa4BxeqZG9ljAdoeEpH1YVlZXpu8 m9apHdU/upn8UUThtDhM5ZIQEhLlme5DiBAz7tq8NkCDwRTeShAuF36Gt9zoDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzRJIMBzDQIBj2uaxZHe6KeLaJdGmjMG4zviaB1JEhY=; b=xtsEE7hdg9zpm1r6TvIuhynFbPxORGdZdDfUAWNbWGLwe8na4dnJKTqCZ0cPFpCzgbaQXn EfiQy+9JUPcgYSxXoU+SsNmOjgl3zeg69qgQy+HBPsKG8QEtyDhTCHfCSdNRPJCG2/C8/5 jO2lVcBmglAHhfTcES4eqxGgxidM5tbVzxGij2NBRk8kyXYVzBn2Ns2EyPjiBnu1Eeawyp WCU138g1CG2oAbT+qRqW/zXsJFGOMA+52cuH1lAkdeDt/CZKI/lKZ6vgFKiW5suNlVSS9K FflwwBGehwHEiobYcnKG/C4qlJEy2NwBESs9FncauIs5kV/8Rf17rMsyiqnnjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934558; a=rsa-sha256; cv=none; b=CAzl1p+GTubx9mF+4Rzgk6yBI8G05iW4zT6sUbuO7UcDKj6qmwU/gvwuEgQOzIPwbZSgoE Xyek1GnIJvoau/3ZO61xC195dOeMUQYrPev2VRDoU0afwkTiRwYAz9+WqjYD1G262wZ8y8 QT+5BC0qvfm3PUSqdFICvfmhAitMrj/I7EFJbfDHCzaPjlxhmLDGzpjEMb6UGyg9grgDx6 3qimXUXfvdnEOwgCRqWcvofQOWFp40hNPh46qnxwHYIDx+l+2vckWGGzA7tDLS0ujZIDiI y9clp6RCzKDo8su2sg8u+3XnHQA1AX/sKtug1RW9zQBzM6Ayftr9X5q7UZ3JPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB63twRzxlv; Mon, 20 Oct 2025 04:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TIAE002025; Mon, 20 Oct 2025 04:29:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TIB0002022; Mon, 20 Oct 2025 04:29:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:18 GMT Message-Id: <202510200429.59K4TIB0002022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d12ce84b0d33 - main - mfi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d12ce84b0d338958b26f6eec86b4967fca8d3bd6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d12ce84b0d338958b26f6eec86b4967fca8d3bd6 commit d12ce84b0d338958b26f6eec86b4967fca8d3bd6 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 mfi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/mfi/mfi_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/mfi/mfi_linux.c b/sys/dev/mfi/mfi_linux.c index 8ed8baa3858a..9541ff37336a 100644 --- a/sys/dev/mfi/mfi_linux.c +++ b/sys/dev/mfi/mfi_linux.c @@ -53,15 +53,7 @@ #define MFI_LINUX_IOCTL_MIN 0x4d00 #define MFI_LINUX_IOCTL_MAX 0x4d04 -static linux_ioctl_function_t mfi_linux_ioctl; -static struct linux_ioctl_handler mfi_linux_handler = {mfi_linux_ioctl, - MFI_LINUX_IOCTL_MIN, - MFI_LINUX_IOCTL_MAX}; - -SYSINIT (mfi_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &mfi_linux_handler); -SYSUNINIT(mfi_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &mfi_linux_handler); +LINUX_IOCTL_SET(mfi, MFI_LINUX_IOCTL_MIN, MFI_LINUX_IOCTL_MAX); static struct linux_device_handler mfi_device_handler = { "mfi", "megaraid_sas", "mfi0", "megaraid_sas_ioctl_node", -1, 0, 1}; From nobody Mon Oct 20 04:29:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB76sXhz6D9GX; Mon, 20 Oct 2025 04:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB74tbzz3D9n; Mon, 20 Oct 2025 04:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QlKwzicAEUstD9l6txDTFsCJaYkmapneoTmYIyLTbQ=; b=KDUxgNUnuPudpbO0N/XSktCkWoIN4BQGgPngaG/iPFx4dksQLu4w3HwA9H7U+2V4TveUXx mmJRPSfKPUJmlvvtHPQV2xX1z7bZoiEVWB6x/ra6xLgPnM4D9JHSc1z00onz3UwTrztdeY uoDsS3QKeczXyaOsKRs5LbpBultT/6AvQklmj6I2ikwCIoHSn5F17Nj5Z3f9B0dmaxyXpp AkCnGKIq/rgJjVGPNDKOFdilFQiikfWcwEgl6RU0D4Jy4a8lbuvuthJ9WOJYHUeR2R9jTt xyAORy8E79zTEkFCJ3rDtmZaUTZzc0AeTVa6cNR//QY3237OoV1ZWssk8g3WXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QlKwzicAEUstD9l6txDTFsCJaYkmapneoTmYIyLTbQ=; b=H10JI5wggZM/9690t1RkmCf1qH4aA/V8EyIhT+6Ghev5H2aJcYZ5YPM5lZHguK1ChOVUVv 0/6ibHN52QLPOaG16sIYPVGM15xEcaYU8kdsemph5iHciEyH20DCNIireMqPUu4KY0D/nM f3hf1iXrhJH8NqcZ2Lca6GfGyWbi/LNL2ZrmLhfla2RH3HtL7ZELtydnICtjdaXkL7R+0g AOaOxffY+uaNvpAiAAMFQs3kcMnSdtDf5YnxPToOE2SkWg1Xq0YjvLrX0b8wbEv8qCjwg7 HKANQuFRJwmK+coo06pxJ9Ek44f2vBoRfeIbPxmLcmapki8eU5/FZUphl1cGEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934559; a=rsa-sha256; cv=none; b=Rz8MRYrkSpE4BaqgR60Zy1GbvZNTleI5GXFMavqsrx1cGX+KMcbajFnrnNw44UITYm/6V4 Uddyt4CkV334yn6RwB6UNrxgV8NxYhR6l0UZaQ92vb3uSM40UZpkHz9P3UJ6O6CpsIHkhu fCFlUUjbrc0xxrLjlNYMcpt+K4yKw+C9Mgf6xkG27jZlvvED/GegWkYfYjCtAMAINSie3e pAQ0hxVLEpB5BaDRciLklXEv4xM4Q8XlAcUgA4Y92drEbTVBwApj5HzWU22r8acLzjJXTS DyZfofoX0ueZ9T7uVXsUtjBu4RWAV9iCnX6E2795gVnoCLT3GiyAi3sA4ylVdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB74TJLzy0N; Mon, 20 Oct 2025 04:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TJUf002058; Mon, 20 Oct 2025 04:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TJPE002055; Mon, 20 Oct 2025 04:29:19 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:19 GMT Message-Id: <202510200429.59K4TJPE002055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0a2fb63b4954 - main - mrsas: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0a2fb63b4954c540686d387254b65cc6878bd19e Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2fb63b4954c540686d387254b65cc6878bd19e commit 0a2fb63b4954c540686d387254b65cc6878bd19e Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:43 +0000 mrsas: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/mrsas/mrsas_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/mrsas/mrsas_linux.c b/sys/dev/mrsas/mrsas_linux.c index d7d48740a204..b06788fffc82 100644 --- a/sys/dev/mrsas/mrsas_linux.c +++ b/sys/dev/mrsas/mrsas_linux.c @@ -67,15 +67,7 @@ #define MRSAS_LINUX_IOCTL_MIN 0x4d00 #define MRSAS_LINUX_IOCTL_MAX 0x4d01 -static linux_ioctl_function_t mrsas_linux_ioctl; -static struct linux_ioctl_handler mrsas_linux_handler = {mrsas_linux_ioctl, - MRSAS_LINUX_IOCTL_MIN, -MRSAS_LINUX_IOCTL_MAX}; - -SYSINIT(mrsas_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &mrsas_linux_handler); -SYSUNINIT(mrsas_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &mrsas_linux_handler); +LINUX_IOCTL_SET(mrsas, MRSAS_LINUX_IOCTL_MIN, MRSAS_LINUX_IOCTL_MAX); static struct linux_device_handler mrsas_device_handler = {"mrsas", "megaraid_sas", "mrsas0", "megaraid_sas_ioctl_node", -1, 0, 1}; From nobody Mon Oct 20 09:37:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqr1z5F1wz6DXVM; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqr1z4T15z3hTJ; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760953063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XtkijOCDWQ1mtQOIzranbNhOxTh+kmqE8MUzLc62kMY=; b=rJQJRulyuyL6jlz0yE2PU8jN6lBpN/5R26pZuNjwoi16OSNBzcyyYDx47m1K9u886FTQ2D KNhzKOJtweYVYYO0fX6il40w9XnR3TQBxSkf1wsQSc3Pul0RzqQ71Xi1TgNsijSSRRWmbx WUI4JmA/tb4jHYX04r6XxJ2VxF1hWIo03EYfC037NnKXfb86q6Edn23F75BqhCJqO3dU9T LCKKolkwe+5s7G4prpQXL8rpSWmvbwnSn6qyhSZL2W5TqRts8MVTXJrgafCEPAGJI3SMWN zFA54pPvaPr+/04zVbhddXHDAKWqBne7H6PWJ288NcrHsbDa3yOaDBo8ITeWRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760953063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XtkijOCDWQ1mtQOIzranbNhOxTh+kmqE8MUzLc62kMY=; b=j95Yr41zddRLdjuxrnHgnza6Yu52ArROmvEKDDRsxBbTNYXxKPM3IBINoyWSZvTKF5UcOd RP2nWl8KBoq5eBdP6RPZ1JhRqvXvjI6OP7ykss9LZe2r/0QRylbbkvV/RzdApFpFLPYk8C P3+PRFLwgVER3lzlUD0GNZLOON7SJcprAL/e6Q3nswHIEcRuXc0OTkM4Md6CwV9DCcxNi5 Yr08UeHqjPdt92vdwVdrnPD1C8TuQTyfo6GErVvu5R5VjI0JzuI82XBLMfJJyGwh7qZ3NR pvkM38BkwuL4kQuLwLUNtzuZykALhtN6j4R3if1D5i7KO3Aelng0ECAprwUa2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760953063; a=rsa-sha256; cv=none; b=yU1MxAYOzlNG4mIIYV6NXUINtWi7NleJixGwWMUzj7tTVfbXz0+14b6QTh7jIsYkLG5cxk aqdu0EsCeoLUq2P4hD9LQok5NfMph3D0QEfqc+cNcUx8idL5lsZcvEvH3H4hcImyGK5QH+ BhiXdtj0Etl9hGjUk/LoiwAxe4Nt41/LiTsRSfBWYWEBDZSGAOiyWyw5RW9uBVN4j59mvm o7SWB5JZDYbW6kU1E3R17J9A3FdJlI9C4NUFhw4FtyHY0nBkbyXZXKz0cINH7+h3PvQCCy Amrdb8b4Z6VsCcFR/KRyqyPF4ygS5yx3zL+LbXHB4XIPHSZxA+3m2k4vlIiW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqr1z3nD0z16Bt; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K9bhYx084862; Mon, 20 Oct 2025 09:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K9bhuh084859; Mon, 20 Oct 2025 09:37:43 GMT (envelope-from git) Date: Mon, 20 Oct 2025 09:37:43 GMT Message-Id: <202510200937.59K9bhuh084859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 81d807a90611 - main - release: split up Oracle Cloudware tools List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81d807a90611a4980cae843b404d99c27edc1893 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=81d807a90611a4980cae843b404d99c27edc1893 commit 81d807a90611a4980cae843b404d99c27edc1893 Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-20 09:37:01 +0000 release: split up Oracle Cloudware tools Sometimes one or the other but not both tools are present; this ensures that all cases are correctly handled. Reported by: cperciva Approved by: cperciva (re) Sponsored by: SkunkWerks, GmbH Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53186 MFC after: 2 days --- release/Makefile.oracle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/release/Makefile.oracle b/release/Makefile.oracle index 3573f29b96c1..6d792cc9fd30 100644 --- a/release/Makefile.oracle +++ b/release/Makefile.oracle @@ -24,21 +24,28 @@ # Syncing to all sites should take 2-3 hours after this final step. ORACLE_BASENAME= ${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/} -ORACLE_PORTS_LIST= ftp/curl emulators/qemu@tools CLEANFILES+= cw-oracle-portinstall cw-oracle-portinstall: .PHONY -.if !exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img) -. if !exists(${PORTSDIR}/Makefile) -. if !exists(/usr/local/sbin/pkg-static) +.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile) +. if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf -. endif - env ASSUME_ALWAYS_YES=yes pkg install -y ${ORACLE_PORTS_LIST} +. endif +.endif +.if !exists(/usr/local/bin/curl) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl . else env UNAME_r=${UNAME_r} make -C \ ${PORTSDIR}/ftp/curl \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean +. endif +.endif +.if !exists(/usr/local/bin/qemu-img) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools +. else env UNAME_r=${UNAME_r} FLAVOR=tools make -C \ ${PORTSDIR}/emulators/qemu \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ From nobody Mon Oct 20 10:17:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqrwC274vz6Db6K for ; Mon, 20 Oct 2025 10:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqrwC1J3vz3mDS; Mon, 20 Oct 2025 10:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760955467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YMIOiuEAU368jJujRwPumg+TfEvjYoOGz2SR0NqvgnA=; b=mTn9RcYK+v6O/KzWMzq/lL+4jX9WZuP6LKI4Yl938FqJBjOPN9MYkg68ZVI/ZYQQV+janp mTu0cBcbmyPtGKJ7hdnoix3cW92H2LlzbU7mgoHLDX7PiTli6hEuCLHZ9CB1SrSgWbFY2q NCtZ0nNwv8dmSh32clJMR7Y3BhZUfhvNUMOtkQdXRdUeHMPcYaLH/pm9oeDYAVIEiRSovO +C03ToZeIV0zcuLoQC7cDhGde6J5NBGDrO2bqCUPrOcscxzUUpefm31CmNJUK9gckrnKxs 3ggttm4483FrSGosp22AIE7RdFRL25AQKNoQQlgFzdnI32ImOexDp8oHarhMdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760955467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YMIOiuEAU368jJujRwPumg+TfEvjYoOGz2SR0NqvgnA=; b=JU8elZkmx5C3nw34L9f+I9LvKKiaHPfOODm/3NpZUFTysfQkT/ZxPppjNCw8ePVDszZw0E kaFen3+a9LteBYasVffkdHlHXFWv3j6WZSs9AYtPD77wUlAG94EtGPVtz7DfG6CMYpXNBI q+Zdp1pnqnqO+BaQEX1wCi1c9lhRi30TuTZe9Rov1zFIAp8TMolbDBfdhdaASCHnEuyYGw JO963x/lccmfss8XaRxC+eSDR6gGT6pXuXtXHdAO1VXyE78/Kv43QhtAlfnFNCkeNrsZgF GBzxupvmXeNe6qa43Ebo0R76B3rsozHyWJ8nVjJqO5RSNaVsyoan9NrgSngfhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760955467; a=rsa-sha256; cv=none; b=gJZaVHeyPmgsSQ21X+SRJtisvSkqh1JSAzOlxeu0g4E38G8J4kSZa8EE7OQ9G2nXc3+twB SBqFh1ErJVbVMp46P4mQql3FItvYwlSmOsI/kn+yHWdeCqAKKih5yVV0EY5/TJk4dmIoCL Tby2heENmXw7gNAF3HNul61kwKadklNzzGBPN3VC10hcMth/3vt4gXf+vEGdEvlkh9gMVL rMP1nC0TUNgK9B2GUNovlnERvwlknJIYgeiTTYt9X0h9OVwkRSzdJBebKigGsyCjMbTKsn mxGmTRqnxcVUNu1Ki4hTgoKWImxUtPy5F2PIJ+E8rmGrvWak9/7IJFqaJ+vW+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqrwC0Ztgz180J; Mon, 20 Oct 2025 10:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KAHkwk061557; Mon, 20 Oct 2025 10:17:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KAHkGE061556; Mon, 20 Oct 2025 10:17:46 GMT (envelope-from git) Date: Mon, 20 Oct 2025 10:17:46 GMT Message-Id: <202510201017.59KAHkGE061556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 5605a6d79b35..6ae99d26924d - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 6ae99d26924decb5f618b596ec7663e6a26d2e5f X-Git-Oldrev: 5605a6d79b3582296208ac391f93a5faf729fa92 X-Git-Newrev: 6ae99d26924decb5f618b596ec7663e6a26d2e5f Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=5605a6d79b35..6ae99d26924d 1269fa9b79db zdb: convert `ALLOCATED_OPT` into anonymous enum 8e97b98140fc zdb: add `--bin=(lsize|psize|asize)` arg to control histogram binning c0a874fcedab zdb: add `--class=(normal|special|...)` to filter blocks by alloc class 3a1a22abb43c zdb: factor out block histogram bin number computation f8b082b5afc5 zdb: adjust block histogram binning strategy 3ef2d5ee4586 CI: Switch FreeBSD 15 to 15.0-ALPHA4 and add FreeBSD 16 346ecac61ba5 Annotate arc_buf_is_shared as __maybe_unused 1861a329fb0c zvol: verify IO type is supported ea914e4a43a2 Add missing include statement 6e5b836e9fbd FreeBSD: Correct _PC_MIN_HOLE_SIZE 6045740c8e36 zpool_reopen_004_pos: Clear label from offline disk after destroy 51de2d76f86e Explicit set ashift for non-leaf vdevs f4276479c9bb Suppress some ashift warnings a9f2a1f3614f Fix the type of the raidz_outlier_check_interval_ms parameter 0e62831110a5 libzpool/cmn_err: remove suppression, add stop option, cleanup a5af3f2db744 arc: fix small typos d1e1b80ffe1f CI: Fix FreeBSD 15.0 by staying on ALPHA4 due to broken ALPHA5 image 6ae99d26924d mmap_seek: print error code and text on failure From nobody Mon Oct 20 10:59:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqsqx5W7Rz6DdRn; Mon, 20 Oct 2025 10:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqsqx5Gqmz3rYG; Mon, 20 Oct 2025 10:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760957949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJgeC+gx9kXSqRxKyGJXzgK21OgoWNYoOJuMdgPjyr8=; b=osq72AnNtWSDPpaua2TLHK3HgrjCUZlvbSRqI4zhHvkmunm3Vd+hXu1i0Fc+CYTzBNEH1w sSkO1hq3OjErJZPVAoSMk4j7BjW6IsRFHPWi1NbFaG53zywL2Oo6WMVEIilcVY3RA04QM8 ZyaXFIzMRKBDkbJNPFvJM/qCplLBKuD7zoNArDt+SDmtvA5t9QQVROQiyUBWwkC42RBZQW 2dQ2wgHB7nJnhJPMnVesZW1UuNKxobd9aXZAvvvqVU6LoT04FVstGi70Q9zYkhpMLJB6GQ 99NiLMBiU+yQlHG1hO49p3EXzpAvrOHKdUfKQsT7SUkULM0vTMf+KC8bG6BCRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760957949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJgeC+gx9kXSqRxKyGJXzgK21OgoWNYoOJuMdgPjyr8=; b=WekUX/yU9B3HzN512u8EKk/+9teQK7JJDMaV0WeTrV8V9BCcATfnhfQ6w/p1xyI60PSncQ ycipHsIZvA6MgqnUuk1tXofP+pa3xxeA2Kybp8IlECtsuIjnwVHAtNPBCpkqof9wTPtWod ruNQiOZj4WZLjQozi+n5CedKWBL0UqDXmiT/iC/D3SDmnQVPkPTlhqFO/5q57Udenh6dCA 6/9Dfj3O8VEz7YSADCguyhl4eH8wsm9Skprm2921HYzpOTCxOPC48hH8qDmPjz2DNxT505 MPwrsKXEgMMHRlV45a6Nc59OLnLW13WwBVfmz6H1RDPTrvetyD76sEItmpYWxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760957949; a=rsa-sha256; cv=none; b=xjCBsd3er7UUYIsDId5baBYp81k/Lay4dbz+ukB4mN00q/+h+wgaqxGuT9G4fILCqjSYrz JqegAsZLjDN5waZKg2UXnZEYHQRbqPQG3fYDdnxOuJmvVeug+dc9Zgw57586XzLZqSy8g6 Hn0ZwvpWDE/YiERj4XGq42vf1izfq5SvIKEhquZqkDtfOVOenjQ9HqvmG1bzTqefGGiJdU bXw3sP2pBo02klbJfD8ObogXN6vQxj+5eYpqwTP7FRirMXrvTYNr3azpRnAkukGFlSqDCr ODdMx4CZKyMUn1vJgX18owebPV8z8HBqFT8fB3b8iiSYDyW6xlB5pQEDVX1Upg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqsqx4kM9z18Vs; Mon, 20 Oct 2025 10:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KAx9aU037168; Mon, 20 Oct 2025 10:59:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KAx3OR037143; Mon, 20 Oct 2025 10:59:03 GMT (envelope-from git) Date: Mon, 20 Oct 2025 10:59:03 GMT Message-Id: <202510201059.59KAx3OR037143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 6e6cde8f2bdb - main - zfs: merge openzfs/zfs@6ae99d269 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e6cde8f2bdb235b741061e3c6ee664752f25c18 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6e6cde8f2bdb235b741061e3c6ee664752f25c18 commit 6e6cde8f2bdb235b741061e3c6ee664752f25c18 Merge: 81d807a90611 6ae99d26924d Author: Martin Matuska AuthorDate: 2025-10-20 10:18:26 +0000 Commit: Martin Matuska CommitDate: 2025-10-20 10:30:00 +0000 zfs: merge openzfs/zfs@6ae99d269 Notable upstream pull request merges: #17750 6e5b836e9 FreeBSD: Correct _PC_MIN_HOLE_SIZE #17803 1861a329f zvol: verify IO type is supported #17826 51de2d76f Explicit set ashift for non-leaf vdevs #17830 f4276479c Suppress some ashift warnings #17843 6ae99d269 mmap_seek: print error code and text on failure Obtained from: OpenZFS OpenZFS commit: 6ae99d26924decb5f618b596ec7663e6a26d2e5f .../.github/workflows/scripts/qemu-2-start.sh | 11 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 185 +++++++++++++++++++-- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 64 +++---- sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_status.c | 78 +++++---- sys/contrib/openzfs/lib/libzpool/kernel.c | 79 ++++++--- sys/contrib/openzfs/man/man8/zdb.8 | 14 ++ .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 17 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 77 +++++---- sys/contrib/openzfs/module/zfs/arc.c | 16 +- .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 35 ++-- .../cli_root/zpool_reopen/zpool_reopen_004_pos.ksh | 2 + .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 7 + sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 17 files changed, 443 insertions(+), 154 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index db1b6f33a8ef,000000000000..3a17ed289235 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,882 -1,0 +1,882 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* Define if set_default_d_op() is available */ +/* #undef HAVE_SET_DEFAULT_D_OP */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* have super_block s_wb_err */ +/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* timer_delete_sync is available */ +/* #undef HAVE_TIMER_DELETE_SYNC */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_VAES 1 +#endif + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migratepage exists */ +/* #undef HAVE_VFS_MIGRATEPAGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +#ifdef __amd64__ +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_VPCLMULQDQ 1 +#endif + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* Define if host toolchain supports XSAVE */ +#define HAVE_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_XSAVES 1 + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* libunwind is llvm libunwind */ +/* #undef IS_LIBUNWIND_LLVM */ + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ + +/* Defined for legacy compatibility. */ +#define SPL_META_ALIAS ZFS_META_ALIAS + +/* Defined for legacy compatibility. */ +#define SPL_META_RELEASE ZFS_META_RELEASE + +/* Defined for legacy compatibility. */ +#define SPL_META_VERSION ZFS_META_VERSION + +/* pde_data() is PDE_DATA() */ +/* #undef SPL_PDE_DATA */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define SYSTEM_FREEBSD 1 + +/* True if ZFS is to be compiled for a Linux system */ +/* #undef SYSTEM_LINUX */ + +/* Version number of package */ +/* #undef ZFS_DEBUG */ + +/* /dev/zfs minor */ +/* #undef ZFS_DEVICE_MINOR */ + +/* Define the project alias string. */ - #define ZFS_META_ALIAS "zfs-2.4.99-95-FreeBSD_g5605a6d79" ++#define ZFS_META_ALIAS "zfs-2.4.99-113-FreeBSD_g6ae99d269" + +/* Define the project author. */ +#define ZFS_META_AUTHOR "OpenZFS" + +/* Define the project release date. */ +/* #undef ZFS_META_DATA */ + +/* Define the maximum compatible kernel version. */ +#define ZFS_META_KVER_MAX "6.17" + +/* Define the minimum compatible kernel version. */ +#define ZFS_META_KVER_MIN "4.18" + +/* Define the project license. */ +#define ZFS_META_LICENSE "CDDL" + +/* Define the libtool library 'age' version information. */ +/* #undef ZFS_META_LT_AGE */ + +/* Define the libtool library 'current' version information. */ +/* #undef ZFS_META_LT_CURRENT */ + +/* Define the libtool library 'revision' version information. */ +/* #undef ZFS_META_LT_REVISION */ + +/* Define the project name. */ +#define ZFS_META_NAME "zfs" + +/* Define the project release. */ - #define ZFS_META_RELEASE "95-FreeBSD_g5605a6d79" ++#define ZFS_META_RELEASE "113-FreeBSD_g6ae99d269" + +/* Define the project version. */ +#define ZFS_META_VERSION "2.4.99" + +/* count is located in percpu_ref.data */ +/* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --cc sys/modules/zfs/zfs_gitrev.h index 8a1802f5480b,000000000000..6f568754f61d mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@@ -1,1 -1,0 +1,1 @@@ - #define ZFS_META_GITREV "zfs-2.4.99-95-g5605a6d79" ++#define ZFS_META_GITREV "zfs-2.4.99-113-g6ae99d269" From nobody Mon Oct 20 12:26:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqvmP0X4tz6BXw0; Mon, 20 Oct 2025 12:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqvmN6x7wz41qL; Mon, 20 Oct 2025 12:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZjr1wlcictqb96uxl916ZA+ypYPxvaIOxphGiopgzE=; b=nofNJ3DEhuebmJWfJ07MSGYwevr7mSoRN6Sh8WZIWnk/8QnYxn8Ou3xNPi05UDkH22Lh4o Rv4+NtjgW8CEVwlEb2ruLXgl6FG13ibMpEau1PG5umcLEQyrIojzl27U4T+beVf8SZi5gT BjCEI++zAS15F/2RVpCNxwzFmTvx2rsBBZIzN7NpcmupI4Yef7TpcIX9BnNO/pkAkKiazr qbd3+QCEmiHMqDm3yWHW5nOLbskK/w3nocKEa1+cIneMAQf1F7YdAr2+FAutKiVcnVZF1g jiV0bZzqj/7kuA9FthPmVdUvJa43VIZvCk5DnazbaY5niS8MUwBOLoShtKEy6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZjr1wlcictqb96uxl916ZA+ypYPxvaIOxphGiopgzE=; b=xeceJ6NvtzC+hYxggIiRSoigsVEBcT9OSQEWvuOdtdU2d+QEFRwIx+MSaH92/YWMj5Xl6F 9A3drLSWa8ct993EmlfIyfn2HiimmsWsiKVrANpFJFITTXTE3Hva1CPQ6LzTMSCTzGxIdM pJYGSGyhEzOLBSxKbK3eplQKJdyjaTjj7fh6yThjm7W8js8zQ3lB94vD5N44xr+8wAbCDP FUkSyW+AbA9mXVjeWeSiMMwCLrUpw7x4zbomLDP5iFnB/ftIaV+2tzCI8oh5TbKk/he0iR DRiw+nGGwe6dhY6iOg9pA6Z+0/tclqaV6DE2Us1L84JBcPHZiFOdjUhwq9VTdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760963173; a=rsa-sha256; cv=none; b=AY4uMtT4DQKetPQxJnh+HmiMEZUxrXPJlddyesXsr27FnGqW4/A4eBx61P2I+ijK1cGzA0 it29IA6ggVbrocSF0BGAZyUIf3/yl5SlU+J9OiauAPnmM7iUNPxdFhVOpiyGFifhY6Lldu UoSjJiO59RodYXrcT15OeYcK4uWffUDznVgafmBab5k+sbYfT6OmAgfLIc+QLfkAVfZgBY e7SzTjf907bedrrCclXQsF6T3An/N2AzwcK9Bt0+xHhP5xNOdEmKraf4A4nLhv0HUm+7KB u6Vv4grft+4Ix7A1jdKQGPvEOjF0SpuhlbxPftRlO+qYYXPV4WawE6vVgGbgjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqvmN6WG1z1C2X; Mon, 20 Oct 2025 12:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KCQCrD006773; Mon, 20 Oct 2025 12:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KCQC6J006770; Mon, 20 Oct 2025 12:26:12 GMT (envelope-from git) Date: Mon, 20 Oct 2025 12:26:12 GMT Message-Id: <202510201226.59KCQC6J006770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 34710b2c08c9 - stable/15 - login.conf: Remove never used ignoretime/ignoretime@ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 34710b2c08c95b8cdee96e77693c2e4ddef9bfbe Auto-Submitted: auto-generated The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=34710b2c08c95b8cdee96e77693c2e4ddef9bfbe commit 34710b2c08c95b8cdee96e77693c2e4ddef9bfbe Author: Paul Armstrong AuthorDate: 2019-09-06 21:40:01 +0000 Commit: Michael Osipov CommitDate: 2025-10-20 12:25:49 +0000 login.conf: Remove never used ignoretime/ignoretime@ PR: 240378 Reviewed by: otis (mentor), glebius (src committer) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52991 (cherry picked from commit 4835fc45efe8b593fa49786ec4bfb6ce5050756c) --- usr.bin/login/login.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.bin/login/login.conf b/usr.bin/login/login.conf index 1069da17b4db..c65a83caa565 100644 --- a/usr.bin/login/login.conf +++ b/usr.bin/login/login.conf @@ -46,7 +46,6 @@ default:\ :umtxp=unlimited:\ :pipebuf=unlimited:\ :priority=0:\ - :ignoretime@:\ :umask=022:\ :charset=UTF-8:\ :lang=C.UTF-8: @@ -149,7 +148,6 @@ russian|Russian Users Accounts:\ # :requirehome:\ # :passwordtime=90d:\ # :umask=002:\ -# :ignoretime@:\ # :tc=default: # # @@ -174,7 +172,6 @@ russian|Russian Users Accounts:\ ## #staff:\ # :ignorenologin:\ -# :ignoretime:\ # :requirehome@:\ # :accounted@:\ # :path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\ @@ -265,7 +262,6 @@ russian|Russian Users Accounts:\ ## - no time accounting, restricted to access via dialin lines ## #site:\ -# :ignoretime:\ # :passwordtime@:\ # :refreshtime@:\ # :refreshperiod@:\ From nobody Mon Oct 20 12:26:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqvmn1YWfz6BY4Y; Mon, 20 Oct 2025 12:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqvmn131Qz42KK; Mon, 20 Oct 2025 12:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q33Aba2sZzfOf6G/aqYAFkSk0uk1ZBLVIQrbjfXO5Lk=; b=rHV1KLXG9DIGemyAXdWdWwDbZKK06hGLUAqi6zxVrNeTr7UROEij3C0QLq8+A3WRAELlxT /OoGDyjeUAv+s65k7Gd1x8CtYCfJ3cwKUgLnCvi4S/sS0hvLF0F4oE5OIbMv4w6bAYyyae cCin5hm9aJJSN9vbcwZMpPQ2xnp5WnVoczmB36CI4RYYbTa3NclYVCj7Hf6YQqtqPYSmiV rzU/EitcZGlIo4dE3v4Bg1XladsEHZE08AZmiZGLSezd287ZfGL7mG87BjE8NZNdU3bUUE R2k3yLecTLCZZUUUrytdF4EQrOw5tBpR+3A7M0wn1yXa18RUiwJ+bDipJOrJ7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q33Aba2sZzfOf6G/aqYAFkSk0uk1ZBLVIQrbjfXO5Lk=; b=qLD8LhVgb3Fyt+vCdWRdp8wdbDysBi2WEKOf9+RG3fxyZLYbky9PxXQL/wdR6z6jim5MtR pZX8M5A863CvpxTFUZAIaiHUa992fTLgrSvOnItcmzztpSXz61lFj+e/okPa1w+80RxDyy qjxT6w2Q9LiRsdElyKBbmANUpZWh56tojqQaIQFuByqgsch2prZgrcOaAv3NRnEGvAEX2a b3MDrzau2gnfsFrclosLAsshCPqoY8PTfcTvc3Lkzvo2CUuXq1Ic62GwgJZOIi8UJyl+Vt NWfiDXF65Cr/753SObNZgB+hpFeCDVzU4K+Q5k0IWKN4+gJMx4+HntVa9qBPSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760963193; a=rsa-sha256; cv=none; b=wkSUi2eW+TLk+dt3+GVv651s852hAzoRDN0kBC8ifymBq9ppUUoqXWGSQfLm7f3jyc5C89 rjqqkCfl5UJEsqvQhIw9yTKqPPwrt0TuxRbWOAovlpDkISg0XMFLs/dxRHQdWIfNkPhR18 nFNXvY4Ngcy+Sag11F2R4OUbbMSB/9TxJEXsx/JeL/6/q+P9s/wn6TJTIE1+QhabZoLplA sXYz1+VwxXg8pW71Yn7kElIVS6j/DAQdWEtExl588ahqOpIDzhs8zQp3CHjQSBh2ONFGku Dd/Zzi5K3EgQVpoLntXWehmYRLNd9Bas9jE7j79/INxh2CukvYnQADgx0NleKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqvmn0Q4cz1C2Y; Mon, 20 Oct 2025 12:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KCQX7c006976; Mon, 20 Oct 2025 12:26:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KCQWFs006973; Mon, 20 Oct 2025 12:26:32 GMT (envelope-from git) Date: Mon, 20 Oct 2025 12:26:32 GMT Message-Id: <202510201226.59KCQWFs006973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 6ec0fbd8ff11 - stable/15 - manpages: Use canonical names for Linux filesystems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6ec0fbd8ff11c7180e52e9c30a071da8f532fd47 Auto-Submitted: auto-generated The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=6ec0fbd8ff11c7180e52e9c30a071da8f532fd47 commit 6ec0fbd8ff11c7180e52e9c30a071da8f532fd47 Author: Michael Osipov AuthorDate: 2025-10-17 09:24:12 +0000 Commit: Michael Osipov CommitDate: 2025-10-20 12:26:21 +0000 manpages: Use canonical names for Linux filesystems The manpages of linprocfs(5) and linsysfs(5) document incomplete names without "fs" suffix. Make them identical to other filesystems. PR: 283079 MFC after: 3 days Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53155 (cherry picked from commit 88b9ca860ef332d4d32e97e0f8a166f12cffc8e3) --- share/man/man4/linprocfs.4 | 4 ++-- share/man/man4/linsysfs.4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/linprocfs.4 b/share/man/man4/linprocfs.4 index 53940d7c02b0..dcd1c642b409 100644 --- a/share/man/man4/linprocfs.4 +++ b/share/man/man4/linprocfs.4 @@ -9,7 +9,7 @@ .Nd Linux process file system .Sh SYNOPSIS .Bd -literal -linproc /compat/linux/proc linprocfs rw 0 0 +linprocfs /compat/linux/proc linprocfs rw 0 0 .Ed .Sh DESCRIPTION The Linux process file system, or @@ -138,7 +138,7 @@ To mount a file system on .Pa /compat/linux/proc : .Pp -.Dl "mount -t linprocfs linproc /compat/linux/proc" +.Dl "mount -t linprocfs linprocfs /compat/linux/proc" .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , diff --git a/share/man/man4/linsysfs.4 b/share/man/man4/linsysfs.4 index 12729a814085..045e1af89173 100644 --- a/share/man/man4/linsysfs.4 +++ b/share/man/man4/linsysfs.4 @@ -9,7 +9,7 @@ .Nd Linux kernel objects file system .Sh SYNOPSIS .Bd -literal -linsys /compat/linux/sys linsysfs rw 0 0 +linsysfs /compat/linux/sys linsysfs rw 0 0 .Ed .Sh DESCRIPTION The @@ -66,7 +66,7 @@ The PCI device hierarchy node. .Sh EXAMPLES The most common usage follows: .Pp -.Dl "mount -t linsysfs linsys /compat/linux/sys" +.Dl "mount -t linsysfs linsysfs /compat/linux/sys" .Pp where .Pa /compat/linux/sys From nobody Mon Oct 20 12:27:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqvpP6xf4z6BY15; Mon, 20 Oct 2025 12:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqvpP1d01z42y6; Mon, 20 Oct 2025 12:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tg7Zg6/BLDxQHuwrIgRphT62Q+/IFc5nuCcs/hUPp4Q=; b=JOhP03uzSmjGt2Iv1NG4Yyg5M/lVc2Yj4Zxs2hxj94f3aTwv+4yuKXKsAoXAYR6OXhz1bb ae8X2uCrdufNNyqUO1tS1vfNEWyMuRLcNgDpDnX9sWjpaipIkpeRH3Y6R8V5Vxozn4Ytk1 L4SY7y54CVRYQjt3KfN0xhiJwMZkOCm1pAJ8IXvwRdWe/sBMpP5vHA9zTItkCrN6SsYopn WUmXEHa/P6j/LubSOFgMpXmW+G2PA1VHujkfsyipym9A95DxbW1BjKkNpMxeIIlTVIJE5S TDKSACnzv8sWYi4FwBCCSzPrgcMNP6/WQwA5X+5xnSQ02HBg1OiXhy5q1tvNbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tg7Zg6/BLDxQHuwrIgRphT62Q+/IFc5nuCcs/hUPp4Q=; b=fjZGVmG2dzXeO0nYPRrhpcotzm/XLoSaiOW8RaEVdZPpUTCBplMu5U5lF6FdIVYvsRZXmk 8AZK88j6INWplxCKcFmhU2QbkAFYAEbPWa43dpm/mOIp9G8qaYPtbWc3xXgdRyOTO6FUMP 9NUpBc8qaZo5aPiJRDpWdTMMeTO031f4Ha/A+xlCygL9FHlMOdfCO6YlDpWI0JxJ+lugWp uq0SxBToj1sPsfVNqzDj0YtGpzHKBvXVzv3/1mGZ9/qyRDTWRxuyCf5Dj2aKpRaJboU4F3 jY2ubM7YC1pw4oxKoFGEKQw9MPuCz1lP8AHuU13fJIXdL5K5J583Ev+6i3hAyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760963277; a=rsa-sha256; cv=none; b=Ahi7uhbIObZxDYwNI+Uh1kyUZi/W/xc3WYaqBtBK57Sf/4yufEG+Oi13D0TgFqDR4LpWo7 lp67k5csJRxIVx/hj474/qEtZXMjg+eKL25GTLm6ElgqZADHnncW9wvajUgBpPXlR/bW1o 0xM2RqXYgQb41ecDEbxTU5I8bZGp0VC9kwlvkLU3kWasgt3cKDoNsfTRUfXdyW/kL8WFXN UZN4nPJohH+XxzIdvQB7fVnVEJGW+PToQ3hJseMpbnbIGgV4CF6Y/Fm5RwndeGnJ3nkCMQ zXsB0Bn3bNjgFIkyXPti6vRLQ1WnlMinGoli0uwNGyck9vcDCW0evGGBh6nlnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqvpP0tDRz1C9n; Mon, 20 Oct 2025 12:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KCRvIY007523; Mon, 20 Oct 2025 12:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KCRvS3007520; Mon, 20 Oct 2025 12:27:57 GMT (envelope-from git) Date: Mon, 20 Oct 2025 12:27:57 GMT Message-Id: <202510201227.59KCRvS3007520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 30f3a4146466 - stable/14 - login.conf: Remove never used ignoretime/ignoretime@ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 30f3a41464667f763b8cceabd23a9b3e466e521a Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=30f3a41464667f763b8cceabd23a9b3e466e521a commit 30f3a41464667f763b8cceabd23a9b3e466e521a Author: Paul Armstrong AuthorDate: 2019-09-06 21:40:01 +0000 Commit: Michael Osipov CommitDate: 2025-10-20 12:27:46 +0000 login.conf: Remove never used ignoretime/ignoretime@ PR: 240378 Reviewed by: otis (mentor), glebius (src committer) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52991 (cherry picked from commit 4835fc45efe8b593fa49786ec4bfb6ce5050756c) --- usr.bin/login/login.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.bin/login/login.conf b/usr.bin/login/login.conf index 1069da17b4db..c65a83caa565 100644 --- a/usr.bin/login/login.conf +++ b/usr.bin/login/login.conf @@ -46,7 +46,6 @@ default:\ :umtxp=unlimited:\ :pipebuf=unlimited:\ :priority=0:\ - :ignoretime@:\ :umask=022:\ :charset=UTF-8:\ :lang=C.UTF-8: @@ -149,7 +148,6 @@ russian|Russian Users Accounts:\ # :requirehome:\ # :passwordtime=90d:\ # :umask=002:\ -# :ignoretime@:\ # :tc=default: # # @@ -174,7 +172,6 @@ russian|Russian Users Accounts:\ ## #staff:\ # :ignorenologin:\ -# :ignoretime:\ # :requirehome@:\ # :accounted@:\ # :path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\ @@ -265,7 +262,6 @@ russian|Russian Users Accounts:\ ## - no time accounting, restricted to access via dialin lines ## #site:\ -# :ignoretime:\ # :passwordtime@:\ # :refreshtime@:\ # :refreshperiod@:\ From nobody Mon Oct 20 12:32:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqvvm40cyz6BYbq; Mon, 20 Oct 2025 12:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqvvm3WZjz43hx; Mon, 20 Oct 2025 12:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTekj5dPVjr7hCZKE8mNFsBjHAYxVWPjhHRfPNqE+KU=; b=AaP/9zlyXLFObiwSMgf9p0kW73A1IFa1L2n2al5gdkHGl7W72egF4crDT9Nbn88DRxa1Xf 3qyDT2BLPcsFnpxkBe02TGjZh/k6zwdpAIf+o0KNGAXLghcKXc61TsXchPCDpYf/+mCda6 U47Ml0O+e3XhkdPfOLR5Zho9irohJmPTJYiooFsVqYSc84S13Hq0ThBsxIwbNhDirT0xu8 LeRhRGAiz3MBIiHd/SlNnbaS/QjKAYMNMNKzoSLRWHLlH4bWQsA2JzCj7EvJuNRq48U0e9 wQKnzQxna26uNlXR1MQM9igzWN65AEcF3tnRK7duB63x/nZmxO6G3qPXmIzd/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTekj5dPVjr7hCZKE8mNFsBjHAYxVWPjhHRfPNqE+KU=; b=V6/XRNPfqz0HIPkaR+C+Cx8YQ5gqmP2a+M5y70JAIImYWCsWDnmGxyY19mpCQfmh++HQYz 9BneS4rg8HHGK7jU9U0EpHQK+b3heTa58Lo3j+U8NuOu7DmUrCN5hoiBJHnKZIZzuCJoMs P4r7ywkHvLggYpZyLO8EivaTTA9D2y2NSFT/ybUEsxy8AFbnwOig3DWeXt/6IF69aSh0IZ 60BEURJrp7HqdNKCV35yVpShc0Vq60LIdJLdYdrRMFwpX0iYpOTSNygqt+J2RHrjnu8kwa QsOIDQODFmSHb+MltPhhq57q5fuiTaHEVrJTnl1quiK8Jj9It5eda6ya/HmSWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760963556; a=rsa-sha256; cv=none; b=B6FGFHOkG42S29BmSaUMEvZGYUpl3FZi9RG6i684SnUwRrKQB+EHByj1sy2TECvSPLc1ck +vW87SjOLor0LLTRiYjekOGJEoaHHWTvHHyMupJ8YrMa6bTZoSsUnWJDXIGlCpPKp00lu5 v0Ph680BTYqmtfTT1vPjUkb0g4Te6cjiHnl28YHDJIrYMdM75RxMpglSSAdjZkBbfh3IeJ mqiqcAS9C3cisN/OqquDCGuqhS2fHWAPqQlsMZVXs/EVycT7RVtIaHVyW5Dyjq4ZGpqbEq /IcZMOYH2hol2jIYi1ftQUT7MggdfZW9TCLj5PTsBXd0gKikCtyOTbcj6A9EXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqvvm33MMz1BXf; Mon, 20 Oct 2025 12:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KCWaQl024566; Mon, 20 Oct 2025 12:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KCWaq0024563; Mon, 20 Oct 2025 12:32:36 GMT (envelope-from git) Date: Mon, 20 Oct 2025 12:32:36 GMT Message-Id: <202510201232.59KCWaq0024563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 9e40b536cb58 - stable/14 - manpages: Use canonical names for Linux filesystems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e40b536cb589a1f54b58c1e53b6e5ec682dd4df Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=9e40b536cb589a1f54b58c1e53b6e5ec682dd4df commit 9e40b536cb589a1f54b58c1e53b6e5ec682dd4df Author: Michael Osipov AuthorDate: 2025-10-17 09:24:12 +0000 Commit: Michael Osipov CommitDate: 2025-10-20 12:32:17 +0000 manpages: Use canonical names for Linux filesystems The manpages of linprocfs(5) and linsysfs(5) document incomplete names without "fs" suffix. Make them identical to other filesystems. PR: 283079 MFC after: 3 days Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53155 (cherry picked from commit 88b9ca860ef332d4d32e97e0f8a166f12cffc8e3) --- share/man/man5/linprocfs.5 | 4 ++-- share/man/man5/linsysfs.5 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5 index 6b30d944b14b..568d4dcd9d14 100644 --- a/share/man/man5/linprocfs.5 +++ b/share/man/man5/linprocfs.5 @@ -9,7 +9,7 @@ .Nd Linux process file system .Sh SYNOPSIS .Bd -literal -linproc /compat/linux/proc linprocfs rw 0 0 +linprocfs /compat/linux/proc linprocfs rw 0 0 .Ed .Sh DESCRIPTION The Linux process file system, or @@ -70,7 +70,7 @@ To mount a file system on .Pa /compat/linux/proc : .Pp -.Dl "mount -t linprocfs linproc /compat/linux/proc" +.Dl "mount -t linprocfs linprocfs /compat/linux/proc" .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , diff --git a/share/man/man5/linsysfs.5 b/share/man/man5/linsysfs.5 index f87f791c5f94..2f437eb88f99 100644 --- a/share/man/man5/linsysfs.5 +++ b/share/man/man5/linsysfs.5 @@ -9,7 +9,7 @@ .Nd Linux kernel objects file system .Sh SYNOPSIS .Bd -literal -linsys /compat/linux/sys linsysfs rw 0 0 +linsysfs /compat/linux/sys linsysfs rw 0 0 .Ed .Sh DESCRIPTION The @@ -66,7 +66,7 @@ The PCI device hierarchy node. .Sh EXAMPLES The most common usage follows: .Pp -.Dl "mount -t linsysfs linsys /compat/linux/sys" +.Dl "mount -t linsysfs linsysfs /compat/linux/sys" .Pp where .Pa /compat/linux/sys From nobody Mon Oct 20 12:33:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqvwy4Xb0z6BYb5; Mon, 20 Oct 2025 12:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqvwy42jhz43q7; Mon, 20 Oct 2025 12:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6z+FR9YC9UVQRogSwWj1FNj6epHYpeuHWckd6QF/Gk=; b=ijOoaoJOcxyApQdVlQBXnL+DW0lw0ym3yEt2oNklU5ARFdop8SVvj8ZIqOv6KulZg24/j8 TeAxgJ4a9ov44hUmjUrgpW5xbj9kbxpE2MKfV8RinzQnhM0F7nSu7RyBpniYQiedfKO8eY hpdc17wsRflNnehgzFybJ4nuFk374uHlpWeb+0Tm9ebsBfAOdVDcM81nq/ArRsRkEVpLfR dFGSuHeKprTDFxUVEpwPknOBBgbM/CxaBPk5EzQBFtcrFJ0KZXK9jPGJwgj+6dliH+qxDG w+CmTVCNaBtUuxvsheSJT7vTj5g2ENq81e94IbOuIcg7GdsBOEPg/VqMtHOetA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6z+FR9YC9UVQRogSwWj1FNj6epHYpeuHWckd6QF/Gk=; b=qcU8Kwh6e5GckJb/qSG2rtg7xHPEH9Y4CZSrsYI13IOjEKXRGULiwyApViXHWqjvhHuxGe ua/aKq05+gVu0xG58duhSvfa3sPtx5QnYRCszpF8sQ4gCBku9Ice79a/Y6qrsNvQ5PMMGj ga1l8AjoWpHBOn77IdINDw1ywM3t9fZZy3wCrHxaR5fabkvEI8MzjCkol55FbWReKzAnip tn5VeSU7OCnOXFwUQWFOUYVHlnk39JQTJs6Hupujqr4K0rlU0nxUaFU0eF9pJfvj8iuE5D 1jTK+NNSFCircFTNgtUYMM2raxmSALaYVKrXQtZKOP2WcVk3bpADXGZEdtdAUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760963618; a=rsa-sha256; cv=none; b=UP4Ywj5PRypBnlQd5V1T487PypFflsBgs2aH+Z2V0VlLPtNgPJsMAqm4nh/2Ly23uMRLP1 PxQpVB5agvriA2k0yXh6tOXwGkZlzQtQhvzM495ydcfa9mCOc92xoz00PREAPGTTRcIoFx wIwjLslyY29uIM1JL2dCT3K6ki0+hDsmFTcdNANAZyEw1E9QjOzWtvKuhfDWj8XvneuzAK +blyNDxWRla0eWzTyS7PFf54esFHPgZrA0Oz1WcbiR0TweNwaK6vc7s17GZeNyTYisHbXD /KN6JKWVqxtaCxPaIpJW/3FIFPv8WRioxAWHe6J1xkve9aRFYeNR1mBVarv8CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqvwy3fHTz1BRb; Mon, 20 Oct 2025 12:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KCXc5a025031; Mon, 20 Oct 2025 12:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KCXcCL025028; Mon, 20 Oct 2025 12:33:38 GMT (envelope-from git) Date: Mon, 20 Oct 2025 12:33:38 GMT Message-Id: <202510201233.59KCXcCL025028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: f8c4b9d71a5c - stable/13 - login.conf: Remove never used ignoretime/ignoretime@ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f8c4b9d71a5c241eabbc36737896fae21c10d319 Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=f8c4b9d71a5c241eabbc36737896fae21c10d319 commit f8c4b9d71a5c241eabbc36737896fae21c10d319 Author: Paul Armstrong AuthorDate: 2019-09-06 21:40:01 +0000 Commit: Michael Osipov CommitDate: 2025-10-20 12:33:31 +0000 login.conf: Remove never used ignoretime/ignoretime@ PR: 240378 Reviewed by: otis (mentor), glebius (src committer) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52991 (cherry picked from commit 4835fc45efe8b593fa49786ec4bfb6ce5050756c) --- usr.bin/login/login.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.bin/login/login.conf b/usr.bin/login/login.conf index 50a2ba9ffb5e..0e25d200636d 100644 --- a/usr.bin/login/login.conf +++ b/usr.bin/login/login.conf @@ -45,7 +45,6 @@ default:\ :kqueues=unlimited:\ :umtxp=unlimited:\ :priority=0:\ - :ignoretime@:\ :umask=022:\ :charset=UTF-8:\ :lang=C.UTF-8: @@ -148,7 +147,6 @@ russian|Russian Users Accounts:\ # :requirehome:\ # :passwordtime=90d:\ # :umask=002:\ -# :ignoretime@:\ # :tc=default: # # @@ -173,7 +171,6 @@ russian|Russian Users Accounts:\ ## #staff:\ # :ignorenologin:\ -# :ignoretime:\ # :requirehome@:\ # :accounted@:\ # :path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\ @@ -264,7 +261,6 @@ russian|Russian Users Accounts:\ ## - no time accounting, restricted to access via dialin lines ## #site:\ -# :ignoretime:\ # :passwordtime@:\ # :refreshtime@:\ # :refreshperiod@:\ From nobody Mon Oct 20 12:34:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqvyK54wfz6BYdZ; Mon, 20 Oct 2025 12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqvyK4ZQxz444h; Mon, 20 Oct 2025 12: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=1760963689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1wgvo1x6fiFPK9u1FXeSKIt+Wlcwv46KOQHwbDOGkYU=; b=kD4wISU+l2bHKePkKaCghMGNh7E/TGPYDGTmkF2o1BBUXrJMk982B59gWhXUC2+PbeGKH/ LNwsN0mAHmoAF0U5LIBBI7KXWGoYZZP0yqZZM6koA9CahOWkAuWvK4lomIrxwXuvVrITs9 8KoMsJQZJqHCbN2cMrfm/OUY+trmMBTqtd4gmCwIqMz9+R2hdl7JtETUztH6Hzdc3tkcua ffXLbNjN7gzw8d0aCC+f3n9+JldkWfhznVhGlFzb6cJDJq6G6Lp1NfDn76FRgJKB+lmAfI Fvr8uzzeZ0645H6ucnbZs70Mivb1IRNP8QM8SNtYBhvdOybMX9BD9u2dwActIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760963689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1wgvo1x6fiFPK9u1FXeSKIt+Wlcwv46KOQHwbDOGkYU=; b=tFuTpG3BVhqTuhPj3kv3vm8PVwmG2mM9QBYtBQkbQIeGjI/KiU+SGMhAZe2AF7sqHrM1UZ 6/pB/VP5XnNIwxLdbriLTUJ7ueU+N5QPjF2YTdnrno7sAbtIaD6ooN9r5Q040GPcPJfF5U inNpqYduRR2qJLDhKSqP0S/k0w8Od8lOaFCi0fhsNF40Oc6Kz4tIcs2MuwYpt+OJHE98ZQ U1fmVI/DkEPPEepPN0sMbBb9IAizyRdlNiZd4tR0B31d3Tm8ijHoSPOxeI3OHBBX0hP4w2 klr8bYuasTa0BdM7pzmsNjSy1ookiZu+s+1D0FTqzKS2lFqqiX3Hfv1nNnMCRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760963689; a=rsa-sha256; cv=none; b=XY5yCLcrojq1E0JwM3htman7uR5dFqrDasuxgN4EoU7Jmh3VNSgfBMnqDciucZXgym+X6r zsvCMDSetAee6SFsU8SosuLJHCtc1c+ExSkTjBATKZtvn0dTJGDBZkg98EHpVM6RjLsUEe 14P3rRs1EBpMVlUmcHApJoHCFcbxDsNTjIioFQ+DEkSpdJgxPiGktvKYN5gG7U4rPF9LV/ 6Xt8KbqaGjspcd58po3Qr8HAlkLK/2X8MlM335RUyUXfbJMxs5FCE+zIGSPqPhpIOaNuem HTdO6mlv/7K0banlyAdpaFNJeJ2rN3Xo2Qv6jGRpX0RqsPCmcvEyg8GM6twIKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqvyK3qJhz1CTn; Mon, 20 Oct 2025 12:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KCYnLQ025488; Mon, 20 Oct 2025 12:34:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KCYn4q025485; Mon, 20 Oct 2025 12:34:49 GMT (envelope-from git) Date: Mon, 20 Oct 2025 12:34:49 GMT Message-Id: <202510201234.59KCYn4q025485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 25150c4f98c0 - stable/13 - manpages: Use canonical names for Linux filesystems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 25150c4f98c0b128267bd7be0c1b83a228a5688b Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=25150c4f98c0b128267bd7be0c1b83a228a5688b commit 25150c4f98c0b128267bd7be0c1b83a228a5688b Author: Michael Osipov AuthorDate: 2025-10-17 09:24:12 +0000 Commit: Michael Osipov CommitDate: 2025-10-20 12:34:34 +0000 manpages: Use canonical names for Linux filesystems The manpages of linprocfs(5) and linsysfs(5) document incomplete names without "fs" suffix. Make them identical to other filesystems. PR: 283079 MFC after: 3 days Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53155 (cherry picked from commit 88b9ca860ef332d4d32e97e0f8a166f12cffc8e3) --- share/man/man5/linprocfs.5 | 4 ++-- share/man/man5/linsysfs.5 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5 index 6b30d944b14b..568d4dcd9d14 100644 --- a/share/man/man5/linprocfs.5 +++ b/share/man/man5/linprocfs.5 @@ -9,7 +9,7 @@ .Nd Linux process file system .Sh SYNOPSIS .Bd -literal -linproc /compat/linux/proc linprocfs rw 0 0 +linprocfs /compat/linux/proc linprocfs rw 0 0 .Ed .Sh DESCRIPTION The Linux process file system, or @@ -70,7 +70,7 @@ To mount a file system on .Pa /compat/linux/proc : .Pp -.Dl "mount -t linprocfs linproc /compat/linux/proc" +.Dl "mount -t linprocfs linprocfs /compat/linux/proc" .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , diff --git a/share/man/man5/linsysfs.5 b/share/man/man5/linsysfs.5 index f87f791c5f94..2f437eb88f99 100644 --- a/share/man/man5/linsysfs.5 +++ b/share/man/man5/linsysfs.5 @@ -9,7 +9,7 @@ .Nd Linux kernel objects file system .Sh SYNOPSIS .Bd -literal -linsys /compat/linux/sys linsysfs rw 0 0 +linsysfs /compat/linux/sys linsysfs rw 0 0 .Ed .Sh DESCRIPTION The @@ -66,7 +66,7 @@ The PCI device hierarchy node. .Sh EXAMPLES The most common usage follows: .Pp -.Dl "mount -t linsysfs linsys /compat/linux/sys" +.Dl "mount -t linsysfs linsysfs /compat/linux/sys" .Pp where .Pa /compat/linux/sys From nobody Mon Oct 20 13:30:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqxBQ1Pl5z6BfKN; Mon, 20 Oct 2025 13:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqxBP6BVsz4Dv3; Mon, 20 Oct 2025 13:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760967021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZN0I32UEYYkyJn+wJKlgCfbwe82FuEKxrWs/vkT8O/E=; b=gh8fdZe7TP0LYC4Zr8ceoUMWw4bK1CkR2OnZKQqH4NefhZfvTHQHSBKjFtDZuxVaUU2srM ZDCwNFqttGKUKj+zBSaNCIkYdw3RaLS2NhvELuOS9ydTSm75y+Ep/kB9i1iAJXduVE5Pba n05yT4HUaxu9GFIaRhcaQf3RfG5zU+rwRMJlGSzpTzESWw3sywX9RWxrz5f2+U11eP6Gw0 VGs5linzWVpWur2HOHPCe0sTUPyv62CGQUVbqGx8KAzIsEMM2E2yAJ3h1yiHkIUM2NDX03 OVkXBTCsssJIoeeg1og6OuzwxOuKy4Z1CuE6eYDarVS+JufKlbWG3WxxZeB/ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760967021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZN0I32UEYYkyJn+wJKlgCfbwe82FuEKxrWs/vkT8O/E=; b=WFSwI2EIzjHnlwr+xXJt/KtDBmtZDRhxz2SjD/fZf0Jkmqc4P4I1evrxZVVLTc5YnBJBuE FTMGXjIvQTAd3+p5kemKoUa3f1T46TDZir9nnYe7DDycCnL5Vlcf6zv8c05lnLDVc920My z1lO3dTkFixbNIS+dEdNhxhNrPvLwN5WCWv6bZBc8dM4pbmqQ+6I5KH9uqi5OrMT+LR3eV Ky42P6Mo4btCb5/k0FKsBA2W5oQTcgajgECvzTDehLXV/nxkKtYeQts/l/7TZI7avNJ70i ZpSU2reKgbKw69QVluA/okMcOD8JyuihsPE0dEfSc8Ia7Ip3FAiUEhSuFWG79Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760967021; a=rsa-sha256; cv=none; b=R8pSk+82Qjbxb7C+OrH1OivQ968/sXhkazUjX8yjnK3y3oArFjmg5Mnug7ZXr6zszDtgcU B+wJ8OHgmxWvxQW0MCpnab6XnJ9l58ja/Yrqucy+MwtBOdRAjG45TfAu2qzFjnxzT3m3d5 zWw9hKFy2fDtuXBcuPdoEeuW6TcHnhYly+8BC2xMJKmOmdQN6tOnic/Y/tLIXUybHuFuYR SJpkXkV9T3idt7QBKsaXe36NqX70T+ZPZ9Oo/cs1xcWe/kfE+CqGBQzYsmEaHIEm1IeOSt bwIj+8/7GboJt7/HlCbD4DDHUPBsN1e4704XX1Gh7OhQ7cCG9IRokcByGCmEFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqxBP5T6PzXL; Mon, 20 Oct 2025 13:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KDUL7L031207; Mon, 20 Oct 2025 13:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KDULkG031204; Mon, 20 Oct 2025 13:30:21 GMT (envelope-from git) Date: Mon, 20 Oct 2025 13:30:21 GMT Message-Id: <202510201330.59KDULkG031204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b0c64ce0ea51 - main - bsdinstall: Use pkgbase release URL for BETA/RC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0c64ce0ea51dc9774ddb972d28a5cfaeb34465d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c64ce0ea51dc9774ddb972d28a5cfaeb34465d commit b0c64ce0ea51dc9774ddb972d28a5cfaeb34465d Author: Ed Maste AuthorDate: 2025-10-20 12:38:03 +0000 Commit: Ed Maste CommitDate: 2025-10-20 13:28:49 +0000 bsdinstall: Use pkgbase release URL for BETA/RC PR: 290238 Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53214 --- usr.sbin/bsdinstall/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index e5bb3197fa05..5d7be97ed7cf 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -22,7 +22,8 @@ REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE SUBURL= base_latest -.elif ${BRANCH} == RELEASE +.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC SUBURL= base_release_${REVISION:C/[0-9]+\.//} .else .warning Invalid branch "${BRANCH}" From nobody Mon Oct 20 14:06:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqxzk3DYdz6CSRG; Mon, 20 Oct 2025 14:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqxzk2QXwz4MYG; Mon, 20 Oct 2025 14:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeuI1EN9YH44pWucljn6/0UopoogfAdCdnIrvvIgX2k=; b=uo7YnZzHWV+fK5/vrdz2s/jTX0cRcznekzxNp5NxgurrlOUQONnGGD8Xeenp6N/OpFGCF2 urgBVu5RmABfzBYjMDloYb0a9AGC8NDFPX5aLqPsvbBHK+PATpTq+iPgH6l5TjKG4Ew0RW ITKxwgdrMofZkIUn9Oz3Aq6CMYZRuIaFBU8FdK46o7QMP0qPjla7KDYC1lnS5XQ2cX5xgK QqHYKGhRk5czSP9Zkowgsdc7B7Ctgs9B+7xgjkL2p77dWeEcjlhzebF5+Wxz0NeFLvaaDW Prk/35U95B9Gr2RmaRJGf+cAPCO/Hplyd0IoLS28boGuo8iUrzAJvwZAxgj4Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeuI1EN9YH44pWucljn6/0UopoogfAdCdnIrvvIgX2k=; b=tLenkckGNbt92oggsTdZ69IDYj3ZBsQ4s+1a56p4Jqr2qD2kJzZHGHim0CN3jwxIGIMdkl g8kHnEj+kG2E2h9IzxsWz1W6wCuWTXCAt/d6hlhl/uml9TITcecImyGVYtJ1Mz1oKHvUO+ xXLbNnb3vyoHx4NxqIk26iBJlHfiKSj23xpo4M+4YH0GTelRQfSmjwIX4IwyTFympBYgva 3DyYOm03CksMZ8ppJe58X7tOzPx4VPEIHcLd/4bW1cBkienVD5JNEtPhrrCmbutlJQVjkg SH6sxxCPskIznldOvUtP7u4GsDgV8xCiu0KjaRomwveT6dXyXdMJ8Ci+IpSjCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760969170; a=rsa-sha256; cv=none; b=h0/Bllkwq+HynUa6AaJwcCegrPEuiG/hRhDtJnYa5OVDkF1GZ2uwxeUisfA+YecVtQFUCP qjECEf660zrZtbkt8q4T06D8aICTGf4Lllv2ybLUk4tKYuOLfiWXBQLrTr/ZS9pvqFQQt2 g9/ToezwQy2fAgdXLoYfmsJ6M8oNp+UI9CDhk72leDv3NvUTaeYnAAryXYW8tllEfmgPe/ qlPgzXKn8ejYpr+/5RWKIGfgFzMiX7grqRKee71y3BhpK2o/88iqDnDUtf56s+CDY/CK4C 9RwBEtd3UNkqDSJStkNosr/WItLvC/hBv80g+uw1+qXp8nqKVNOclxQQU9b2iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqxzk1hKmz1fw; Mon, 20 Oct 2025 14:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KE6Aiv096647; Mon, 20 Oct 2025 14:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KE6AvX096644; Mon, 20 Oct 2025 14:06:10 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:06:10 GMT Message-Id: <202510201406.59KE6AvX096644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 4c667615372f - main - snd_hda: Add device ID for ATI Raven List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c667615372f927864734d725f51d14c441216a6 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=4c667615372f927864734d725f51d14c441216a6 commit 4c667615372f927864734d725f51d14c441216a6 Author: Dmitry Luhtionov AuthorDate: 2025-10-20 13:59:57 +0000 Commit: Alexander Motin CommitDate: 2025-10-20 13:59:57 +0000 snd_hda: Add device ID for ATI Raven --- sys/dev/sound/pci/hda/hdac.c | 1 + sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 80028063bb0d..8a325c538b9b 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -170,6 +170,7 @@ static const struct { { HDA_NVIDIA_GF119, "NVIDIA GF119", 0, 0 }, { HDA_NVIDIA_GF110_1, "NVIDIA GF110", 0, HDAC_QUIRK_MSI }, { HDA_NVIDIA_GF110_2, "NVIDIA GF110", 0, HDAC_QUIRK_MSI }, + { HDA_ATI_RAVEN, "ATI Raven", 0, 0 }, { HDA_ATI_SB450, "ATI SB450", 0, 0 }, { HDA_ATI_SB600, "ATI SB600", 0, 0 }, { HDA_ATI_RS600, "ATI RS600", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index c11e6b2d6810..8fb54108a833 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -154,6 +154,7 @@ /* ATI */ #define ATI_VENDORID 0x1002 +#define HDA_ATI_RAVEN HDA_MODEL_CONSTRUCT(ATI, 0x15de) #define HDA_ATI_SB450 HDA_MODEL_CONSTRUCT(ATI, 0x437b) #define HDA_ATI_SB600 HDA_MODEL_CONSTRUCT(ATI, 0x4383) #define HDA_ATI_RS600 HDA_MODEL_CONSTRUCT(ATI, 0x793b) From nobody Mon Oct 20 14:06:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqxzl5Fvyz6CS9X; Mon, 20 Oct 2025 14:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqxzl32Ypz4MN9; Mon, 20 Oct 2025 14:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCj5cElTIA/zIAPo/vpkufoFW2DLIcgPAOGRSNySaic=; b=FYfcLL2Em1dqFWcNWPS0RGwgZaR663s/3qKWMUSihvsoqJsCtaHRiVYb1hyX3lZdMhqn5Q kQ7x69BNOBOkb3K9Uqiz06kF1/KP/oCp3R14cPyZIyiss+tppiYUoGxRgsiyyMeh5HH5+P prMWWa6zzW8uAShtfUStCzWL8EyvKh7iTgp2XsnpUKCY1ZI07ublEg77+p+exHFa33nzMv dt4SxmoBZaArHCf+ovqD1xvJfSAU4k3fQVrOxTu85U65qSEkTyeejmpboy3K2vrT/iFrYf XzLu1qVAFwSRzi4T7gcA8st/HMbrv4RhtriNN7VCxUnu4+muHKLlvOrcasOV0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCj5cElTIA/zIAPo/vpkufoFW2DLIcgPAOGRSNySaic=; b=VRAtHkLljlh5PDIBTlbJtsXQg5ZtQKGhnLwxG/akaQT3wGEBQX5E5yi0ga0dFf7s1MWla8 S8u9E87fd24DxUd51o4sb2+kLJYve9y/+hJn+y3jgovjmMPapBx+BQhLZr2Wk/ar6H6fVq Y40F/JifFfZ4U0dBILzv0QZwHh3V5UvsMwOb6pqhJNYbZ7POLv/f2leHqY2+rYlXJCRxFt pkPjmw+/kFi2zLbEF27yfIBa3exd/iAHxbnB5Fm/btjcljZNqqnWFjmaSuge3n7y3Nvwfs oukIlFdNSuBcsi8NI3aEGQwt8KXNrigToU3+2Zvl+UchvThP+Pg4wa+W6vZhLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760969171; a=rsa-sha256; cv=none; b=Umi8Ikufyf8uVRmMAsRtaPvZqZG12IJWUhrl+Nc1+0MNW1TS5k+1cWXWqz0NbSUjjfnSOr 1exyxdWMh+k8M4XB+8B/Wvu3B7c41V2WVZhXP4V4l6UyzY60+hCap2pfJf6Qd0jLbtpm2J 4aBzgJyLJ8IZTJ3QDYWKWSPHSjGdyLVPQa4NvW0Nk5yB+Rll5Je72Lo5HmyX6sC35O7yjt 8qMBAobpj8s5hFHPRaiaurJqMT79yc5xU+vY0a0nzJyhaRAZlV+Ds3/kzrBEGcY6iuUDjY gNfzryjehyL7uSk65QSUSuHduWiYjbvF/4erjLPH9IpFoTpqRHPOez8AII2L7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqxzl2dv9z1RS; Mon, 20 Oct 2025 14:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KE6BUZ096685; Mon, 20 Oct 2025 14:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KE6BIE096682; Mon, 20 Oct 2025 14:06:11 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:06:11 GMT Message-Id: <202510201406.59KE6BIE096682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a2838e818cfe - main - ehci(4): Add ID for Realtek RTL811x USB 2.0 controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2838e818cfe5b150725776cc9ab45bb8f65c390 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a2838e818cfe5b150725776cc9ab45bb8f65c390 commit a2838e818cfe5b150725776cc9ab45bb8f65c390 Author: Dmitry Luhtionov AuthorDate: 2025-10-20 14:05:05 +0000 Commit: Alexander Motin CommitDate: 2025-10-20 14:05:05 +0000 ehci(4): Add ID for Realtek RTL811x USB 2.0 controller --- sys/dev/usb/controller/ehci_pci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index d7298ab89df7..9550002e3b70 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -88,6 +88,7 @@ #define PCI_EHCI_VENDORID_NEC 0x1033 #define PCI_EHCI_VENDORID_OPTI 0x1045 #define PCI_EHCI_VENDORID_PHILIPS 0x1131 +#define PCI_EHCI_VENDORID_REALTEK 0x10ec #define PCI_EHCI_VENDORID_SIS 0x1039 #define PCI_EHCI_VENDORID_NVIDIA 0x12D2 #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE @@ -218,6 +219,9 @@ ehci_pci_match(device_t self) case 0x15621131: return "Philips ISP156x USB 2.0 controller"; + case 0x816d10ec: + return ("Realtek RTL811x USB 2.0 controller"); + case 0x70021039: return "SiS 968 USB 2.0 controller"; @@ -402,6 +406,9 @@ ehci_pci_attach(device_t self) case PCI_EHCI_VENDORID_PHILIPS: sprintf(sc->sc_vendor, "Philips"); break; + case PCI_EHCI_VENDORID_REALTEK: + sprintf(sc->sc_vendor, "Realtek"); + break; case PCI_EHCI_VENDORID_SIS: sprintf(sc->sc_vendor, "SiS"); break; From nobody Mon Oct 20 14:12:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqy6Y09HVz6CSs3; Mon, 20 Oct 2025 14:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqy6X6FdXz4NK6; Mon, 20 Oct 2025 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdEbx1SbuVSRRyRZkZD8I59tI7oz7o467gyJ3okZFOM=; b=ODo593E397Z/Xd0LfN11tF+uTGaE1VyhQgfxbJr7fdapiyCY1pje2GPTE3sAycOaOI5m3D P8fkShAzE76japQ53MpEKWrUD1YwNciPwt/ZP+Kk+Dr/0SZcotKDwjLyehElCRYtVDHgdx YRt+mfwB2XGvUZ8uxTn6pglmLSTu1sXjILUF3E6F4PtkTRZbEBCYBZF1Qf5O0mo+6QyY9d qaiAp43jfqiOuP4IWKcU7sIsX3Higzym1C1V0LwgldyCEmNyOXVuoZ15ZQ3YPYL3qNmVWj mkn1mqf+H/L1WaiKt44qPDgn/fDpeirHFrOitNw0I7uqoQORkQKu64bycd9X6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdEbx1SbuVSRRyRZkZD8I59tI7oz7o467gyJ3okZFOM=; b=dWAJE3hZ8wbzYlDXteX/HXkW9NzYShHw57K0+hzQJVCWFkEgzDLf8IXHawuK6ufRxRN6h8 /Mwn1+Fv25G0Izv+ltxSq4629V+KG3g/J3knE0Fi+Up8Vgbcg5ZirNcP2r9NI79slBmZP6 85hDvzgqyIhj5bL44uFTyV3/Mk3v6BCxYpP9Rk5i8OISEHL53D2d2ZEzFxR4YJttYiY6vd XihHZM0xFRGSF2+X/HU1uPm5qKwawGY2Onfnjfm3C0Zx2R//iciTJi9RZgm16teAnQb8lR 3QU5reyJGswCf1kJK0ZjYmxkEtNwj4EL9v4OtAeG6Yhe3/e9opiQOT6Mhl7Abg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760969524; a=rsa-sha256; cv=none; b=yZkYNXZDUYSZQ63yGOB6E8eEputaiZi7gpRKxfJsPDZl02PpjSyk+Nf++jncQCKa1q1opc Z0bRYo9fRujW4jY+aq8Sgi/N4DivZT7Qu3o8E8Ca7djyWcNJTl/gEIvFiUjLSoWQXh794V R4lPwfcM1lLZ2HsLG7Q4gqOaHcortjp2h0UGqnXykpzd98Ng09lhkT07a5kS2DorTsOyfe VVgJ2D8zWRvDApGO7iHdZKg7FqMz1fPM2DpcBGc1dg938UWj0NYkHdXAr2ear8d95gEolk RoKYYIv0MzfHJQkhhTUWMjfSzL+ROMYnKBhNqbBQZz7BsgOLGOYP+S3GUyA2IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqy6X5mlzz1gV; Mon, 20 Oct 2025 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KEC4oX014206; Mon, 20 Oct 2025 14:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KEC45c014203; Mon, 20 Oct 2025 14:12:04 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:12:04 GMT Message-Id: <202510201412.59KEC45c014203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: d4ccbbce399b - stable/15 - Add random Intel Elkhart Lake device IDs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d4ccbbce399b71c8b32e5eb379468d107a6d5964 Auto-Submitted: auto-generated The branch stable/15 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=d4ccbbce399b71c8b32e5eb379468d107a6d5964 commit d4ccbbce399b71c8b32e5eb379468d107a6d5964 Author: Dmitry Luhtionov AuthorDate: 2025-09-08 16:28:24 +0000 Commit: Alexander Motin CommitDate: 2025-10-20 14:11:22 +0000 Add random Intel Elkhart Lake device IDs. --- sys/dev/ahci/ahci_pci.c | 1 + sys/dev/ichsmb/ichsmb_pci.c | 3 +++ sys/dev/sound/pci/hda/hdac.c | 1 + sys/dev/sound/pci/hda/hdac.h | 1 + sys/dev/usb/controller/xhci_pci.c | 2 ++ 5 files changed, 8 insertions(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 9e7cfd4a9a33..2b4cb37275a6 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -195,6 +195,7 @@ static const struct { {0x1f3f8086, 0x00, "Intel Avoton (RAID)", 0}, {0x23a38086, 0x00, "Intel Coleto Creek", 0}, {0x31e38086, 0x00, "Intel Gemini Lake", 0}, + {0x4b638086, 0x00, "Intel Elkhart Lake", 0}, {0x5ae38086, 0x00, "Intel Apollo Lake", 0}, {0x7ae28086, 0x00, "Intel Alder Lake", 0}, {0x8c028086, 0x00, "Intel Lynx Point", 0}, diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index 728bb942d503..e4d87fe1fed2 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -107,6 +107,7 @@ #define ID_COMETLAKE2 0x06a3 #define ID_TIGERLAKE 0xa0a3 #define ID_TIGERLAKE2 0x43a3 +#define ID_ELKHARTLAKE 0x4b23 #define ID_GEMINILAKE 0x31d4 #define ID_CEDARFORK 0x18df #define ID_ICELAKE 0x34a3 @@ -206,6 +207,8 @@ static const struct pci_device_table ichsmb_devices[] = { PCI_DESCR("Intel Tiger Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_TIGERLAKE2), PCI_DESCR("Intel Tiger Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_ELKHARTLAKE), + PCI_DESCR("Intel Elkhart Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_GEMINILAKE), PCI_DESCR("Intel Gemini Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_CEDARFORK), diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 90cd74d28b3d..80028063bb0d 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -133,6 +133,7 @@ static const struct { { HDA_INTEL_PCH, "Intel Ibex Peak", 0, 0 }, { HDA_INTEL_PCH2, "Intel Ibex Peak", 0, 0 }, { HDA_INTEL_ELLK, "Intel Elkhart Lake", 0, 0 }, + { HDA_INTEL_ELLK2, "Intel Elkhart Lake", 0, 0 }, { HDA_INTEL_JLK2, "Intel Jasper Lake", 0, 0 }, { HDA_INTEL_BXTNP, "Intel Broxton-P", 0, 0 }, { HDA_INTEL_SCH, "Intel SCH", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index ff3a1d0dcfb5..c11e6b2d6810 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -66,6 +66,7 @@ #define HDA_INTEL_PCH HDA_MODEL_CONSTRUCT(INTEL, 0x3b56) #define HDA_INTEL_PCH2 HDA_MODEL_CONSTRUCT(INTEL, 0x3b57) #define HDA_INTEL_ELLK HDA_MODEL_CONSTRUCT(INTEL, 0x4b55) +#define HDA_INTEL_ELLK2 HDA_MODEL_CONSTRUCT(INTEL, 0x4b58) #define HDA_INTEL_JLK2 HDA_MODEL_CONSTRUCT(INTEL, 0x4dc8) #define HDA_INTEL_BXTNP HDA_MODEL_CONSTRUCT(INTEL, 0x5a98) #define HDA_INTEL_MACBOOKPRO92 HDA_MODEL_CONSTRUCT(INTEL, 0x7270) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index d5cfd228a429..820fb2f738a1 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -178,6 +178,8 @@ xhci_pci_match(device_t self) return ("Intel Tiger Lake-H USB 3.2 controller"); case 0x461e8086: return ("Intel Alder Lake-P Thunderbolt 4 USB controller"); + case 0x4b7d8086: + return ("Intel Elkhart Lake USB 3.1 controller"); case 0x51ed8086: return ("Intel Alder Lake USB 3.2 controller"); case 0x5aa88086: From nobody Mon Oct 20 14:30:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqyWm50Tvz6CVtY; Mon, 20 Oct 2025 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqyWm4NpNz3Cj6; Mon, 20 Oct 2025 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evYNlDkamZTVLSArhV+aXjUzeTzoauj/jdKIXfjj+Rk=; b=avA+YXQ0x85ZmkH9j4sawhyveuSSYd+9hVYOvZfQp1yo/qzDrWF7ef/atgxEmx4Mn2JsST 9jjDu4Sh/KPxNw9yrgVFEHMvSZ86FD6bRVce/qj2uGfg8hJKumJVbuWYr+0htbMvF+t9NR Pr9aUwNjDLEMYrq+A7Q5xl6YJ1zC2yfKLLeYuIeNdFeW/Zl9qHd6V7vhwecGY80lp5F18T hvPqk7OA/i0fepXAWb4WiPON8v570XHjQqZn/wSHFG+L+Ku1L1crpXRkWKPMJ4jbHdEWfS x9KkNv8JnWXg8SAIxmJwZ9/jezMJu+apT2Iw7LQCahqy3HhWwB6p7rybRwpYpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evYNlDkamZTVLSArhV+aXjUzeTzoauj/jdKIXfjj+Rk=; b=Knyshilk1vhWPCJY/wOuOcoGEfnGvtkg0nC2u+62Ch4RL6ci4WhRBg37SSFlFDsjUyhpSD JK7JQBLCKXtwGP6G4vAas6rhFP9MXH0KhG8dtvaIS4jy4XmjjcqyP1xDS0p0x1bikMguOb WugD/N0mjTzCi8k9eBV1SiUnar+W4CZEofGIZGxftCfjAXjZcNKYmRH9MwjdqdLD5cYtnw feds2rhSBfU2+Uc3S9mEGbO4YpFtFzkiw0SYW0RflJstpfWfBp0vWsvjeiMdIOvU0W0nUb VCE0shzARuHcXkHuZqMy+TvkVhsgznYRG5uJKYVXVyHJQu844TfNZ4GxucBLjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760970628; a=rsa-sha256; cv=none; b=mOfU9UD+xxvvua8AblMNJ2u0WyTv1kPNsPjY4wMXklUcqZQF2p5cJkoQ+b9gUAdj5i5ttR B32mjt9f2/Bf9HqKxryHHUi8cNemmu0CytzSb8EjNQQkdij/MD190Juu7KHzSkc/lKvUQo 1RIracUHGxzR2Smrz4HaupMS71fsJe6Xa+Dfk8rnaGf4Kd4rrgta0nNNdlIPBCnj7p6n6v 4PzjnT29Gxv0nKBx/nApuzQ3bkhRjKUHWrOWf75ij/X5K0LeISWFlLzovMUX0aC1/NWzaA Ipy0jWEn9C19mMvASteQqhwj4AfNYHMLC+MRODtIMH3Wsjs8COroYX/ZFGP9iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqyWm3WJGz1hc; Mon, 20 Oct 2025 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KEUSbs043356; Mon, 20 Oct 2025 14:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KEUSVJ043353; Mon, 20 Oct 2025 14:30:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:30:28 GMT Message-Id: <202510201430.59KEUSVJ043353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4ee0ddae1dab - main - sockstat: fix column length for PROTO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4ee0ddae1dab05dd8e3f273d861043c3e2919f23 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4ee0ddae1dab05dd8e3f273d861043c3e2919f23 commit 4ee0ddae1dab05dd8e3f273d861043c3e2919f23 Author: Michael Tuexen AuthorDate: 2025-10-20 14:26:52 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 14:26:52 +0000 sockstat: fix column length for PROTO The computation of the length was not taking into account that IPv6 endpoints, which are not IPv6 only, have a suffix of 46. For UDP and TCP this bug was not relevant, since tcp46 and udp46 has the same length as PROTO, but sctp46 is longer. Upcoming udplite support will also be affected. Reviewed by: asomers MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53212 --- usr.bin/sockstat/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index d1ea6b1bc958..abb73acafc2f 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1196,7 +1196,9 @@ calculate_sock_column_widths(struct col_widths *cw, struct sock *s) first = true; len = strlen(s->protoname); - if (s->vflag & (INP_IPV4 | INP_IPV6)) + if (s->vflag & INP_IPV4) + len += 1; + if (s->vflag & INP_IPV6) len += 1; cw->proto = MAX(cw->proto, len); From nobody Mon Oct 20 14:33:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqybm6fmFz6CWCB; Mon, 20 Oct 2025 14:33:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqybm6BBCz3DLN; Mon, 20 Oct 2025 14:33:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DNsBe0BYS6GmfGCDI+L2Tj1p00b1++UDPPFz5LexMtA=; b=s0mPPD5ODum+azbZT+emeGGph/0tG12br604RY0e90jfq67TEndUkZ9hw7fPYsDKWTqhDr X6mFxS2KsyCm2WajLKJ/6MS8Yfx9xXO8uP3NRgNo07s/boETjogGFIln33zPkUz7byM9FZ kzJy/WeWwgELHzDGOvU6HAEtaNERtpbkQO7TQ8sde2gtHN6uOyq4/wCUcQMWB5vnxkEseO ea9pa479dPPFlimcerM+Vj72W1U5ARHf8rnOBeOJg6O3Qd9IWbRAY0GhRkcgy+BuagUm80 f4BabpfSFdO/m0rNLafI3485D8Bxcnqo1lFWMGs8zXBBvFYZ3rnvBcuPOonfew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DNsBe0BYS6GmfGCDI+L2Tj1p00b1++UDPPFz5LexMtA=; b=fbDlTSmodTfmrnM/0nORAlyWkUerZIaMtglujYqqbOFzC/p17rbgH0frZG9J7hg8Hlp1li YeFi8g8/El94O4TujvoqFglitCOYop9bmsATaLDp8Cp2Ob1LV6PguSiQgDYIUAl/jdRxTc vy9Mo4eD1S1EoIk1T1osYOt5VKuGjoh0ZF5fD99jYcRQdcLO9DiTKlbRw22mvaOKck1T2k xYDYf5U0fIUQMUsOtIQ74k+n2C2oVhiG0zqsJ4MP5qf7nNZEnxrMJ3gujT5S3E0bqHvskn 3IvCLdqLK00a0bku/PRBJ1FlZ1WgIPvgFlAhgQIiL+p63UbtBq5AemLE1MM88w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760970836; a=rsa-sha256; cv=none; b=XS7f0PPxLdSg75EIvg27/33p66POLgjNdLmST1Z67JVnzqPyD2OuPHSyeuD/yQj3dG71Nu YOsFQ5H6NmdxuPr7Z/Lusqel39chItnm2zquFSfOAGQf7wKzVNGgraBpdIXRVyq5zzFGan tCL+xF+ghNfDZQiJdCAfdFk6L8seDbwfRv9awHKg+aIEs7T6OBT06dOeFbZa++ufMM9PUM i1ykV0xlXO4HxAZyvLSDgVXeDZE9U+WQNvuszHZMeKy8TUiRJsbDiojDIN2g8Ln/APyWVp 3VfXwCk3Dfx/yfs3fNZfH8G46idaKrUUoI8XE4hk3EZ8YfyOIXP5NUEICw8x6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c] (unknown [IPv6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqybm46rzz176p; Mon, 20 Oct 2025 14:33:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> Date: Mon, 20 Oct 2025 10:33:55 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Content-Language: en-US To: Lexi Winter , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/17/25 15:14, Lexi Winter wrote: > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=74a6bb524e5b9ad654a9acc5da5c195f406717b5 > > commit 74a6bb524e5b9ad654a9acc5da5c195f406717b5 > Author: Lexi Winter > AuthorDate: 2025-10-17 19:06:17 +0000 > Commit: Lexi Winter > CommitDate: 2025-10-17 19:13:13 +0000 > > Makefile: Don't allow install{world,kernel} with pkgbase > > Using these targets on a pkgbase system will cause the installed system > to become out of sync with the package database, which is almost certain > to cause issues the next time pkg(8) is used. > > To prevent users doing this accidentally, disallow install* if we detect > that FreeBSD-runtime is installed in the target. The check can be > overridden with DESTDIR=/ for users who are sure they want to do this. > > MFC after: 3 days > Reviewed by: emaste > Sponsored by: https://www.patreon.com/bsdivy > Differential Revision: https://reviews.freebsd.org/D52879 Can we document how users who want to build from source can do so from a new installation that uses pkgbase? I guess it is something like: - pkg install sources if not already (or git clone the right branch/tag) - etcupdate bootstrap - (clearly can't just use pkg delete with a glob, so need something else) -- John Baldwin From nobody Mon Oct 20 14:41:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqyn43vN5z6CWxG; Mon, 20 Oct 2025 14:42:00 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqyn43QYGz3FQJ; Mon, 20 Oct 2025 14:42:00 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760971320; 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: in-reply-to:in-reply-to:references:references; bh=+jZkHjz6bm2ql6JnlIFhT+OFMEfDQpnxyhMcTp+jjVk=; b=u6zg4GvpPo/LbNDDvhCtX9LCRhRqBp/O4AW1deZhUSsKOi+oBZuQRWEwDj8JAuMuIwyQCF aNkEVlmhvEQphUZBTw1nPq6gcYnGIdRoNkJiS7E2EWAz47sYZ5+zJyltzEh5E2fyLF8RAg QoCGdQyNEkH6VvoMRzB3j7UJtj3psBvlmj91q/MG8Oz5KKvIvtc54RpYyzEKpLXysUdYxU hqipV6Lrrwa5eVvhOQFLNgp8GRgEEuOvyzc8+OI/H4H7QIzyYldfYIyF+m30q95QRXQQjp wbyP+PFRaBrWEyRWeOLcfqXc9eLHbztd9dA3Jb+KFAScre1CqAyc43P9Y7sKuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760971320; 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: in-reply-to:in-reply-to:references:references; bh=+jZkHjz6bm2ql6JnlIFhT+OFMEfDQpnxyhMcTp+jjVk=; b=D+H0HoUbbJ74juLMfobDMoAIpr+Ybh9/1gSu7oLnNUzH7NXPIPmIp+xOjvfST07yXFi0z4 wdpirE2mUFdGJ/QxE42UUcSsgTQ09XwLcStJ6PuiOoAcx4UOV4Rgfeo4DAKnYeIWJLVo4V +5hRD23udgShu3K5mDYCk28WebyHqynYEiVa88ud1ausNdtatESsnquBdqArul0VPeVAiK SFK3u1xTnTLOhccpJwyI7xcmHEuiSp+aJjDHl1XAneszCd/9EbXoLSUCPj6h6oMK8DwJwV Fh+cjAl00nWWKy2dGi9jtP/l4bmRkUjbQkU+1k3LbPqJfcgR22rIGcdK+6utMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760971320; a=rsa-sha256; cv=none; b=tsPylvdZBG4d5MaxjaTLW8E8NrYNHxuAdadf88RLjgQkwQz3UPNRaKqVYEXbh2pPjdIwye zfOe80068fnfgkcnCrgayOT+C3J3e+gaWfqoVrLkcP1J+V03CdlFHs07NsuzzP3TU/uCuU NYI1tvsO3KRJ3Yrgt+fJ6biaI79SNyuSaiDebDGbBCPSjNMk9XxktHUGKTPlPDzXabUzF4 /x8fn2NQa+YstJssaX0SPf22jf2+wXgrc55PlCRkeRhopT7HHHWBMfw/gpCDlreVolQepJ tv04faXTx3sNAQGMnBs00hnWXy51ZC0FW5nfOztDpg1mCRzQk1MYSlodF8lrFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.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) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqyn36jlMz176q; Mon, 20 Oct 2025 14:41:59 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 20 Oct 2025 15:41:49 +0100 From: Lexi Winter To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: Mail-Followup-To: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7mOlDylaQmYhxJXx" Content-Disposition: inline In-Reply-To: <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> --7mOlDylaQmYhxJXx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org>: > On 10/17/25 15:14, Lexi Winter wrote: > > Makefile: Don't allow install{world,kernel} with pkgbase >=20 > Can we document how users who want to build from source can do so from a = new installation > that uses pkgbase? I guess it is something like: >=20 > - pkg install sources if not already (or git clone the right branch/tag) > - etcupdate bootstrap > - (clearly can't just use pkg delete with a gl= ob, so need > something else) this should eventually be in the Handbook. i'm not sure what the current state of that documentation is right now, but i know there are at least some important bits missing, probably including this. for 15.0, you should simply not use pkgbase to install the new system, since dists are still supported. if you *have* to use pkgbase, e.g. you're using media that doesn't include dist sets and can't do an online installation, then you can delete /var/db/pkg immediately after booting into the new system, before installing any ports. the system will then be more-or-less identical to one installed from dist sets, so you can follow the usual instructions for updating from source. for 16.0, the plan is to remove support for dist sets from the release media[0], so we'll probably want a way to do this automatically in the installer. that's TBD, but i'm planning on doing some work on this part of the release media once 15.0-RELEASE is out. (right now, we want to minimise differences between main and releng/15.0 for release.) [0] dist sets will still be supported for downstream consumers, but they won't be an installation option for FreeBSD. --7mOlDylaQmYhxJXx Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaPZKKgAKCRD1nT63mIK/ YFYpAQDtqQn7dhFKx8q96T7L1rx/+oZ6QLPTwc5fxv7XkW0otwEArJPWhqEJEZH2 GWFuRJ0quU9dM7PAJOtOameNnUm7IQ0= =SI7i -----END PGP SIGNATURE----- --7mOlDylaQmYhxJXx-- From nobody Mon Oct 20 14:59:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqz9g2SlCz6CYMV for ; Mon, 20 Oct 2025 14:59:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (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 4cqz9f4TNjz3GTC for ; Mon, 20 Oct 2025 14:59:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=LhUCcuqC; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::102c) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-33c4252c3c5so2828381a91.0 for ; Mon, 20 Oct 2025 07:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1760972388; x=1761577188; darn=freebsd.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=UqG0SavFajylZ/ofWN/tOTtrwbNkON+gqs759iT1I1o=; b=LhUCcuqCNNxzNRzpx0YxrH5AcBBAEiwOWLqeJjGEXxLo/gf/xUixyjAvNrX5jd6xvv WAjBRm+ctfFJtpibYORIZHvQ2QA8R8XRAFJxQ3onZi3ArLuHd1mbvE5UEUtGR+SJW8pR GZkzEN5fTAyLwu9Xv7s3VDadzTdmRgDO2ok8b4hJe3BKC1v5Q0jlJ19/BULw+rAosMmd 7gE+tDqo7s2QXMS//NJACUdVMb/W5iLBL+lxDxEf21L9zcVt9WL4SUsgffahYZ15ktty izLUGuNQpCXkqHxUKu4Aq62TwM8tBUHBsN9qqF1rVGR1Pwm4qquAc5Tl/0VKqaw/sqL6 OLng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760972388; x=1761577188; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UqG0SavFajylZ/ofWN/tOTtrwbNkON+gqs759iT1I1o=; b=p3yJXEn4MaluYnY+cqYuQogl4HRJQ7A17w9GYA5b6/gJF99ipiWb1Tu5djPxjPogVn m3JPWwQMAwPtvk4ow7yrGioEw23BfCLLJQZfrxb087Yc8t+CgY1PhjT5qJi9awCl7u8J d4W314WdWo+z3kqfYLExeydZwuBZPt/WqqulE2Ea0s2CV27lIizgA+F5Iol75WKFwjM0 NixAcVf1ftuw6c7PWIr21U4f2Voe40FmKQ/HanzxO+IBx5PPh6OkJXQYEpQP0SviZ1Gz qryXT1mAE8Vp2Hom77QgYrG4zgkNxrOeEfXmuvyzoMgtycB0kVgcn7jJgF6LI6VLs7V1 aTRw== X-Forwarded-Encrypted: i=1; AJvYcCVkArm66j2YfBkqRFDUB614VKGF3ui2lv0g02PWH+A4imvsV5/MwT+0uTn/M+Znz33/5YUGnDpft0VO3rQInLQE/hAn@freebsd.org X-Gm-Message-State: AOJu0Yx9/TEE0TOAhUHrtM2w3LfLPQQ4qsBOxTiqddw/DrlgO+ck5qZd qYQnJMRkDZOnSzKTTg3neA2K9DU+M6+WYIWc8GmPF5vN8byNikbLXmD0ApPlJvCv0JI8ft/+DeD RljInDpqY9DD8YH+AQr9eBwY4JRiWowqU1lKGPoCt0g== X-Gm-Gg: ASbGncvZiT4Fv7yFhbHooqlP0bE0mmdagpiQM4OPMzYzyW1CD6zcw3YtY/tgjax2tAd Z8g2e6REqhGx8ann4CWTC3HrVJVzoCg/8WpNj/lhp+Anz8EZeBFUa9Dvjfd+6AX0qbD3XdRCHKP jH07ohV/feCDjQkKKiDMhKFMRHWV2Bx3MSC2bVaH8rwV6U3+f+ZQ/RgOOIzuJk0mmWprYOVmZdy jlInzaY//dz0oylricph7Rc1BmhhpDQLV1ZJxmG3D+niDsdEVdMrJo5lqMKVcmhXPJN+s0uXTro LcsCQgVb0aw6o4o8gCg= X-Google-Smtp-Source: AGHT+IEvbbnIix7P8hgRVE4bQVmzqXE7M6uJ5ibpur2cQCkLjYbwG1AHP5YDybdlVCgv7BbcOZqVCPvjJflGJkX/lus= X-Received: by 2002:a17:90b:4c8d:b0:339:9a71:efd8 with SMTP id 98e67ed59e1d1-33bcf955a5emr16178480a91.37.1760972388312; Mon, 20 Oct 2025 07:59:48 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Mon, 20 Oct 2025 08:59:36 -0600 X-Gm-Features: AS18NWCGoOtByFnQ9tLVIvZR8OqpzxVRIuy3zZHHAk_TLb3tL1XbxBr-EOtizoM Message-ID: Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase To: John Baldwin , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000aa3aa80641985598" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+]; DMARC_NA(0.00)[bsdimp.com]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_ONE(0.00)[1]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102c:from] X-Rspamd-Queue-Id: 4cqz9f4TNjz3GTC --000000000000aa3aa80641985598 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: > John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org>: > > On 10/17/25 15:14, Lexi Winter wrote: > > > Makefile: Don't allow install{world,kernel} with pkgbase > > > > Can we document how users who want to build from source can do so from = a > new installation > > that uses pkgbase? I guess it is something like: > > > > - pkg install sources if not already (or git clone the right branch/tag= ) > > - etcupdate bootstrap > > - (clearly can't just use pkg delete with a > glob, so need > > something else) > > this should eventually be in the Handbook. Install* should eventually just do the right thing like ports: stage the packages, make the packages and the install from the packages. 16 time frame, though. Warner i'm not sure what the current > state of that documentation is right now, but i know there are at least > some important bits missing, probably including this. > > for 15.0, you should simply not use pkgbase to install the new system, > since dists are still supported. if you *have* to use pkgbase, e.g. > you're using media that doesn't include dist sets and can't do an online > installation, then you can delete /var/db/pkg immediately after booting > into the new system, before installing any ports. the system will then > be more-or-less identical to one installed from dist sets, so you can > follow the usual instructions for updating from source. > > for 16.0, the plan is to remove support for dist sets from the release > media[0], so we'll probably want a way to do this automatically in the > installer. that's TBD, but i'm planning on doing some work on this part > of the release media once 15.0-RELEASE is out. (right now, we want to > minimise differences between main and releng/15.0 for release.) > > [0] dist sets will still be supported for downstream consumers, but they > won't be an installation option for FreeBSD. > --000000000000aa3aa80641985598 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
i'm not sure what the current
state of that documentation is right now, but i know there are at least
some important bits missing, probably including this.

for 15.0, you should simply not use pkgbase to install the new system,
since dists are still supported.=C2=A0 if you *have* to use pkgbase, e.g. you're using media that doesn't include dist sets and can't do = an online
installation, then you can delete /var/db/pkg immediately after booting
into the new system, before installing any ports.=C2=A0 the system will the= n
be more-or-less identical to one installed from dist sets, so you can
follow the usual instructions for updating from source.

for 16.0, the plan is to remove support for dist sets from the release
media[0], so we'll probably want a way to do this automatically in the<= br> installer.=C2=A0 that's TBD, but i'm planning on doing some work on= this part
of the release media once 15.0-RELEASE is out.=C2=A0 (right now, we want to=
minimise differences between main and releng/15.0 for release.)

[0] dist sets will still be supported for downstream consumers, but they won't be an installation option for FreeBSD.
--000000000000aa3aa80641985598-- From nobody Mon Oct 20 15:09:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzNl3XjBz6CZQR for ; Mon, 20 Oct 2025 15:09:27 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 4cqzNk6p5sz3HRG for ; Mon, 20 Oct 2025 15:09:26 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-430ccd45f19so30132845ab.1 for ; Mon, 20 Oct 2025 08:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1760972961; x=1761577761; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=zzQ+DY+WFYmmWiHbkXwabNiiZQEaVVP5YjvSmbY5xIc=; b=PAqvsp875h+13JizAQ9zmXjwgF4ab8oNYLsIuTi7dCgN4HQ+TZZWUa2WFYteq2mJl8 hw/yhu3VETaW057WyhVlN/QJ9/6SRZTika8VjsV0n45IFW5emUTyOsU1CVur1lofzbfL oVhqEnyefqd8AxxEu7DodngvnS6ujhU4dVoFI4oGPdTp7b52pw9MFpdBWhJQRhUz6tG6 7xrqIslTxzBXRifkKoWwYrLL3KRaJ0bKfyRMVpxuHYoUYeA0+KW/fIG8v08QPqnm7cQ+ 6CPBdkHqxCEBX6MOVGN6bkUY+X3BhapTzudgt6BYHgLqccU59IQk36eJRmDsX0csq413 MZiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760972961; x=1761577761; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zzQ+DY+WFYmmWiHbkXwabNiiZQEaVVP5YjvSmbY5xIc=; b=XpWcMGw5f2JOAkdWTUXcI1rb7pVmBOewKB5saXeUHnR2d/L0zHr82QlGLhW56wCiO/ L4LA2piZFxG1Yolxg9DvdQu8omcg3xBOQi+mQY3vNXS8b0oQr0MsgTd24zY94TFjd0cM 2U9ig3FVq3eonnFwLtA17dMKUPb+0fLPqiBuLIrxDNGPLHuf/FWoWFrhe8/LgFBaRQlV gADRRC1q+ByMSSa1bpaIT2zz7EOXC9fptQgTimF5ohwJmWaRRjyKkH3PxGps0z6NED8V fBYRQDo8KS3qxbqiZlIwiRPiOWylNc0P8hDvfthlvByLg5p3Xi6XCLfI2M68GaPeVlyV U7ow== X-Forwarded-Encrypted: i=1; AJvYcCUYKeu55iuEf0dKimoSOKFglE4ECgQwcFtYLINCxk/8diGyV3ur5ZCUuaL/M7PI7D3d4cKmH5RfQqWT6e948Hcj7i6K@freebsd.org X-Gm-Message-State: AOJu0YyMcPAAfmamMA4quQOPLA2SvZkCqKw3PvxxfkINxEuS0PINl6HL kYFXHj6+64WGS57W7NanB12J9y1UBWlj5k/w2HgwhsI6XDyRYTTgG/EdN3PuJ/C4xFE= X-Gm-Gg: ASbGncum4xn4UqJpO+VibTztkFkHBCkByPtiC5H9gaN8pbF8ko6/MlLzpv7wqltckhi AUJYephC4auAPy/SNi5BkIhFmTK4ebEb/obOIR1ttnpNjQ9bLLOJ8KVSkhEnc+BCTXUcv6HU5sL smFR+fhVKDFb6B34eGxSBhcSVwWMEzEz5QP/lkV14VBLZLgvuV/4WdhWmEZWfyG3XKJazHslonH rZt+4KiZd77nU+8yewRZPZ4tstkPptvYHoJdYNchKBzrArxL+Fa5eZleAsiythLGvwFAkHQgUhw +ADz32jmj4kKd2K3RvT6aB8yoBii7+NNPGHgQRIcARQy8qnuVmZmeyjSIk2zxCbYHicX3EH8EtQ LMuTIeF434Vo0AOeJ0QabOzQ1b5CAYqk3QtaNOxJnUv8SObGYt3E+WZq1QukKlGdPG58h X-Google-Smtp-Source: AGHT+IGsrSnyob95QtrNSSFyr41nhno7Lzhwp05xWbB+Fg2g0nwqOsFpAOCQ4ogrqzPZlukaPKx41g== X-Received: by 2002:a05:6e02:188b:b0:430:afe4:6a4b with SMTP id e9e14a558f8ab-430c5294d91mr195036295ab.19.1760972961060; Mon, 20 Oct 2025 08:09:21 -0700 (PDT) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-5a8a9795b62sm2937868173.60.2025.10.20.08.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 08:09:20 -0700 (PDT) Date: Mon, 20 Oct 2025 15:09:20 +0000 From: Shawn Webb To: Warner Losh Cc: John Baldwin , src-committers , "" , "" Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.3-STABLE-HBSD FreeBSD 14.3-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ivtx2jzqxojhfcre" Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cqzNk6p5sz3HRG --ivtx2jzqxojhfcre Content-Type: text/plain; protected-headers=v1; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase MIME-Version: 1.0 On Mon, Oct 20, 2025 at 08:59:36AM -0600, Warner Losh wrote: > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: >=20 > > John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org= >: > > > On 10/17/25 15:14, Lexi Winter wrote: > > > > Makefile: Don't allow install{world,kernel} with pkgbase > > > > > > Can we document how users who want to build from source can do so fro= m a > > new installation > > > that uses pkgbase? I guess it is something like: > > > > > > - pkg install sources if not already (or git clone the right branch/t= ag) > > > - etcupdate bootstrap > > > - (clearly can't just use pkg delete with a > > glob, so need > > > something else) > > > > this should eventually be in the Handbook. >=20 >=20 > Install* should eventually just do the right thing like ports: stage the > packages, make the packages and the install from the packages. 16 time > frame, though. Agreed with Warner here. If pkgbase is being used, it seems logical that installworld/installkernel would create a new (or update) pkgbase repo. Otherwise, I can imagine a sceneario for HardenedBSD users specifically who have used pkgbase in the past, but now wish to do a src-based update. I feel like I myself am going to be answering an unending stream of "why doesn't install{kernel,world} work on HardenedBSD like it has always in the past?" I'm somewhat thinking of reverting this commit until install{kernel,world} are taught the notion of pkgbase. It just seems like the kind of thing that's gonna surprise our users (in a not-so-fun way.) Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --ivtx2jzqxojhfcre Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmj2UJQACgkQ/y5nonf4 4fobPg//cpCYvlCzp039NYVtPTY9G/3+FmwAj34S39CWMTN3coOXC7Xy9ZFs4m5W i/eO4woTDtf/TtGf9FvqMAL/lDtFPDXQ4/zpsLSHV6gVfu885el7wNesQVh7h2U2 QeKbOoRqXT+xF4MGR8AzZKr1YPxAtq7ncAGlAcI6+dg32b+6fAOVQHg6Fg6t5hYp g/fsqLM4B2abRIjjZN5/1cmthXz76Rzqh1gV9PFM5kpd0NGBWrB873J/XyryRNIi 2PcJ5eHuOey33378zNEYyyhtpOYG+IIZ3S34xNs5ljZG1KaMomzRWfuTxGTg4vIJ FazcM6OvSvfSFEJW4Xoure0619EkkKwVT5x9HKXSnTMpD1kmDtdhZlu/E7ywlxS7 8LluP1zqWUvfcw2bWxFgnvogN7uKviO64m4ODhrapiF7ozmIPSIAvU/3mQ4aWBwU 4n67JBGMXBSROUuxMadSm/gCINpWzyXh8JYKYYLaXbDije7Vt0aodwU7mqX/O89w KAbDjoeh/oExbkuqwKffCvz2rjsYV7lh1jZjSwHJM6uvi3I4Awd4UayVgtDDJyD5 +4z0dyc7o16xtVQliKDauHW02s4rUy1uZkCeNhyEA3oEhampnirI0IeDWDpJ3pif x8ryL9K0HHaTO54DR316lZZWZ4eqfZEhsVwk9/Gha9Au8AnDIeI= =PKK1 -----END PGP SIGNATURE----- --ivtx2jzqxojhfcre-- From nobody Mon Oct 20 15:09:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzPB34Llz6CZQY; Mon, 20 Oct 2025 15:09:50 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqzPB28Mjz3HbD; Mon, 20 Oct 2025 15:09:50 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760972990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Sl68a8Bcmh47gZVW7YBLETJVhOxfBPkxN5CG00WheDE=; b=WoJjZ8Ux7DDbl5WWBEVzh8hHLm5ex9VkMYj5UVWd/SXIQN3fJJwOJMPM94CNU8MiCP/AVJ MXfIN/iqPpjsTXZIsSg8d6bJLe4UaLayueDW7mXWzVSa/zanwRgprrZtWGKYfZ8RJtrIP0 AFpcwvNWvOJ9YY+Ey/ndjn2w77QR/BKOIP788Ti2T4qXcFWtQv9Q8lcyVEPxoyvzTlUw6M LiJxnDKHgaJYvGpO1uKbNswlAv1kS/5HaCuNVA9l1IHRrqPhEB5EZOnaOoc5GSaDfFIXJP 1IMWUFfAXZQM/EsMrye2MRwl9WtaqkYak5cHHBpJJgMDjeYzV3Xd3SCpQbtnmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760972990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Sl68a8Bcmh47gZVW7YBLETJVhOxfBPkxN5CG00WheDE=; b=nOghoVWRhIumJ1A6Ox85HqRk6coIWhCY6F8CzEI+YfN+mrv3zjqeqjcDxt5fSfQ9lKpwN1 RHcsArAG9qf4TGWndfz31DWBJnupKI/rxNmE8Hx/xdVWO71GS+wvfuPCDbTw8yCG4ScB/i kaLh/fDHmVu2ZxIO6ZH3rYd5Dx7qrhgsLyOOlrM3aEWvkWN3El8uqZ3tpnTyT1ixy95SP3 iQ2KTF3D6zdz5JjbaOuxVMyhlqkJdUpjn8K4yPLCiNvfw3QEc/S6HcyhWU/kURaEwyb26S 1dccY+uzvmUYlyTHgvKYLKg6eqqjxbxg2rCGCCQGVwa+eOZWOsahZ4LJalLOvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760972990; a=rsa-sha256; cv=none; b=qfhBgMKp18HzNYIpzP15Fo7YI3Uima0KfDF89KmSlYSco8c0ZioSQeKA9xkT/2Sw3Qr8Jy TpjRTVR8SXR4uh9cX3im9TR+hsIFKvOgzqgyQAjBNFDc7nNYJLUTt+41unlTOaUCr3Fr16 H5tYFo3UIIDfnfZHHon6ddCtWAyfPZzXCyPdfcOzHk2/+MDK5q0w8E1lM5Fiysy3TugKXZ AoSZw5D/FnoQP4UBpxdUnvkMbSa0MOVxP9AVd/8R/MTQNidbByFzxn5/5mphKoPF7ibaln K43XokiJsn5tu8YBNBmuc3u9778nhqBsUMIs9sGuhUBA1/BJiFGH31AvbyW/jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.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) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqzP95y57z17PW; Mon, 20 Oct 2025 15:09:49 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 20 Oct 2025 16:09:41 +0100 From: Lexi Winter To: "" , "" Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: Mail-Followup-To: "" , "" References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ItlTkUt7Z8Q0JuXP" Content-Disposition: inline In-Reply-To: --ItlTkUt7Z8Q0JuXP Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Warner Losh wrote in : > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: > > John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org= >: > > > On 10/17/25 15:14, Lexi Winter wrote: > > > > Makefile: Don't allow install{world,kernel} with pkgbase > > > Can we document how users who want to build from source can do so > > > from a new installation that uses pkgbase?=20 >=20 > Install* should eventually just do the right thing like ports: stage the > packages, make the packages and the install from the packages. 16 time > frame, though. we'll see how things go, but i'm not sure this is the right approach. "make installworld" does one thing, and overloading it to do two things seems like it might be more confusing than helpful. i'd rather people who want to update pkgbase from source just learn the right way to do that, which is make update-packages followed by pkg upgrade. --ItlTkUt7Z8Q0JuXP Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaPZQsgAKCRD1nT63mIK/ YJvvAQDHvFcY1AdEX6BFcL1o4lmnimYZj2Emaxs2umis6wZJRgD8Ds2JPWK3Jk4Z tB+bRcNnM8DTSQa34v/d8hlLGqZO0g4= =R49i -----END PGP SIGNATURE----- --ItlTkUt7Z8Q0JuXP-- From nobody Mon Oct 20 15:13:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzTm1Cspz6CZJM; Mon, 20 Oct 2025 15:13:48 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqzTm0Rs6z3Jg3; Mon, 20 Oct 2025 15:13:48 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760973228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kCE2pgg8O5MdtAQhl9dWZsyUSjdM5tcvFneESQoyo6k=; b=xhqhJiMTgKv3AhL/BvRw5doKYm18Fv4sYdZOsPani6IkSv5vwwBEjvhV0NuyJeAFvIqGsA Os2Z2yM1s0q9fwbnXD/Z/L5xUDbaCBG/HHQ42e7oeSeaiuuzbKt0wr637Bu2JxQked3vOv /jnmcboYuFLgTbxALqCWh4N+KTDbh7jR+r3i5SMH7CJ1/4qzeVicRRpWClKKUd1hrNeBh0 cUGKwAy8++UlsxGmyYzOsCPwHjRJ+bAetl7InNmGQZR9czG50qd7U2Xvg3p1rWNoVbMuvJ KuCiEjQRwwCltMgcaIReeM0qaYaFtf/eHnSWVLm+Lfq9m7NkFOpX+FRyF6Kf7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760973228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kCE2pgg8O5MdtAQhl9dWZsyUSjdM5tcvFneESQoyo6k=; b=EP9gSVCz3xMjAggvFYXbQxPJqzfkd8AyeuZoSS8bDRB+XuBvsA7XbeaJ2M6ynuIA1qrWfP /ttQGxvyDpDzwnOO0+2Yoxcdm0Jvej0jWcRgTzzKQLWpT/kRBE9whT9Xp1juglYZYh4fel jgkA37oAYWWPDYWpbk3NW/6wQSbfr/LLgiKKclHwaLtpMn2ZedHpL17EyPd/XU3sZF5X9q E4voTq4KSmI9SNx5w5Jh3+kIFX8kdBLEgIQC+rlK4vJ3XlryQHEy7HbwFluen3+PJYsZlz WC7Wbsx72m911Uj91JLJW1ZAOPDAJ9JTnuVgye2VitgaPTgHdZ/RS9TleuJxbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760973228; a=rsa-sha256; cv=none; b=xiCPVCa/B63DMUPgJq6TTwHpxO3tP7+e4eaV7BZNVIz5AGSC8ejrSF8tbCUcWkdw8Gq1QT Cx7vUVcPVbI0VpCtQWgf1NME39ssbqd1UMbyi0wy+vlZHgJUjuZt8EQru68vyNwZKQZg7W /eD7B5G1RPoVeDx97pzbMiWFKj6Ha+B60TmlJx01mAob3HyuTmbkzQ96DOwfOZPt+nCoO6 PkZ5hI++RDLYzRcnW3VbZ6v3dFmpeUV9NDO8tCW3Hfa/E1TwsLN8td7+ZgSOrsIP+SM5YP nznm4gwQaXp3SllUZbQHx7Iq/bNhlsejv5/HFh4jBkIjucWFSz1+VuMR9o+E6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.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) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqzTl4qDYz17bd; Mon, 20 Oct 2025 15:13:47 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 20 Oct 2025 16:13:39 +0100 From: Lexi Winter To: "" , "" Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: Mail-Followup-To: "" , "" References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eehyQcRPdTIwDTFF" Content-Disposition: inline In-Reply-To: --eehyQcRPdTIwDTFF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Shawn Webb wrote in : > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: > > Makefile: Don't allow install{world,kernel} with pkgbase >=20 > I'm somewhat thinking of reverting this commit until > install{kernel,world} are taught the notion of pkgbase. It just seems > like the kind of thing that's gonna surprise our users (in a > not-so-fun way.) if you revert this commit, your users will end up with a broken system because the pkg(8) database will be out of sync with the installed system. this will cause issues when running pkg(8), for example overwriting files from the source installation with files from packages. if you want to switch from pkgbase to not-pkgbase (regardless of whether you update from source or not), you *must* unregister the installed base system packages first. currently we don't have a good way to do that for an installed system, other than removing all ports, deleting the package database, then reinstalling ports. however, that doesn't change the fact that *not* doing that is a very bad idea. --eehyQcRPdTIwDTFF Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaPZRowAKCRD1nT63mIK/ YPECAQCYoZjcT+rZSt0SQ/Az9pKIMslB1H2CrgL3agwegROmrwEA9wZuD46lFwTR hIO5Pq5CKc5dmsr3QK8qiBWGyTsOoA8= =hwGg -----END PGP SIGNATURE----- --eehyQcRPdTIwDTFF-- From nobody Mon Oct 20 15:17:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzZN5Rz1z6CZZW for ; Mon, 20 Oct 2025 15:17:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 4cqzZN3g0hz3JyV for ; Mon, 20 Oct 2025 15:17:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-430b6a0eaeaso36059245ab.1 for ; Mon, 20 Oct 2025 08:17:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760973467; x=1761578267; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fdlBMvj74dIEQzTz5ECGsVkz1zgfI9Eb1U77XUYOxIk=; b=obqdtv/l4sgq3M5poB7DzsO3tTgID+HZfXsBe38zv3OqripTiE84iHsfYjFLurXaOc mQj62M7V8BLtX+/AIoU0PQ/aQDpF1i4lUw/P59BRPdG3QckWkiYSuF/imi2hA5XvD7en n/pdZD2GPWqtGxy9mA2pD2FcF6Z4YtdYwbySJTW3xrdHm9Y6MUw5aHR1+R7GapNqB2fn 2rvmUVTC6VZrhhI9ptu2yq1NNuqnlvnMHhBWqsQatONjm7ITzrfpl5KFwDVAkHp+LJKW ErUo2fGp+ZxTZc9M6iAc+EuqNpDr27kUacrGxRKFCEbp80NkFb45PxnB90nGj/eLx0Yb vNzw== X-Forwarded-Encrypted: i=1; AJvYcCW5JQS2w0Eo4QnjUuIn/n3HnYs1cO2QiHa7JH44Rsex6aAd5FA+dc7WIUL6kMKuQkgnppT0p80OIvmUB9Hh+pVJ/C8J@freebsd.org X-Gm-Message-State: AOJu0Yyy0tEYF7K0mCRk1jj2Qqih0TYsBX505LBMyg/V0Uey3WTWqvII vYqDaiWMz+5EqE3Rwe+JI/Q49Evrg/5DIS+xYcwCjt4pyTCYhkDQLdVgOWl/krECma6oG8dYbU+ rCL5fYxG6Q50HymRd8WBBL9V0T3jaUfRXfQ== X-Gm-Gg: ASbGnctMdwkwyeW/9R9+/8cQCxFUrgc14z59gHSK5JyQ8FvGxlZSlo373naI+2tRW1f U4ozQ1hAXlscONdE4KjoG4hBuKUBgL5501FJYFBkLzl1+KnS7jVm2kzFa0dCLsYuj6z6MvZCP8E brbxdzIzvtVIvG88f3P+w5XHPFWvKu+y5bH+6cS8C5WsRmvw/xQlSpxtq7Zxk88ZPllqr6/84b/ grsW8dWPIuhhUe5VMVydtmywhjzd2gZFAYp0lvPiMEeWF21k1Rva15tjWYDDW3digndcpI= X-Google-Smtp-Source: AGHT+IFggbPuXm2ijLflgE9X6a9+m6VqTTVuyBrHF28L5x4B7/TNDGzcGviiHu/piFhTR16xfIigqp+WS7MHce6XCO8= X-Received: by 2002:a05:6e02:190c:b0:430:ab4e:7e3 with SMTP id e9e14a558f8ab-430c5268de7mr196306245ab.16.1760973467409; Mon, 20 Oct 2025 08:17:47 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Mon, 20 Oct 2025 11:17:35 -0400 X-Gm-Features: AS18NWDhSTKssApGZciCQzomMbWF4OY1xqJ86bQCTjppNgfMTDS-7A0WWPtlw9Y Message-ID: Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase To: Shawn Webb Cc: Warner Losh , John Baldwin , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cqzZN3g0hz3JyV On Mon, 20 Oct 2025 at 11:09, Shawn Webb wrote: > > I'm somewhat thinking of reverting this commit until > install{kernel,world} are taught the notion of pkgbase. It just seems > like the kind of thing that's gonna surprise our users (in a > not-so-fun way.) This commit is intended to avoid surprises; trying to use a mix of pkgbase and installkernel/installworld on the same system is not likely to end with a good result. This check is easily overridden if one is doing it intentionally and is willing to accept the consequences. From nobody Mon Oct 20 16:03:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0bP2xztz6Cfsb; Mon, 20 Oct 2025 16:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0bP2MLBz3QW7; Mon, 20 Oct 2025 16:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SzvMiQfqtzytZvxR71v+tctPKN0rPGGKp0x799hKnzs=; b=sCPBUup4k/ibEx8GToqHJVlYBNXmRtfl4Q5FWlsZPn5YoGOhtxGIqnJjUltgUHMO7xvwzK nueI16lwcgXNG3fSJ0GVapTD3hHsEzWpCwo8uLNFIY0VfkGijxeQwM3lPghN3d2ahm9WVn S5EaqI3FhcYoGmN+17Ln4Ki4g2Ow1c2EbCiLrWO1MMDkFUvQwqwZ52T93SGRu08EhEAWRC 3IfTVrYkCLkvW3MHHJLeMninZ357/Wh0IbLm02agU9gQwLGE3/XuEfrF3sMnuURU2GZfvA PJ1Q/mqt837nURMd4FTxyEIOvXvt/HrycNLitALD1Gpzy3GvJmghCm0s/U13CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SzvMiQfqtzytZvxR71v+tctPKN0rPGGKp0x799hKnzs=; b=wG/56H2BeUQOP93SzfUaS6u4PfP9zRL4IXOwNdrt0d/SPKZbQ35x4I1bfCSFRt+T7gUmkg tIj2194f8m0tDGFQD9KcIj+s3XqEfjfXkMhJ7tLKw9W+BU35D46Tzo6TTRIHnabFoc79Tv Z/Qj6oQK1KRnSNLFY8epo0sgBRpw2aj3K8UPFek1ZERtesp3PxvyTuSrxqsyRwwgR8S4XW dZYaeBWj1dXJUSbv/irrbti/x1wkVzEaoJtaYSpfd8gNwiAg6pUt745Z20fhor+C/SKgo3 YyQrXGXRj/YjOYue38G28QNAmGq94rH/vm+YmyIEYjUC0eHulcNh/DyvfXK3dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976225; a=rsa-sha256; cv=none; b=S0VWtHAUgrmf1VxXvxQ6ll4vm+05u4BWovbVfgtxvY5RFSyYEG+q9Xwo2vIOeOnhcnT9Hd 0XeFDqqIMHU6zlNn3S2/lHKIv6IAWWVO0lA6JGWU4Kj+sUUMO1+VvW7kpyj0wW1iOGzzk9 rQdN4bHO5gjQrtXvJfX3yIquFU+SVhBFYTI19zlRymeCwRZ6UoxJr3zBPYFUfQ2vnD4b5p SXheROIpbJFAEadqiqgy6YZv4qXJw6vvuXlb2AXsjqoVyIk8ST3nL9X6bRyR0B7QYjMEPE 4vZQpn8mGI5nJ8SkOC0kku4oty/n7nUJBzccQaxIHV4ENZYeDNW6jsdtub/X3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0bP1JfNz4xc; Mon, 20 Oct 2025 16:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG3jj0022297; Mon, 20 Oct 2025 16:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG3je8022294; Mon, 20 Oct 2025 16:03:45 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:03:45 GMT Message-Id: <202510201603.59KG3je8022294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fdf8dc1a01a6 - stable/14 - zfs: Emit warning upon use of legacy sysctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fdf8dc1a01a603cbd1f9349068e43c7d8c609969 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fdf8dc1a01a603cbd1f9349068e43c7d8c609969 commit fdf8dc1a01a603cbd1f9349068e43c7d8c609969 Author: Ed Maste AuthorDate: 2025-10-09 15:57:14 +0000 Commit: Ed Maste CommitDate: 2025-10-20 13:40:06 +0000 zfs: Emit warning upon use of legacy sysctls The introduction of OpenZFS moved some sysctls, and legacy compat shims were added. For example: Old (legacy) name: vfs.zfs.min_auto_ashift New name: vfs.zfs.vdev.min_auto_ashift Upstream OpenZFS removed these, but we've temporarily restored them in FreeBSD. Note that l2arc sysctls use generic sysctl functions (e.g. SYSCTL_UQUAD) and thus cannot trivially have warnings added, so they are not handled. PR: 266374 Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53033 (cherry picked from commit 654a3aa9a1de176648eec00b3c201c33b10bd325) (cherry picked from commit f0033878b92e1a00120fec4edf590715f7c4ecbc) --- .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 41 +++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c index 55e133c096c1..04c4bac2201c 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c @@ -163,6 +163,13 @@ param_set_arc_int(SYSCTL_HANDLER_ARGS) return (0); } +static void +warn_deprecated_sysctl(const char *old, const char *new) +{ + printf("WARNING: sysctl vfs.zfs.%s is deprecated. Use vfs.zfs.%s instead.\n", + old, new); +} + int param_set_arc_max(SYSCTL_HANDLER_ARGS) { @@ -185,13 +192,16 @@ param_set_arc_max(SYSCTL_HANDLER_ARGS) if (val != 0) zfs_arc_max = arc_c_max; + if (arg2 != 0) + warn_deprecated_sysctl("arc_max", "arc.max"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_max, CTLTYPE_ULONG | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_max, "LU", + NULL, 1, param_set_arc_max, "LU", "Maximum ARC size in bytes (LEGACY)"); /* END CSTYLED */ @@ -216,13 +226,16 @@ param_set_arc_min(SYSCTL_HANDLER_ARGS) if (val != 0) zfs_arc_min = arc_c_min; + if (arg2 != 0) + warn_deprecated_sysctl("arc_min", "arc.min"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_min, CTLTYPE_ULONG | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_min, "LU", + NULL, 1, param_set_arc_min, "LU", "Minimum ARC size in bytes (LEGACY)"); /* END CSTYLED */ @@ -246,6 +259,9 @@ param_set_arc_free_target(SYSCTL_HANDLER_ARGS) zfs_arc_free_target = val; + if (arg2 != 0) + warn_deprecated_sysctl("arc_free_target", "arc.free_target"); + return (0); } @@ -256,7 +272,7 @@ param_set_arc_free_target(SYSCTL_HANDLER_ARGS) /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_free_target, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_free_target, "IU", + NULL, 1, param_set_arc_free_target, "IU", "Desired number of free pages below which ARC triggers reclaim" " (LEGACY)"); /* END CSTYLED */ @@ -276,13 +292,16 @@ param_set_arc_no_grow_shift(SYSCTL_HANDLER_ARGS) arc_no_grow_shift = val; + if (arg2 != 0) + warn_deprecated_sysctl("arc_no_grow_shift", "arc.no_grow_shift"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_no_grow_shift, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_no_grow_shift, "I", + NULL, 1, param_set_arc_no_grow_shift, "I", "log2(fraction of ARC which must be free to allow growing) (LEGACY)"); /* END CSTYLED */ @@ -775,13 +794,16 @@ param_set_min_auto_ashift(SYSCTL_HANDLER_ARGS) zfs_vdev_min_auto_ashift = val; + if (arg2 != 0) + warn_deprecated_sysctl("min_auto_ashift", + "vdev.min_auto_ashift"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, min_auto_ashift, - CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - &zfs_vdev_min_auto_ashift, sizeof (zfs_vdev_min_auto_ashift), + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, 1, param_set_min_auto_ashift, "IU", "Min ashift used when creating new top-level vdev. (LEGACY)"); /* END CSTYLED */ @@ -802,13 +824,16 @@ param_set_max_auto_ashift(SYSCTL_HANDLER_ARGS) zfs_vdev_max_auto_ashift = val; + if (arg2 != 0) + warn_deprecated_sysctl("max_auto_ashift", + "vdev.max_auto_ashift"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, max_auto_ashift, - CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - &zfs_vdev_max_auto_ashift, sizeof (zfs_vdev_max_auto_ashift), + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, 1, param_set_max_auto_ashift, "IU", "Max ashift used when optimizing for logical -> physical sector size on" " new top-level vdevs. (LEGACY)"); From nobody Mon Oct 20 16:09:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0jk0KkHz6Cg0Q; Mon, 20 Oct 2025 16:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0jj5d54z3R6D; Mon, 20 Oct 2025 16:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fh1AYwbmCEO2nYxIHg2nTK6B3/sEHQ8NyAl448ooJ+g=; b=scV2VmQbQCgGfqYyRAOAouRzVtqU2CE5DD6+6G1hi9qblGvy+XZTO+cP1+uMY/tx09Epbs Jrm6o1dBgT+DCNrRZoj9vaT67LsbDaj8IJzQH089oGqlLD8+8RrUXjO88KOp3PbYO2EzJe DfHDXNXZk6K4n4PnLlVp2LT32Du4QmGecvT+044SowO+xC80CbkbuDwgdNTTKqspwMeI/P swiE4BaQSlI7mXyrzHdZAi3Zidd++suZdejv2PIDmnQmvqxLZgZzDRecTtRhjdUOR+uTG4 H43Z8z1U5DQ15CGnYzMVUncmmRtDIRA9BLmBEdDgz//XpMFFk/7LE6QZMQHQ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fh1AYwbmCEO2nYxIHg2nTK6B3/sEHQ8NyAl448ooJ+g=; b=PEjccuPUDRssri4/w3svmDbINBi4nNC7MDqjgmQrtf2g89O5b9o1zZP/V39Nt+aA3xdxGV Gy/cNKQoIoEO/xz1mZdnCz7x01ilmubW9WzIKt2K8nRktFgirHTJGZ27FI2lX/UHp5G4nJ v91eVy2cStV3h7QGo9dCre6Dv2LzIOOfBT/4806ybp1qA0/myEgdsU1u9QQRt98rj45OAx cNJ85+6M/b/gvPo0NJC8QTgUkW4i8XvMs5kRzqStzlesr6+VJPT9WZt3L5ICNhlkJ1WtTl I2aKHC1Dj89xgWzFaSUWoNRKaVYAER9PojzLPauopjtjZ34A3m+ujYja51QyHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976553; a=rsa-sha256; cv=none; b=F8b7P9JB9wt3H6GWv8qx3HFyW8gFg50wAOv0AIpq/e9vrCAWSG35hSAPzYevO08CAPLQGC wVDwDhXprSGHlD9PrOpFdX89cyA2mDqTGzGEX5HGg9th12ObHr2FVd1sVlELm8ePn2oVYR 0mzR73n2p/n4kP4L18fsAZntVN5Bm7MywuFMhy55Egfunc4mjONZr3o0NTlVqJOPfbo/py DornNU0oj3+Q+X32pz3KP4YHU1woHO2+UwgREDFrulZb/bV1hJiC//UYCQ/F5pxa62hBY0 Zjv4QBGWNTMFG8kad+wjiRXw9HsghHDWbRlAaEoYeQC+QpOExzNLfwDO/XHucQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0jj4y3qz4cY; Mon, 20 Oct 2025 16:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG9Dsv024271; Mon, 20 Oct 2025 16:09:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG9Dn4024268; Mon, 20 Oct 2025 16:09:13 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:09:13 GMT Message-Id: <202510201609.59KG9Dn4024268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 59c0a987e0d3 - stable/15 - rc.conf: Fix typo interferring -> interfering List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 59c0a987e0d3fab4a884f57001802e6099624d57 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=59c0a987e0d3fab4a884f57001802e6099624d57 commit 59c0a987e0d3fab4a884f57001802e6099624d57 Author: Jose Luis Duran AuthorDate: 2025-10-17 14:15:46 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:02:25 +0000 rc.conf: Fix typo interferring -> interfering Reviewed by: emaste MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53168 (cherry picked from commit 982d70ca2e6333b7e8ccf828b004ccf20a9cc550) --- libexec/rc/rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index af4f6be30cc4..87f9d50b3b3c 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -24,7 +24,7 @@ : ${_localbase:="$(/sbin/sysctl -n user.localbase 2> /dev/null)"} : ${_localbase:="/usr/local"} -# rc_debug can't be set here without interferring with rc.subr's setting it +# rc_debug can't be set here without interfering with rc.subr's setting it # when the kenv variable rc.debug is set. #rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. From nobody Mon Oct 20 16:09:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0jl0xXHz6CgB9; Mon, 20 Oct 2025 16:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0jk6b8vz3RJw; Mon, 20 Oct 2025 16:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHEnt7dhrnDuc6ovUg2uSOCVpROGdfz1rv1Z3fR5c3g=; b=B8JNArBWk5xsF5ZgoOZZGS/Fj1PwD7s4fX1IbSA6Ev+Jil62c7jUHdkVv2z/QcMktPucq8 dpCGPyG2Rf18b0QXEQRz0CJrCOfCEbKXZreIWm6XVGhxfad3dwbEE/JEVTx7yzdaXkHta5 lzvyTq0PG9Lf9lPSsIjrgiO3oNqnrcXWgK7oNSEiJKwk03reun8e3ek9udPXJiwX8W5UJV ahF0eLasFEdq8HroD0v2WN6fw9t64Fg33np7fMcMv1dPTVqBImjvYshwJApz0xpnByO0m+ p55CCCP0e4ldPwQ9fvLRS+CmH1LEFmabNGO5KOAhhCn7q9L2CTJ8UxI5QJWU7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHEnt7dhrnDuc6ovUg2uSOCVpROGdfz1rv1Z3fR5c3g=; b=hgla3qmPsxsSNsi6Q6kpxBlAGqkBH9Hc6mL166z7lcLFBgXHDKET7J4d1kHm/AcBEXLCXx Fwdxwhy5XZuRJlONY0RkXqi8PDwp6Mm6MPuxEjF4TovnL9/KTZ3Dl6TB4F0JkiJdhEnylS Xl0StVG1hwHHUuo+NiXzGE9YzpV1ZUCQIvcg656KfbAO+00X1cIz/poSsyCdWfInV2egYi g1I/XU2FbPIayY85tA+lq1EJ0JG+WXHPJMMtEvXoL8UuxUxzvVRt+y55o9IBLY92dlyZoF j8CM0jtQqTM8CSHTDnKCI5dybJZKCe4T4ADTN1oR7lL0eLw0l2uTSbZX3Zz+8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976554; a=rsa-sha256; cv=none; b=dPEIuKgJK4B3Uj6Yi5UMxRytFmoLvNPpWcrTDb4EbbGSRHdiz6cGU/9lSwpgr2ANIUYMRS a47hN+fFZGPtPmh9Z4VCWz7gfaySAq0olkckGqNHLnbX8XAIbkyv46YU4oZVmXw6jZ2lK5 xpap4nPAc2VzEhTQc7qld6NTe8H/ONaraGbAtoEbA3HxLyRVJAL14pEnNBuzBjqbmxTHGz 7T6q202kpBc6K1XAlIejR423xCje6GEaPoNFmoeg2c4lItc/CayMtuzTmVyhOIkjkPp++k wmnmnBMUIUM25fGPQI8zNiAHpvkiMpKZuUk/4HWc4EEFmclbJT3rjG4T4qmMlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0jk69B7z4JN; Mon, 20 Oct 2025 16:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG9Egv024306; Mon, 20 Oct 2025 16:09:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG9E6w024303; Mon, 20 Oct 2025 16:09:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:09:14 GMT Message-Id: <202510201609.59KG9E6w024303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: fa2e886206f4 - stable/15 - rc: dmesg: Allow umask to be configurable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa2e886206f41b4ce652377a6da163103ef25351 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=fa2e886206f41b4ce652377a6da163103ef25351 commit fa2e886206f41b4ce652377a6da163103ef25351 Author: Jose Luis Duran AuthorDate: 2025-10-17 14:34:55 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:04:35 +0000 rc: dmesg: Allow umask to be configurable Allow umask to be configurable. Being able to set the umask via an rc variable is useful when setting: security.bsd.unprivileged_read_msgbuf=0 As it allows a user to configure: dmesg_umask="066" Without modifying the rc script, and preventing the contents of the $dmesg_file (/var/run/dmesg.boot) from being publicly readable. PR: 272552 Reviewed by: netchild MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53169 (cherry picked from commit edadbc6ee95570627679f3bc14a1d5476d0ce339) --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/dmesg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 87f9d50b3b3c..2b6db04d08e3 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -707,6 +707,7 @@ osrelease_enable="YES" # Update /var/run/os-release on boot (or NO). osrelease_file="/var/run/os-release" # File to update for os-release. osrelease_perms="444" # Default permission for os-release file. dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot +dmesg_umask="022" # Default umask for /var/run/dmesg.boot file. watchdogd_enable="NO" # Start the software watchdog daemon watchdogd_flags="" # Flags to watchdogd (if enabled) watchdogd_timeout="" # watchdogd timeout, overrides -t in watchdogd_flags diff --git a/libexec/rc/rc.d/dmesg b/libexec/rc/rc.d/dmesg index 51e35d5d4e80..736449f3b159 100755 --- a/libexec/rc/rc.d/dmesg +++ b/libexec/rc/rc.d/dmesg @@ -19,7 +19,7 @@ stop_cmd=":" do_dmesg() { rm -f ${dmesg_file} - ( umask 022 ; /sbin/dmesg $rc_flags > ${dmesg_file} ) + ( umask "${dmesg_umask}" ; /sbin/dmesg $rc_flags > ${dmesg_file} ) } load_rc_config $name From nobody Mon Oct 20 16:09:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0jm1VS7z6CgCb; Mon, 20 Oct 2025 16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0jm065Vz3RK7; Mon, 20 Oct 2025 16: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=1760976556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TnCKZWNuqbMydowDh52eg5HI8LzTB1j8pYLCZYRVnIA=; b=WNIB4iTk0BkkYQ3UpywTa3S9pHHJhR2Ddfi4drvSs+WTwJJBZGt4Qp51kKEYDd9IDOGqDP NBp+CXxwisCkSkC58QDMSNgQqF83/Smyz+czIYnD4cyAj1cm6yroV2bJ3ThZDXdqc3pX4W t6jXZPhw0oEKowA2tkEWUiCIFlgsG/03uKT91OGYkuscfqimIqqb04/4+phwBeTPeb12KQ C0uuLB++79s6E/jKDjm3uYChWSle6LV3UQKLgzHTXj+RNBY872uVkL5inDk6sdyccSSjcq fWFibaCWEnCe1PPs2H3gkRW+C7z4mIDP2HgW6GNtKA8+Fd8nIf5FZ9+2dOzeow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TnCKZWNuqbMydowDh52eg5HI8LzTB1j8pYLCZYRVnIA=; b=cxvYP+aThq2ehkOjY/+JDID+avCQ5ttUQgIzfMGbfIV5Hy4g4qyOfjLuqk1XlgoUnWCHrZ 4qJ+2NO0i/KuX0HWX4dTWsgw833z3jX66iZBxmTI3+/lFjnPEN8QiCwtvoA1Ix0OaewQQs 67OydpeQ0sHpclooGcamgjb82aMb8B4qJYFqbDlypRkg4TwpD5k0Q2un49hUpOELieRigT Y7+uJZ8Xs6RjIjUYjjMZ6ne1aZxq3DDGY1yzCZh3sqEmlGD/+WJsTO9pEPdkzpJNZeHAHc n7erU7+X1ZAjDmkU4pYQqnLgdYhH12UQP3qUWvekoNNCcqqMkvL0pklNkSL75g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976556; a=rsa-sha256; cv=none; b=SGDTdxTirk3MwYSkzCanpklpP5KTL3jB7u1w6zE6WQItFASM6DdEuePqBVZNsyYLutP3fa PkxFDcJxLJL+M7a8aHMDdqRGQgQbmUTA4dKiH5ccWoWGEJEDBGDVCjylfFC3rzis9CzePi wUFitwGG/EU4M37UQhbaaGQpdzv+G/MqaavAulsp0MYSQtltrnGqGyno1YAiMpthsE5GqD ZPU157igChfe0KA6bWLllEcMJncWyLebyAshM+RqzQID7TKcBsTgYhPSDi3O8h28jAwzWf 4IFsf9Z+UijVQlIaz0EJ+uzYnUsHQs9x3WE1G1QHnBrvuRq9Ju5IGP4iK5wZDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0jl6mgfz4s5; Mon, 20 Oct 2025 16:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG9FwE024348; Mon, 20 Oct 2025 16:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG9F6d024345; Mon, 20 Oct 2025 16:09:15 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:09:15 GMT Message-Id: <202510201609.59KG9F6d024345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f28a5c92f9cd - stable/15 - bsdinstall: Fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f28a5c92f9cd8b8f8fe690f6a2bdbd28dbe1b7cd Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f28a5c92f9cd8b8f8fe690f6a2bdbd28dbe1b7cd commit f28a5c92f9cd8b8f8fe690f6a2bdbd28dbe1b7cd Author: Jose Luis Duran AuthorDate: 2025-10-17 15:16:32 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:06:22 +0000 bsdinstall: Fix typos Reviewed by: emaste MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53170 (cherry picked from commit 4ee348e27143b857445fd261cbe6695d6d57c836) --- usr.sbin/bsdinstall/scripts/auto | 2 +- usr.sbin/bsdinstall/scripts/bootconfig | 2 +- usr.sbin/bsdinstall/scripts/jail | 2 +- usr.sbin/bsdinstall/scripts/keymap | 2 +- usr.sbin/bsdinstall/scripts/script | 2 +- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 8058b1a41dbf..5fefc07e4c07 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -73,7 +73,7 @@ msg_yes="YES" # error [$msg] # # Display generic error message when a script fails. An optional message -# argument can preceed the generic message. User is given the choice of +# argument can precede the generic message. User is given the choice of # restarting the installer or exiting. # error() diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig index 6736e78b450a..9c188c1d8a91 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -163,7 +163,7 @@ if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then rmdir "${mntpt}" fi - # Try to set the UEFI NV BootXXXX variables to recod the boot location + # Try to set the UEFI NV BootXXXX variables to record the boot location if [ "$BSDINSTALL_CONFIGCURRENT" ] && [ "$ARCHBOOTNAME" != ia32 ]; then update_uefi_bootentry fi diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 3b1b2ee98fff..8e001fc4a027 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -45,7 +45,7 @@ user_env_vars="BSDINSTALL_DISTSITE DISTRIBUTIONS" # error [$msg] # # Display generic error message when a script fails. An optional message -# argument can preceed the generic message. User is given the choice of +# argument can precede the generic message. User is given the choice of # restarting the installer or exiting. # error() { diff --git a/usr.sbin/bsdinstall/scripts/keymap b/usr.sbin/bsdinstall/scripts/keymap index 6f4060c0772e..669a1062df95 100755 --- a/usr.sbin/bsdinstall/scripts/keymap +++ b/usr.sbin/bsdinstall/scripts/keymap @@ -216,7 +216,7 @@ while :; do n=$( eval f_dialog_menutag2index_with_help \ \"\$menu_choice\" $menu_list ) - # Turn that number ithe name of the keymap struct + # Turn that number into the name of the keymap struct k=$( set -- $KEYMAPS; eval echo \"\${$(( $n - 2))}\" ) # Get actual keymap setting while we update $keymap and $KEYMAPFILE diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 00ded5f8e24d..21da2ea7c366 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -144,7 +144,7 @@ else # # Work around this in an extremely lame way for the specific # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analagous problems on + # /boot/efi is empty and does not handle analogous problems on # other systems (ARM, PPC64). tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi mkdir -p $BSDINSTALL_CHROOT/boot/efi diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 95cbba3fa131..9ea6ec3a4ac9 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -255,7 +255,7 @@ msg_encrypt_disks="Encrypt Disks?" msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions" msg_error="Error" msg_force_4k_sectors="Force 4K Sectors?" -msg_force_4k_sectors_help="Align partitions to 4K sector boundries and set vfs.zfs.vdev.min_auto_ashift=12" +msg_force_4k_sectors_help="Align partitions to 4K sector boundaries and set vfs.zfs.vdev.min_auto_ashift=12" msg_freebsd_installer="$OSNAME Installer" msg_geli_password="Enter a strong passphrase, used to protect your encryption keys. You will be required to enter this passphrase each time the system is booted" msg_geli_setup="Initializing encryption on selected disks,\n this will take several seconds per disk" From nobody Mon Oct 20 16:09:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0kK1t7Bz6Cg0b; Mon, 20 Oct 2025 16:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0kK1Chpz3RyV; Mon, 20 Oct 2025 16:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxRowDa+odvsL9uQGcemmBPwi0IcrdjTI1HAe7fkgkM=; b=fy3HYdYO+aqj4z1Sq5Vpd8FX+bT8hpwwGRQTQ+0C6q19TxBtdGl8j8KyJQjB5/MwaEiaxq BWcwKo1FjO4HXayqKLAEFk9qlYUWd6ptfi9RWDqtWuEubhYTuXrfes+EeClXEkHTQFvsKR +XMAPf8LU7iEfYm1KAnzhhYyQ8mcFMMyFOy/egjvtjJaEGHauNOgUyKbZr8KUF5NO3ZLuf qcGMcyu9wgEQeagQwVL/BOt8nv6UiZAC0Hq6MjNdAbmut9QcVuRszW5ksTleljyPFi7DPX cwd1kJZLkYEF99+SUJ0XMUIjeO5Y0+n45aF0Bvt+7zJTSn6IgjG3L6I26xYdGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxRowDa+odvsL9uQGcemmBPwi0IcrdjTI1HAe7fkgkM=; b=Z9oT1Re3NOk1GswBK9jy06kekN1EJl3YQ1CeW+ERHXgVM85poupN4X8wJxxHrKuQN2CfAa +IdZfdKyi6aY3wV8uTiNCMQxgMflSiGvFl+XpQtdc0riloSbEDbmHtDdn2wbZCd+S13HZZ FweHiDGk2p2n/CzgRsekWG8zMfnYOT6auWOJWsa1WLuIQoozEwYrzGyuTfvl/WhczexQsn ZqSSwx9LJz4lfbgHzWRpL00Tywl7V6LIL0B9Qbj4ROalvaIeLB9gh+lRASPCcVS4HPY+2n yOJDELoc4ynAHL/t/ctnlfr/klfgEcQFWAPlGMqZBWp8Qdz4RyTzWa1i+YCK/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976585; a=rsa-sha256; cv=none; b=lH2Gb/VUFxUqyYMI1rOeHwJBd5ata8ztyVSLa/gYJNcQ78CAS/jZWtf2RtzC1xUDw7n4fB MA2p2bDa1whuFNjlM7QqttugrzQSue8LmtFvTpjsvQyylT3vrb1XE99gKD3fBYFZv7xIzK B5Psgnt/rWeE6A3zrBZCckm1Ifc/plwmDFyk90CEQsrgYUOihnTn72TP/aQL7tWPEHGnbI IRLXIoVma/PlXSye4SAN+hZdLntBZyOMTNk6DxEtx7PYj1oR1Rp1PRGW1dWeG3mTX+Lq/4 FwLN5sj8tY+1XcZrTfIPXw7bC8gtqeOoqkpGIoABL/H9J6EJuVX1r3E12KM02A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0kK0gsSz4Z8; Mon, 20 Oct 2025 16:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG9ixO024642; Mon, 20 Oct 2025 16:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG9iZR024639; Mon, 20 Oct 2025 16:09:44 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:09:44 GMT Message-Id: <202510201609.59KG9iZR024639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 907cb4ac5fea - stable/14 - rc.conf: Fix typo interferring -> interfering List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 907cb4ac5fea8f249e10f14316289e7c4f4fdea0 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=907cb4ac5fea8f249e10f14316289e7c4f4fdea0 commit 907cb4ac5fea8f249e10f14316289e7c4f4fdea0 Author: Jose Luis Duran AuthorDate: 2025-10-17 14:15:46 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:09:30 +0000 rc.conf: Fix typo interferring -> interfering Reviewed by: emaste MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53168 (cherry picked from commit 982d70ca2e6333b7e8ccf828b004ccf20a9cc550) --- libexec/rc/rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index b17dbb6902cc..39ec921b36c5 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -24,7 +24,7 @@ : ${_localbase:="$(/sbin/sysctl -n user.localbase 2> /dev/null)"} : ${_localbase:="/usr/local"} -# rc_debug can't be set here without interferring with rc.subr's setting it +# rc_debug can't be set here without interfering with rc.subr's setting it # when the kenv variable rc.debug is set. #rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. From nobody Mon Oct 20 16:09:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0kL2pf9z6CgPp; Mon, 20 Oct 2025 16:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0kL1xpKz3S6M; Mon, 20 Oct 2025 16:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAsYID40BFEKtz8PvFgtrfMl6/HXzi6S84NLJWcObiA=; b=osrZfAkrIHtvXM2MKp+xevA+WVGnpvgKESn8kV+4dyjE2r4lryr71w2P0w6WTxbYQd+XTF tCSMZbwX4xaV1HXUi3ueRNUTAd+ZObuptqUTqMjYDqgoIkEuKCjampxJxBdk3b4W5Q/Z8l CrnmXuFDenBGGRZWCpg7AVIcdoaP//6d0SP6CwcQ1Wf7tMl2yOKHjClTDjQmZwjZe7BxdW u1+ScT+FZxfQmfdPzUEemGa9batcxFA6bLhCpXaf91SVvMsI5vFad9BQN64lczQDYUXyhp 6zynBua4yO5PzTrrrFdCSMnABozSvzFWIcmg2c7ocNUazKh6qp89zNO+mrrosA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAsYID40BFEKtz8PvFgtrfMl6/HXzi6S84NLJWcObiA=; b=oaj6PBfG+woIfTL8HWOTbH084ALLlIdWcMkSQxSLXfZ2WH2HVLqyw2CxiwoiWzVfpfDxt1 puUK1hq9716HyEufWh2bg8CJoYKGkRWdm2EfXCDc229ejdOJTd774NpS4lyZ+Wxc3bH3Ty 7Qp2U71WXuCOBLKQ/7mRIBoC2W8GhI/ySOJwPvGUXbRJADXmClkVZmDPCRE62dbMDkSZ2Y amzQJ+tjoKS2qm0F9abeyT1K5XvZci1EZrZ6zEMm6lRMap+RzRf1nXjYoVrPno1zN2Prmp +vEd6wBVB68EyNm/8AxzqbfjcwKFI7UkKgl9jbZ8N9tjrEZO0qswj4Wm+1JLOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976586; a=rsa-sha256; cv=none; b=piDKzs6/Wiw3kHX6rnXewvhWxMofx5mCWeCDez/z5OMvMhQuEbTIFvywWLwNRVJV9iaDGW YgiLpqR914QQzj5pc+KWJTjwbbJvMRN5YPC/gvd4EkTf6KxXYx/poFEbghrWuY8nYlW5pz VYgqrgmRccDnt4dqz4FQT2EufgYvcGEsnkMsuFLfs+ZOPltpsJxirs9oFcntmd15B9BRJ/ nYMaNT6lzVaHTz+PLWurJkWhIzHQKwtKaWseK9B+AuRvByEYQNzRmmqd244dX3ujWaJ9x1 UTpoTPca6SqbKPQqtET2DiDE52kTvLzq16Ug2LYlK7uj4O5ED3v5uBb7aPu6ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0kL1Wjfz51H; Mon, 20 Oct 2025 16:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG9kEg024684; Mon, 20 Oct 2025 16:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG9k4m024680; Mon, 20 Oct 2025 16:09:46 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:09:46 GMT Message-Id: <202510201609.59KG9k4m024680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: d8ddea0d4b0a - stable/14 - rc: dmesg: Allow umask to be configurable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d8ddea0d4b0ad316000970987d26307e84ce1efc Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=d8ddea0d4b0ad316000970987d26307e84ce1efc commit d8ddea0d4b0ad316000970987d26307e84ce1efc Author: Jose Luis Duran AuthorDate: 2025-10-17 14:34:55 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:09:30 +0000 rc: dmesg: Allow umask to be configurable Allow umask to be configurable. Being able to set the umask via an rc variable is useful when setting: security.bsd.unprivileged_read_msgbuf=0 As it allows a user to configure: dmesg_umask="066" Without modifying the rc script, and preventing the contents of the $dmesg_file (/var/run/dmesg.boot) from being publicly readable. PR: 272552 Reviewed by: netchild MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53169 (cherry picked from commit edadbc6ee95570627679f3bc14a1d5476d0ce339) --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/dmesg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 39ec921b36c5..a1bb88903911 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -710,6 +710,7 @@ osrelease_enable="YES" # Update /var/run/os-release on boot (or NO). osrelease_file="/var/run/os-release" # File to update for os-release. osrelease_perms="444" # Default permission for os-release file. dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot +dmesg_umask="022" # Default umask for /var/run/dmesg.boot file. watchdogd_enable="NO" # Start the software watchdog daemon watchdogd_flags="" # Flags to watchdogd (if enabled) watchdogd_timeout="" # watchdogd timeout, overrides -t in watchdogd_flags diff --git a/libexec/rc/rc.d/dmesg b/libexec/rc/rc.d/dmesg index ed36ec17b419..b6ad4b65d8f8 100755 --- a/libexec/rc/rc.d/dmesg +++ b/libexec/rc/rc.d/dmesg @@ -19,7 +19,7 @@ stop_cmd=":" do_dmesg() { rm -f ${dmesg_file} - ( umask 022 ; /sbin/dmesg $rc_flags > ${dmesg_file} ) + ( umask "${dmesg_umask}" ; /sbin/dmesg $rc_flags > ${dmesg_file} ) } load_rc_config $name From nobody Mon Oct 20 16:09:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0kM5nTwz6CgBM; Mon, 20 Oct 2025 16:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0kM2zH4z3Ryq; Mon, 20 Oct 2025 16:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/81lnN8iZPaUqRtjf5Ce1VnSoKMSJKuhbbUvfmP170=; b=kvElqT4HyboPm4ng8/JB5G2k0l3U1EpLoCtkIgUp/uIbJEgGQA0ZglktVHceR6JlHaelK2 0i3T40WvzuTk6BTtzWTSTWETCn5E8SSJTTU3SyJC2n8aOcPFLjmd57XU6+Vnr6XxySJe0C Zr+qFDToE564M5s6KqbxtqnNbhNu5K6ZRMIY/whEIiwMgFGcHBTv2Rg9dK1HVaji1T6N5n O+cVPnaLd7G2qdnsJUy4lLQITh2uIL90wNSRVh91q3xoAy0KZkrZp8WMDAIS+OPgLIQ0Tx +MvDGc7o787dltsVvlt8G/o6fwLQsB7bsuFGjrRtwRioHxME7UAjUQeUC3BNOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/81lnN8iZPaUqRtjf5Ce1VnSoKMSJKuhbbUvfmP170=; b=qU6NyjylzF92xG5o63sxrM18kM8sihinONYaZ3GXhc3OSjQLuw0z7BHxSH8ahzL6D3SDXw 61aC+6hjtk9tOjSS0OY7DzirhKU8WTasPfEHRybi+a6bFFAYanYdnVshQQBJYOLnK27m0q Po+M0GlGYIZ+aY8m0sWsBR7gQIivAoR7n2iYpXKJcmEC0+tYGSpeLeXiZD0bQnYdE8Rt4z G/RrIUWesU88XO4N6/w9ptWKxbGRUkgOvCWw3iU4eGvS1UZCNM6Wy+EnZ7DfIy3v8ChCyB XbOQlmAZS9YzWmGbhiM+MD1gUKTy4BqQFf1h6OMzImZTBq9rVIyOGnipOpVgVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976587; a=rsa-sha256; cv=none; b=XwiX7FufJEwTKPI/pisB1RinXRRPomEIOigCFEkg7b9TM5ZFtgKCq/IMR9OSeRr9Fbe22S FA6Hkp5dWuB1ls1BQZsO0p4vqESymIfjyCuGYta1Pyi+5aoUWB+ewUpxxklk9pvUOVE6f2 FGSiVVw2ZdK0+QlmqX2dpOp6/o+t4v0wHv4R6RP8B2dtC4p28FZMuSWrWfzJ+7eP5CyXgR HEAmfZxEMA/EqmS6YzakWwcbIkxvRTvHCcRlyQWvKZYRJCHgvdWFyq3Q5DyyzY7O6W70I/ T9Y9mRV23eyfLR+ABWRmNczzchulzGYCvHwCKoyXeCzvhR1BtSiFAdSdH5qk/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0kM2YMGz4pL; Mon, 20 Oct 2025 16:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KG9lGJ024722; Mon, 20 Oct 2025 16:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG9lpo024719; Mon, 20 Oct 2025 16:09:47 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:09:47 GMT Message-Id: <202510201609.59KG9lpo024719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 829e479a0a37 - stable/14 - bsdinstall: Fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 829e479a0a37eb72023ce361f5b2379d82f8bc2a Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=829e479a0a37eb72023ce361f5b2379d82f8bc2a commit 829e479a0a37eb72023ce361f5b2379d82f8bc2a Author: Jose Luis Duran AuthorDate: 2025-10-17 15:16:32 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:09:31 +0000 bsdinstall: Fix typos Reviewed by: emaste MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53170 (cherry picked from commit 4ee348e27143b857445fd261cbe6695d6d57c836) --- usr.sbin/bsdinstall/scripts/auto | 2 +- usr.sbin/bsdinstall/scripts/bootconfig | 2 +- usr.sbin/bsdinstall/scripts/jail | 2 +- usr.sbin/bsdinstall/scripts/keymap | 2 +- usr.sbin/bsdinstall/scripts/script | 2 +- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 1b9b047dae0e..4d16dec6ac5a 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -73,7 +73,7 @@ msg_yes="YES" # error [$msg] # # Display generic error message when a script fails. An optional message -# argument can preceed the generic message. User is given the choice of +# argument can precede the generic message. User is given the choice of # restarting the installer or exiting. # error() diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig index 1d8fb8657135..ba9a4369429c 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -160,7 +160,7 @@ if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then rmdir "${mntpt}" fi - # Try to set the UEFI NV BootXXXX variables to recod the boot location + # Try to set the UEFI NV BootXXXX variables to record the boot location if [ "$BSDINSTALL_CONFIGCURRENT" ] && [ "$ARCHBOOTNAME" != ia32 ]; then update_uefi_bootentry fi diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 191cc5e89563..239940cce02e 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -45,7 +45,7 @@ user_env_vars="BSDINSTALL_DISTSITE DISTRIBUTIONS" # error [$msg] # # Display generic error message when a script fails. An optional message -# argument can preceed the generic message. User is given the choice of +# argument can precede the generic message. User is given the choice of # restarting the installer or exiting. # error() { diff --git a/usr.sbin/bsdinstall/scripts/keymap b/usr.sbin/bsdinstall/scripts/keymap index 63f1f2455096..9075e8be154d 100755 --- a/usr.sbin/bsdinstall/scripts/keymap +++ b/usr.sbin/bsdinstall/scripts/keymap @@ -216,7 +216,7 @@ while :; do n=$( eval f_dialog_menutag2index_with_help \ \"\$menu_choice\" $menu_list ) - # Turn that number ithe name of the keymap struct + # Turn that number into the name of the keymap struct k=$( set -- $KEYMAPS; eval echo \"\${$(( $n - 2))}\" ) # Get actual keymap setting while we update $keymap and $KEYMAPFILE diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 1c617835c274..5c2ff5d79d2f 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -140,7 +140,7 @@ else # # Work around this in an extremely lame way for the specific # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analagous problems on + # /boot/efi is empty and does not handle analogous problems on # other systems (ARM, PPC64). tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi mkdir -p $BSDINSTALL_CHROOT/boot/efi diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index fe1c522c5399..387ff7c18091 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -255,7 +255,7 @@ msg_encrypt_disks="Encrypt Disks?" msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions" msg_error="Error" msg_force_4k_sectors="Force 4K Sectors?" -msg_force_4k_sectors_help="Align partitions to 4K sector boundries and set vfs.zfs.vdev.min_auto_ashift=12" +msg_force_4k_sectors_help="Align partitions to 4K sector boundaries and set vfs.zfs.vdev.min_auto_ashift=12" msg_freebsd_installer="$OSNAME Installer" msg_geli_password="Enter a strong passphrase, used to protect your encryption keys. You will be required to enter this passphrase each time the system is booted" msg_geli_setup="Initializing encryption on selected disks,\n this will take several seconds per disk" From nobody Mon Oct 20 16:10:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0l84nCLz6CgJc; Mon, 20 Oct 2025 16:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0l76Wr2z3T5T; Mon, 20 Oct 2025 16:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yc7PCkntf3tA0pOWdcppUUyOdfxGV90SdoA4nRPCZUg=; b=wOajLYjKG/cQqvGRnScbDjrIOSYobS3BVQXhyqWLo2B2+1u9RJJPhLnP8D1BzfJFCBSoNm DKTLoHZOKE1HBbRSpVZB8eXbMsgaDT+B2idmiyrI4HmdoGo54mUOEW9dEhBeFq8iw6Bisz hhFmMD7LUopgp5CqYlA0gxJxjbsT9FvKQB2o6FXZ4Vcw8s4NEXDaYXtRNjxowYYrLaYdsu 4c3gxSCcSKkdnOLQePGIbAxdRq3bwD1dWid5x8XC19taPEkaUJslzoyEiQJa3Mjh6Ya9ei D8GKCPXqVsWvzk2IsL8tWQde3X50SWd7+oyLrT85t0+nOeyBnFK23KpNIWyJiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yc7PCkntf3tA0pOWdcppUUyOdfxGV90SdoA4nRPCZUg=; b=LMWEcJbXfYmAloPdEFyq4FjyTmu1fv48ie/Sd343++RBz7DzHze03wGZv3otr8Lt+4Sn9w pRI7PzU1SJT3qINus2vgDPkmfYCw7ijgDZ2qKa5nxC5wipSaGzuumbSZeiATY4DRTHiiNO 9BJAibCdAlArXDmBLWNtNoUtqXfN19WZJBHHoH8JPtgXvI9uBpjn3OioUFOrNGQQSSxjnH jfluzQbkIM1XpVyPIVV3dY07GfX3m7od4qUI4sgC8hjkG9pyyldUlUSqWbo1CpHeGu5pNx 5sxDSKTG8szO+lvps5dgxvAq1XUoE8Zy++vC8IkDjXyqz5Q/1p2MBOyYxVx1aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976627; a=rsa-sha256; cv=none; b=UPBvSqsQgg90IOUNoL9mEFywv6/PGK/iRHW5jNHHDQz6GSn6HYg8PEsuowY+w4AE+vf431 GWb3MfZu8iy2N/KMGpmQmQ7A9ZzvGwwDJpBS4mX9VBPpGmHT7x04iIOUeL3A2H08jSUktA hbOOxQtLrxej6EswLhAQ/7YkYodmcMIRHdQHk6PMDjKbhyZMitLv/+Jx8sKIKU+Ka3rsD1 FnykvcKT5HCq5rk2O2tSlzrTyrhp5vHoefCzvNFOgGWAJGQaoIvsLsHzTimA3j6y/aq7T1 LBIYFRRhlCqAM+C2xPhi4R0PPMwPkWU0xOYZSYoth2e5xWOLJdpNSprl7go72A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0l763Fnz4JS; Mon, 20 Oct 2025 16:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGARcS033822; Mon, 20 Oct 2025 16:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGARQT033819; Mon, 20 Oct 2025 16:10:27 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:10:27 GMT Message-Id: <202510201610.59KGARQT033819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 2779d6310121 - stable/13 - rc.conf: Fix typo interferring -> interfering List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2779d63101219b51acad34ca758e3f7eab67e5c9 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=2779d63101219b51acad34ca758e3f7eab67e5c9 commit 2779d63101219b51acad34ca758e3f7eab67e5c9 Author: Jose Luis Duran AuthorDate: 2025-10-17 14:15:46 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:04:00 +0000 rc.conf: Fix typo interferring -> interfering Reviewed by: emaste MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53168 (cherry picked from commit 982d70ca2e6333b7e8ccf828b004ccf20a9cc550) --- libexec/rc/rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 5e70aa5cbc06..4751d000c936 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -23,7 +23,7 @@ # Set default value of _localbase if not previously set : ${_localbase:="/usr/local"} -# rc_debug can't be set here without interferring with rc.subr's setting it +# rc_debug can't be set here without interfering with rc.subr's setting it # when the kenv variable rc.debug is set. #rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. From nobody Mon Oct 20 16:10:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0l93HTxz6CgMX; Mon, 20 Oct 2025 16:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0l90SRhz3SvQ; Mon, 20 Oct 2025 16:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCESG+CdpmiPFPpyvVk0QNdAroRejYPI4W53rfnpnN8=; b=d8Gb7GZXUuVK4yPEuwx6dAR0/MRdb+IEsYJJDWdkqvgiks1ssI/IfFPMAx0COGqTpz1EC1 ojGxPeQlJpjeoW6HhRdum4QHgnIBL14xf/hmmeaqThrPTkFTortJKpN/plXYHbe7iQxl4A Q2XhycQT3DyHCijYZHBVQQLbowX8pda0jLL2DkEbN6QK4B/9/Ji2W2mI8h9VQ4ZTWsa1JM D9vEdMFi5tOAp0zYXVpAszglbfEE2MkyYpbm5erQib/UTHB2ieRBhQLbO29cXdFCtVrxyx 4vV2rxHrozN+oojRyDYfYrITGg6Ngw1sI7BxAsRTB3jTWJPgw+0XCMtoMAJ4SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCESG+CdpmiPFPpyvVk0QNdAroRejYPI4W53rfnpnN8=; b=v4yRd5q+PTq2LqM0CPhVIPjA5Pcs/AVl6CZ3Z0rk80WKTet5gOLDy2dXXPeCtzlt6lOrOO GELGH46S+7T3PkVSEe2cPvVg+2/RRfparogxZyU9zNj0AeJ82ZsRyHx9JvnXKg7FfY4Sx1 c52zE/OnzHwMqjIKRqhKkRgXPFCEyuxkB1vhbUPvQxr97FCy1daSnIi3K2z+vm7jnxfJhz 7gfhnqjp2PlWI0FoCuuObdXPvQvj2JgbmNVizfEDCLClYdeqcjOsKllzRYLyq6d0QXMWfq I878NWYz2U+cES247W1CwdXfwIpY9EBa363fMZK32FjM0n87YLTMsxDzTQm6bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976629; a=rsa-sha256; cv=none; b=XWf0RmNoyEiSIgAjm3afzbxdz98FAkBx3emFtzdW7hFRfYJcmG1Kcp6bZ+fmU+8tBehPQp Aoefq7fGX1kNC/4QUyTDMhbC5Cz8eE0RTn11hWPuqXYevynRwbwW6FCm/QnxfknCle1wN9 SoMyvsZ5lnbgMpYEXfh6q3fIxt4VQhr3mGy05rNVN3pikWbPBXSunbohbnJo0cjgQCbFgt s/2WeuOpxyyjK//Mk9koy3ca3tZ8d8dPrzqZtot4eLLXST0uKUDneLLIShEThGCiJ8KYJY ieoyimDf367RO8LldA7XEUW4JT/TD8AFduzBuyfr0xLloTvqsVFUucQ3jOQTaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0l9012bz4cZ; Mon, 20 Oct 2025 16:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGASHB033867; Mon, 20 Oct 2025 16:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGASml033862; Mon, 20 Oct 2025 16:10:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:10:28 GMT Message-Id: <202510201610.59KGASml033862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 549cba3c9d1e - stable/13 - rc: dmesg: Allow umask to be configurable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 549cba3c9d1e14fffa9a99ed7b6ee51eb6d20e51 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=549cba3c9d1e14fffa9a99ed7b6ee51eb6d20e51 commit 549cba3c9d1e14fffa9a99ed7b6ee51eb6d20e51 Author: Jose Luis Duran AuthorDate: 2025-10-17 14:34:55 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-20 16:05:40 +0000 rc: dmesg: Allow umask to be configurable Allow umask to be configurable. Being able to set the umask via an rc variable is useful when setting: security.bsd.unprivileged_read_msgbuf=0 As it allows a user to configure: dmesg_umask="066" Without modifying the rc script, and preventing the contents of the $dmesg_file (/var/run/dmesg.boot) from being publicly readable. PR: 272552 Reviewed by: netchild MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53169 (cherry picked from commit edadbc6ee95570627679f3bc14a1d5476d0ce339) --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/dmesg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 4751d000c936..d740d2df32d9 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -708,6 +708,7 @@ osrelease_enable="YES" # Update /var/run/os-release on boot (or NO). osrelease_file="/var/run/os-release" # File to update for os-release. osrelease_perms="444" # Default permission for os-release file. dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot +dmesg_umask="022" # Default umask for /var/run/dmesg.boot file. watchdogd_enable="NO" # Start the software watchdog daemon watchdogd_flags="" # Flags to watchdogd (if enabled) watchdogd_timeout="" # watchdogd timeout, overrides -t in watchdogd_flags diff --git a/libexec/rc/rc.d/dmesg b/libexec/rc/rc.d/dmesg index ed36ec17b419..b6ad4b65d8f8 100755 --- a/libexec/rc/rc.d/dmesg +++ b/libexec/rc/rc.d/dmesg @@ -19,7 +19,7 @@ stop_cmd=":" do_dmesg() { rm -f ${dmesg_file} - ( umask 022 ; /sbin/dmesg $rc_flags > ${dmesg_file} ) + ( umask "${dmesg_umask}" ; /sbin/dmesg $rc_flags > ${dmesg_file} ) } load_rc_config $name From nobody Mon Oct 20 16:11:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mN5hRrz6Cgqk; Mon, 20 Oct 2025 16:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mN51mNz3V7J; Mon, 20 Oct 2025 16:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ba/OyggGDPW+ap2bLtZTvFcyN+hzulXUWw7uQfjp7bE=; b=T0lDtpj8ebBYn18fgadPTs76dXeIIw7B5ImTUbzSeAOD5MlLTcG6fEMVOcyJV9k29v6YEv vjvyAL0AvAOZtxTzWr+GWvgwWXBPSHVEQAY0ZOZehy7UgBDJ3tBNA2AOBojQLzHiuWCBwq TgR9SWY9BBWueiWKB+ADe4sf1+wNIi9AZ32NKL24opGTMnjr8umnwcEqxcjmGAYCHRCRAj ySdrtefag3oRT6Jp3abkPfru853GZ34QM24pP75E2f3ZsaMlM4BbYMttoKkZfRTGqS0noq pRu8WXU8eYfEpxQwg7pce0CH6WL2i7ByQrt7vZb7m2JSf8QmxjF3XccC7uQQ5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ba/OyggGDPW+ap2bLtZTvFcyN+hzulXUWw7uQfjp7bE=; b=FDRivreg6DT72pDSv88ko9mTvnLUrcQ2VXsQkhuz7/GZDpsElFYQwN7/nT3H2CKaf2hI62 DPIUsNy00EWbFzoAZ30wSl4gr91JDDTu2UsuN8XLJqAY+vYa7gIUxwpvTOtntA7MskRBXm tkbP3gug1OM7uXbHPDvm+Z67iifXXNJSux2YimPpGKgj4h7YWYLSoLFnEUTp2S1R1naAYT UXuKbvr0mxWxeU+4cnBWeoa1+6mAKBYxR2eXo4ed752GFa5UV5ksd7xJoNFjbxMru1qGs1 u0+uh/9ZzF67W4Jb7LAb3XqLGmkIKfKl/3kPxpnXmQc/IFA3sxGNwouHa4cS+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976692; a=rsa-sha256; cv=none; b=dp5xX5F+tkGRkInIc23wvj7sebIwqOt6ZJ77ZdSRhD6fDev+t8pnBN7c7WuFb3pm5PKIQz 2QAUM5ivRscSyAYInsAl3/kmQAPVR0NII1GXEfmOJYm8LUf8ZqECpSYFhjKqqEvGu3eRF+ MV0pTd+wqrxu5rKIi260sZ5dIdXdRQ4t2UpEYFH0wzQld+ydI3qYbfEUv7u7fYvjCjM6aR GInyK6SNtobpf2D4M0UsZOlqzLQaiXH2kUqR5jpb8szNlwbEIBCwoUCoKhyAWcgy8Yznzq Qn+sWPDTHqaa/WdZpu9ur+L0Oqesfh+jCQ8RTwmWG+tIX6SEoGFT0XMzUk8h6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mN4cQ1z4vg; Mon, 20 Oct 2025 16:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBWwu036188; Mon, 20 Oct 2025 16:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBWrX036185; Mon, 20 Oct 2025 16:11:32 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:32 GMT Message-Id: <202510201611.59KGBWrX036185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 5debbcb6b7a5 - stable/15 - realpath: Additional test cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 5debbcb6b7a5a25511e8d63142fbc5e8498a8f46 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5debbcb6b7a5a25511e8d63142fbc5e8498a8f46 commit 5debbcb6b7a5a25511e8d63142fbc5e8498a8f46 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:21 +0000 realpath: Additional test cases * Passing NULL should result in EINVAL * Passing an empty path should result in ENOENT * Failure with a non-null buffer should leave a partial result. As pointed out in a comment in the test case, this reveals a discrepancy between the documentation and reality. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53024 (cherry picked from commit f3386dfeb429faaa30a915a4a422a25e07c8bf39) --- lib/libc/tests/gen/realpath2_test.c | 113 ++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 12 deletions(-) diff --git a/lib/libc/tests/gen/realpath2_test.c b/lib/libc/tests/gen/realpath2_test.c index f89dd99cbb72..b8f951d9b10f 100644 --- a/lib/libc/tests/gen/realpath2_test.c +++ b/lib/libc/tests/gen/realpath2_test.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2017 Jan Kokemüller * All rights reserved. + * Copyright (c) 2025 Klara, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,6 +26,8 @@ */ #include +#include + #include #include #include @@ -34,6 +37,31 @@ #include +ATF_TC(realpath_null); +ATF_TC_HEAD(realpath_null, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test null input"); +} +ATF_TC_BODY(realpath_null, tc) +{ + ATF_REQUIRE_ERRNO(EINVAL, realpath(NULL, NULL) == NULL); +} + +ATF_TC(realpath_empty); +ATF_TC_HEAD(realpath_empty, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test empty input"); +} +ATF_TC_BODY(realpath_empty, tc) +{ + char resb[PATH_MAX] = ""; + + ATF_REQUIRE_EQ(0, mkdir("foo", 0755)); + ATF_REQUIRE_EQ(0, chdir("foo")); + ATF_REQUIRE_ERRNO(ENOENT, realpath("", resb) == NULL); + ATF_REQUIRE_STREQ("", resb); +} + ATF_TC(realpath_buffer_overflow); ATF_TC_HEAD(realpath_buffer_overflow, tc) { @@ -44,16 +72,11 @@ ATF_TC_HEAD(realpath_buffer_overflow, tc) ATF_TC_BODY(realpath_buffer_overflow, tc) { - char path[MAXPATHLEN] = { 0 }; - char resb[MAXPATHLEN] = { 0 }; - size_t i; + char path[PATH_MAX] = ""; + char resb[PATH_MAX] = ""; - path[0] = 'a'; + memset(path, 'a', sizeof(path) - 1); path[1] = '/'; - for (i = 2; i < sizeof(path) - 1; ++i) { - path[i] = 'a'; - } - ATF_REQUIRE(realpath(path, resb) == NULL); } @@ -66,9 +89,9 @@ ATF_TC_HEAD(realpath_empty_symlink, tc) ATF_TC_BODY(realpath_empty_symlink, tc) { - char path[MAXPATHLEN] = { 0 }; - char slnk[MAXPATHLEN] = { 0 }; - char resb[MAXPATHLEN] = { 0 }; + char path[PATH_MAX] = ""; + char slnk[PATH_MAX] = ""; + char resb[PATH_MAX] = ""; int fd; (void)strlcat(slnk, "empty_symlink", sizeof(slnk)); @@ -89,11 +112,77 @@ ATF_TC_BODY(realpath_empty_symlink, tc) ATF_REQUIRE(unlink(slnk) == 0); } -ATF_TP_ADD_TCS(tp) +ATF_TC(realpath_partial); +ATF_TC_HEAD(realpath_partial, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that failure leaves a partial result"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} + +ATF_TC_BODY(realpath_partial, tc) { + char resb[PATH_MAX] = ""; + size_t len; + + /* scenario 1: missing directory */ + ATF_REQUIRE_EQ(0, mkdir("foo", 0755)); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 8 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + + /* scenario 2: dead link 1 */ + ATF_REQUIRE_EQ(0, symlink("nix", "foo/bar")); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 8 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/nix", resb + len - 8); + + /* scenario 3: missing file */ + ATF_REQUIRE_EQ(0, unlink("foo/bar")); + ATF_REQUIRE_EQ(0, mkdir("foo/bar", 0755)); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 12 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/bar/baz", resb + len - 12); + + /* scenario 4: dead link 2 */ + ATF_REQUIRE_EQ(0, symlink("nix", "foo/bar/baz")); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 12 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/bar/nix", resb + len - 12); + + /* scenario 5: unreadable directory */ + ATF_REQUIRE_EQ(0, chmod("foo", 000)); + ATF_REQUIRE_ERRNO(EACCES, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 8 && len < sizeof(resb)); + /* + * This is arguably wrong. The problem is not with bar, but with + * foo. However, since foo exists and is a directory and the only + * reliable way to detect whether a directory is readable is to + * attempt to read it, we do not detect the problem until we try + * to access bar. + */ + ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + + /* scenario 6: not a directory */ + ATF_REQUIRE_EQ(0, close(creat("bar", 0644))); + ATF_REQUIRE_ERRNO(ENOTDIR, realpath("bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 4 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/bar", resb + len - 4); +} +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, realpath_null); + ATF_TP_ADD_TC(tp, realpath_empty); ATF_TP_ADD_TC(tp, realpath_buffer_overflow); ATF_TP_ADD_TC(tp, realpath_empty_symlink); + ATF_TP_ADD_TC(tp, realpath_partial); return atf_no_error(); } From nobody Mon Oct 20 16:11:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mQ0Hwvz6Cgqq; Mon, 20 Oct 2025 16:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mP5z4lz3V5g; Mon, 20 Oct 2025 16:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bg6kl4OrhO7OkbLv+5tL5iMLaeytjti4TK6hr0ptPi0=; b=fKHmJkWGfLARPggxCQ2XPRZ3fjbL5D8hBPgvK8apnIO/Vz4vvYQho8P+rZQEa6wiwWsbl3 ubLBGaTjKCCo6JxpxkT6FG023MAU7z6CbcnM1TN+5X/GZudPjlXM0K4Oaohw3y8WNOASLn Ed/tb1c7JwFpTZsxEhbiHgocnVdQ6swQOVW5PsN/AqItbbFoNZXMX3ZiJzei4qwrNi+CBw YaiIcnYbo5Qdof/ROitFY7NDeFLVGKS7zf99evFcTXB9FPbsHUa9OkSHn0+cS817Qt7zq4 j3Nfap4Zcz1q8PmBgJ2/v4x/R1x61eaG3Ws/aTmKIGoUvLFkgOF7K59aFJzFXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bg6kl4OrhO7OkbLv+5tL5iMLaeytjti4TK6hr0ptPi0=; b=chRnGZ0YdBG8oDVEN5u+rDIlqTPs4klzwRk0Ok8HAGjjJNS7tgkz0ERp19yAFnmdF4NnvC 8O14achaj0jqK69Z6wZtya8WqZl3PU2+pz/r3zgPalfBeo81Btn+hxc6xsrra3so4qzhIo uFBuDZiGYn8LAeBqGF57EMQBSD5oDHiJEG1ZrU6izSEeyXkoFDMhhl7uwzWDBGuWJrLbrO MC6aCHDJ0tALynpNeRF1reDo2HxAcgbglupg5gY3mcMffNP7Z+ODaUAuhf7ulkA+MwrT4d 67pA5BxTYPTPL5bCBZk3UQjejbH/wltf4Ipqi/1CNJDiH1PestTZbJ5vUgGTlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976693; a=rsa-sha256; cv=none; b=fwhxIMjiECvI9eutMPRhEXP2FXzzaBlzyx0jfsZ68QyRpyIIcmfRuqlSg0BgfMX8B0I1Et RviQYOLc7mVz97O3Xq2/VmYLX7J+0/Tn4MWoB03p5joWig2JQxqKYOzYBlRcjaoFmpoQle rvdeIOA+P1aXpJNSnZC9wvpQTq3pjdKTSLUtR/AnGygS3os/YgW2IoSArq1xQBLiwvRgfi SoHFrvjVlIZpuRh7ZWW7AzsEs9NAGKBp278y9746nD+bZ42yf6ku4CVC8EUx874IeKbdZD Rgh6ZdGj5Bser7/9upPe1ZiXlnWSkTAWSAGsp+tYLUUWwTbzBAh5HWBP2qqMuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mP5ZYdz51c; Mon, 20 Oct 2025 16:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBXNE036225; Mon, 20 Oct 2025 16:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBX9B036222; Mon, 20 Oct 2025 16:11:33 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:33 GMT Message-Id: <202510201611.59KGBX9B036222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6c9b25246d44 - stable/15 - realpath: Report correct path on failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6c9b25246d4408eced73886d0b58feef7bff25c6 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9b25246d4408eced73886d0b58feef7bff25c6 commit 6c9b25246d4408eced73886d0b58feef7bff25c6 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:21 +0000 realpath: Report correct path on failure If lstat() fails with EACCES or ENOTDIR, the path we need to return in the caller-provided buffer is that of the parent directory (which is either unreadable or not a directory; the latter can only happen in the case of a race) rather than that of the child we attempted to stat. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53025 (cherry picked from commit 1406de21e176d8700240ac9e473df007cd41eec1) --- lib/libc/stdlib/realpath.c | 14 ++++++++++++-- lib/libc/tests/gen/realpath2_test.c | 11 ++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index 4c52b73319ab..18f29e95ee6b 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -49,7 +49,7 @@ realpath1(const char *path, char *resolved) { struct stat sb; char *p, *q; - size_t left_len, resolved_len, next_token_len; + size_t left_len, prev_len, resolved_len, next_token_len; unsigned symlinks; ssize_t slen; char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX]; @@ -98,6 +98,7 @@ realpath1(const char *path, char *resolved) left_len = 0; } + prev_len = resolved_len; if (resolved[resolved_len - 1] != '/') { if (resolved_len + 1 >= PATH_MAX) { errno = ENAMETOOLONG; @@ -133,8 +134,17 @@ realpath1(const char *path, char *resolved) errno = ENAMETOOLONG; return (NULL); } - if (lstat(resolved, &sb) != 0) + if (lstat(resolved, &sb) != 0) { + /* + * EACCES means the parent directory is not + * readable, while ENOTDIR means the parent + * directory is not a directory. Rewind the path + * to correctly indicate where the error lies. + */ + if (errno == EACCES || errno == ENOTDIR) + resolved[prev_len] = '\0'; return (NULL); + } if (S_ISLNK(sb.st_mode)) { if (symlinks++ > MAXSYMLINKS) { errno = ELOOP; diff --git a/lib/libc/tests/gen/realpath2_test.c b/lib/libc/tests/gen/realpath2_test.c index b8f951d9b10f..431df8721ae0 100644 --- a/lib/libc/tests/gen/realpath2_test.c +++ b/lib/libc/tests/gen/realpath2_test.c @@ -158,15 +158,8 @@ ATF_TC_BODY(realpath_partial, tc) ATF_REQUIRE_EQ(0, chmod("foo", 000)); ATF_REQUIRE_ERRNO(EACCES, realpath("foo/bar/baz", resb) == NULL); len = strnlen(resb, sizeof(resb)); - ATF_REQUIRE(len > 8 && len < sizeof(resb)); - /* - * This is arguably wrong. The problem is not with bar, but with - * foo. However, since foo exists and is a directory and the only - * reliable way to detect whether a directory is readable is to - * attempt to read it, we do not detect the problem until we try - * to access bar. - */ - ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + ATF_REQUIRE(len > 4 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo", resb + len - 4); /* scenario 6: not a directory */ ATF_REQUIRE_EQ(0, close(creat("bar", 0644))); From nobody Mon Oct 20 16:11:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mR5MWWz6CgVN; Mon, 20 Oct 2025 16:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mQ702wz3VJt; Mon, 20 Oct 2025 16:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YY00r6UecP8RT49qvvLq/a+w9gU1xEk8C6xAV0R1sO8=; b=iZ4O+t5bGto6aPZ8O4MfImIg8AXYcYrCwRccUdRFxkY9/XOUPT/RLPR03ftpi/KqoyNy8a JhStLr/k2SU984hl6ykPPEtMiP631hLscQeRH7SCnnmfZstXzNPHLEYC/SKyqC04sOsvXL Cx8tWe3iHGO0j25ffM71iaBn+XlVJyrUjQVsX9CQFPIwGLTOJNDoKRXc4IjD82CZrbeN1v VqH5ZUzSmbtgaqlXNkA7/y6odvH7UrbZI7aCxXNqkT/6HZ3NUpoWa1ICK8WFDLAWjgQ0af TANcdhXmGmKZsqWTxgm7udObcwXhEEGe4znDfCFC/suiBd3TdivWuka2kjbm+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YY00r6UecP8RT49qvvLq/a+w9gU1xEk8C6xAV0R1sO8=; b=ZVPtXsuVYTt6uLCDCfDgjK8YniHv2FTaRLbxY5DZs4nK171AJr0JVpY83CGbaMnVCo8eZM stvbBhOfYNevGY/snrrVl4D8MulXkhlh3FXw/dkNa0FHri6fijLp3S2nHIN3t/6Zq3DB4+ hH9GiAS/k5xMEPEpMXxenMLv1JTgbAYv+oDr2Gq9HsJlo3zegzUExk3EumK9iXR3/RjCyi MIYaAVOISbGHbhrvWWsi5xOCBjTqZMEK0lDhuiF6Vka7AsiFt7vuqaCQPxKRavchNOUqR9 Qu30MZodHRl4SoedGkqsOC/0aM+fsCmpAPtxfQ/Zaht7wVeLMYFzf4jW5fFtZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976695; a=rsa-sha256; cv=none; b=v1LbJihY5jTH21dDLLCCsYjxRQGF49i0PpossJPTsyLeugV+zRjQU94fZQMaqWexJkt4+u eMVKVyUGFhvVKSl9B80sKq8GXfayjp3D5Z7pdpAVATDWOczD80a7Rt+ikQqivkHKoZB41J ZM/ZyAbtqmjmgNTovzt/1Cz2p3VL31dB595g7PWud4PUlbmzWqn5huwkVawonwS2aAJfjU e0DxMA/+/5XXczOnjqsr3VpMEY9rrcrlawbb750tD4Jb/x/MhWrDCWdHkscyAriN0nbb65 qkODpTgVRrUY4/QeQMWlZSVNCtPIqlnBRhwdOk9wx0r2+WEFmyxcyzyrhF18wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mQ6VPdz4ZL; Mon, 20 Oct 2025 16:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBYY7036262; Mon, 20 Oct 2025 16:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBY0j036259; Mon, 20 Oct 2025 16:11:34 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:34 GMT Message-Id: <202510201611.59KGBY0j036259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 50d6a56a198c - stable/15 - realpath: Belatedly document POSIX conformance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 50d6a56a198c7c3961313a933f54eea94ffa4b5f Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=50d6a56a198c7c3961313a933f54eea94ffa4b5f commit 50d6a56a198c7c3961313a933f54eea94ffa4b5f Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:21 +0000 realpath: Belatedly document POSIX conformance We've been mostly POSIX-conforming since r236400 and fully since r240410, which fixed a corner case where a missing non-leaf directory would be reported as ENOTDIR instead of ENOENT. Sponsored by: Klara, Inc. Fixes: 7877ed7ce33e ("Avoid mapping ENOENT to ENOTDIR for non-existent path components.") Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53027 (cherry picked from commit 7c66667d45e95af59f59e41ef169119a974a6be1) --- lib/libc/stdlib/realpath.3 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3 index 065ba312c2ef..76f40249963b 100644 --- a/lib/libc/stdlib/realpath.3 +++ b/lib/libc/stdlib/realpath.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 11, 2012 +.Dd October 10, 2025 .Dt REALPATH 3 .Os .Sh NAME @@ -108,11 +108,11 @@ and .Xr getcwd 3 . .Sh SEE ALSO .Xr getcwd 3 -.\" .Sh STANDARDS -.\" The -.\" .Fn realpath -.\" function conforms to -.\" .St -p1003.1-2001 . +.Sh STANDARDS +The +.Fn realpath +function conforms to +.St -p1003.1-2001 . .Sh HISTORY The .Fn realpath From nobody Mon Oct 20 16:11:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mT0mGdz6Cgn7; Mon, 20 Oct 2025 16:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mS0PrSz3VPx; Mon, 20 Oct 2025 16:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4ItJzLcr0BFqw6OS6wltyjvQu/GMcbHti35Mnz0Azg=; b=BIuWTeOPG4vz9UhnezQcvcDitraqhntglRESbDgSTEXKfzeku/3Z9nSuVvmHWpgnbS3x4u Da+JkoCkktxEvCw/A4cKsdria496A2AEvlZi5opsEEScHacfbNG+pibrZ1CJwf/RlzIPO8 zCkXnqxrKiROD8BpXDFOoDf9GCI97UK/00YF8Z3TTLGC5bXjD7Ub32tSl+aI6/hpOUnTj4 V1pG1CKo3eHmODba07LoH36Ybx/qgCOlYamPWJ42apwl6cE9VFFhhMGk/NANVFUPt4RkYt P99hg5aIrj1m5iDnBAyLPIuAtdTKvulXide8w0g1muOkw4nJduvk4qT77mrQ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4ItJzLcr0BFqw6OS6wltyjvQu/GMcbHti35Mnz0Azg=; b=MNTDeCZdjLOH93XXVpoj63Smu74NDdU4tQXvfBDxmmrLk46bD3h5KXwRO6Rc4FZgp8upOU U9HVfp8MUdZA1bt1gfNaLfx9W7FFX9jmMP8Pzkvv+7tuPTfph9MknXc/OflzzxZpppou+E gxwQJ9EVdRVIA8Sk7zo5izTeZkONLQ79FPBIo0NMcttqhaXEAOeimttfgcpCchLu5We66n NjOEaLvEpaTAp8C15U4nOfcHhjf4iJm4/nr4mNLfZGmi6cWhUBWpa3Yl/LWABxEROKd40w 2NzZqLxZi+IcSWh9eyJ3Kkq7mM0VLoMjUFBMYTCyB2h/DdEA/SGTAOQ1fARpmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976696; a=rsa-sha256; cv=none; b=ocsEnnPTj037FLlr4Rvkz2HVSO/VSZI5f6gjdqStCtOkNE2+fkDQRFiCjxK89POT1Bip8i IB6oVenxVMUeQER/T2bP5RiRiSGuA+UCz3DeMTnkDJZLQ/ygADp8MnyuiS4Erh5wHQJfL9 8l2l37lW7aulflXkON12Jj6G70vWPji3PiFRuh1Kq2CnNlxjzleXuHrJF3kK9uB7AiXv7f ZPfjHdt8dyjxKQ0E87gGpKLn3vUwbC57GfzloPrm/m1UzPXfeF4swYKSAubtfkbsG3WeyC AWLIQkrm4brKcPYC7wErauRxuiLBblTaaxyyjv49HlPqCv/lFWfkWuO6wsAH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mR73CRz4y9; Mon, 20 Oct 2025 16:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBZt0036302; Mon, 20 Oct 2025 16:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBZ3T036299; Mon, 20 Oct 2025 16:11:35 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:35 GMT Message-Id: <202510201611.59KGBZ3T036299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3d680881f6ed - stable/15 - quot: Fix benign buffer overflow List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3d680881f6ed2f55079aac26cf0ded307c282563 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d680881f6ed2f55079aac26cf0ded307c282563 commit 3d680881f6ed2f55079aac26cf0ded307c282563 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:21 +0000 quot: Fix benign buffer overflow If it encounters an inode whose owner does not have a pw entry, quot allocates a 7-byte buffer (8 in practice, since that is the minimum allocation size) and uses it to store the numeric uid preceded by a hash character. This will overflow the allocated buffer if the UID exceeds 6 decimal digits. Avoid this by using asprintf() instead. While here, simplify the common case as well using strdup(). Reported by: Igor Gabriel Sousa e Souza MFC after: 3 days Reviewed by: obiwac, emaste Differential Revision: https://reviews.freebsd.org/D53129 (cherry picked from commit 5854d1cbab1073d78519e7ad9a6eb5726341d587) --- usr.sbin/quot/quot.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 4152c498371a..c11c46a500a1 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -280,14 +280,10 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { - if ((usr->name = (char *)malloc(7))) - sprintf(usr->name,"#%d",uid); + asprintf(&usr->name, "#%u", uid); } else { - if ((usr->name = (char *) - malloc(strlen(pwd->pw_name) + 1))) - strcpy(usr->name,pwd->pw_name); + usr->name = strdup(pwd->pw_name); } if (!usr->name) errx(1, "allocate users"); From nobody Mon Oct 20 16:11:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mT3dhzz6CgSD; Mon, 20 Oct 2025 16:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mT14FKz3V6D; Mon, 20 Oct 2025 16:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dETTt5x2H3wjMVvJ55rTz673PxE5vqAohFYpIwyfxck=; b=Y/HZQdsqXGfEzJ+oQHXutjfZcZksQ7GQi2bBi5ZaN7xhod9pjRwRqszgzHyzcV/BlxmlEY eJkPvr9ugxDxv2pDCFFd4/Zb811gZr9l5DNZUPDRLGHSbTbfzavwzrQaGsFLFLcmeTGTDH HVovndNwSTAiDeW2++bfHpWeAOOjtjbtPTasUVh7PsuDs8MWx2xwDm0bs7IDQrQy80n0KX JariyUkC4C6Kl1b6whKlUQqJtnMzA0IGbvhPC7u/8C4Qcv8GnJnoaVHRt8fnz79VdTfhcE 4xFo5Z55TU4Hpr7PFD48ap6tFxPkdHmzkaHxITD9+sB8oF2Hy6mg6tDP+4H5CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dETTt5x2H3wjMVvJ55rTz673PxE5vqAohFYpIwyfxck=; b=lkCZTKxJvjz0mU6VF608dVjMXpmkCSWoJdl7LYEmxkWG9Q7rxxsB9i3VJAT+FG9BAeTRHj zNGOMu6Rg6+qaPDirw+6RuduLMtxR3ECr+xd4KmzUfKo+J2OuTE7AMJWBkmdQH+DQrTbbn og4be/pODin0CWwqplziGOkcqlYzRFtSiU7fL3r5aE6f3xyqyutG/v03plKk63IYzrFnMW Blxw3iXVTmIAvJNfq6g97c1gcb/O1zkVeqIl0jZJduYts18rLiqV3Ql98jkp4DCIGEy67Q 4DxzmnmZGatV5qz5z1e1SY1h/ck2wfum7CNfIn4dVRkUXHU3DNWE6TrOOEgUpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976697; a=rsa-sha256; cv=none; b=D/BG35fRRQMc4vNagj2gMfawwdBOEZbF5EfLwq45Orm0kaNdo/qI1SYETmx+Etb3k9f2Hi mnlgcS3EdT/hoJKSVdob8LrLLB303HdZVQx4lGjI0aizQAV8nNIUdAhDUNdmuzXQNz/icp +W71XIiARXY3TDnWOMT7FBuOHryzcT7xb/yjdrx48d0jX/Y1sgfaPCQiK1X8UyDX+M678D bMcAWsZIf/cHCu4IVNjvaiIRAW6UScFxgD4+B1avPGzB3O7RVzRr/6sVc5TS5CqlsZWKi7 eDctghwea/qazFRI+0iZOtnshOcIvAcjs/tV3M71ZymzhAdXxbhr79XY0Him9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mT0Zlzz51f; Mon, 20 Oct 2025 16:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBbLq036345; Mon, 20 Oct 2025 16:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBbMB036342; Mon, 20 Oct 2025 16:11:37 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:37 GMT Message-Id: <202510201611.59KGBbMB036342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 68911bf64eb5 - stable/15 - quot: Clean up List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 68911bf64eb5f6a99dd1fa7e2b6eaee1d27d8f1a Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=68911bf64eb5f6a99dd1fa7e2b6eaee1d27d8f1a commit 68911bf64eb5f6a99dd1fa7e2b6eaee1d27d8f1a Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:22 +0000 quot: Clean up * Fix numerous style violations. * Modernize somewhat. * Don't bother examining errno after calling get_inode(), as it always exits on error. * Fix confusing wording in the manual page. The code remains somewhat idiosyncratic, e.g. in its insistance on counting down rather than up in simple for loops, but in the absence of comprehensive automated tests, the risk of introducing bugs exceeds the benefit of rewriting these into more idiomatic forms. Reviewed by: obiwac Differential Revision: https://reviews.freebsd.org/D53130 (cherry picked from commit 195b00ec45e55c38da13d1bcd2d7eb6614abec59) --- usr.sbin/quot/Makefile | 2 - usr.sbin/quot/quot.8 | 7 +- usr.sbin/quot/quot.c | 227 ++++++++++++++++++++++--------------------------- 3 files changed, 106 insertions(+), 130 deletions(-) diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index ed8360ae938e..34ebcb1009c8 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -2,6 +2,4 @@ PROG= quot MAN= quot.8 LIBADD= ufs -WARNS?= 2 - .include diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 81abe28b41d5..8da0625b246c 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 1994 +.Dd October 15, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -55,9 +55,8 @@ blocks in files with this or lower size. For each user, display count of files and space occupied. .It Fl h Estimate the number of blocks in each file based on its size. -Despite that this does not give the correct results (it does not -account for the holes in files), this option is not any faster -and thus is discouraged. +Note that this does not account for sparse files and is no faster than +reporting the accurate block count. .It Fl k Force the numbers to be reported in kilobyte counts. By default, all sizes are reported in 512-byte block counts. diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index c11c46a500a1..0a3e3094d940 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -32,19 +32,20 @@ */ #include -#include #include #include #include #include #include +#include #include #include -#include #include #include #include +#include +#include #include #include #include @@ -52,10 +53,11 @@ #include /* some flags of what to do: */ -static char estimate; -static char count; -static char unused; -static void (*func)(int, struct fs *, char *); +static bool all; +static bool count; +static bool estimate; +static bool unused; +static void (*func)(int, struct fs *); static long blocksize; static char *header; static int headerlen; @@ -69,9 +71,9 @@ static struct user *user(uid_t); static int cmpusers(const void *, const void *); static void uses(uid_t, daddr_t, time_t); static void initfsizes(void); -static void dofsizes(int, struct fs *, char *); -static void douser(int, struct fs *, char *); -static void donames(int, struct fs *, char *); +static void dofsizes(int, struct fs *); +static void douser(int, struct fs *); +static void donames(int, struct fs *); static void usage(void); static void quot(char *, char *); @@ -89,7 +91,7 @@ static void quot(char *, char *); #ifdef COMPAT #define SIZE(n) (n) #else -#define SIZE(n) ((int)(((quad_t)(n) * 512 + blocksize - 1)/blocksize)) +#define SIZE(n) ((int)(((intmax_t)(n) * 512 + blocksize - 1) / blocksize)) #endif #define INOCNT(fs) ((fs)->fs_ipg) @@ -104,29 +106,26 @@ static void quot(char *, char *); static union dinode * get_inode(int fd, struct fs *super, ino_t ino) { - static caddr_t ipbuf; + static union dinode *ipbuf; static struct cg *cgp; static ino_t last; - static int cg; + static unsigned long cg; struct ufs2_dinode *di2; + off_t off; if (fd < 0) { /* flush cache */ - if (ipbuf) { - free(ipbuf); - ipbuf = 0; - if (super != NULL && super->fs_magic == FS_UFS2_MAGIC) { - free(cgp); - cgp = 0; - } - } - return 0; + free(ipbuf); + ipbuf = NULL; + free(cgp); + cgp = NULL; + return (NULL); } - if (!ipbuf || ino < last || ino >= last + INOCNT(super)) { + if (ipbuf == NULL || ino < last || ino >= last + INOCNT(super)) { if (super->fs_magic == FS_UFS2_MAGIC && - (!cgp || cg != ino_to_cg(super, ino))) { + (cgp == NULL || cg != ino_to_cg(super, ino))) { cg = ino_to_cg(super, ino); - if (!cgp && !(cgp = malloc(super->fs_cgsize))) + if (cgp == NULL && (cgp = malloc(super->fs_cgsize)) == NULL) errx(1, "allocate cg"); if (lseek(fd, (off_t)cgtod(super, cg) << super->fs_fshift, 0) < 0) err(1, "lseek cg"); @@ -135,12 +134,12 @@ get_inode(int fd, struct fs *super, ino_t ino) if (!cg_chkmagic(cgp)) errx(1, "cg has bad magic"); } - if (!ipbuf - && !(ipbuf = malloc(INOSZ(super)))) + if (ipbuf == NULL && (ipbuf = malloc(INOSZ(super))) == NULL) errx(1, "allocate inodes"); last = rounddown(ino, INOCNT(super)); - if (lseek(fd, (off_t)ino_to_fsba(super, last) << super->fs_fshift, 0) < (off_t)0 - || read(fd, ipbuf, INOSZ(super)) != (ssize_t)INOSZ(super)) + off = (off_t)ino_to_fsba(super, last) << super->fs_fshift; + if (lseek(fd, off, SEEK_SET) != off || + read(fd, ipbuf, INOSZ(super)) != (ssize_t)INOSZ(super)) err(1, "read inodes"); } @@ -150,7 +149,7 @@ get_inode(int fd, struct fs *super, ino_t ino) di2 = &((struct ufs2_dinode *)ipbuf)[ino % INOCNT(super)]; /* If the inode is unused, it might be unallocated too, so zero it. */ if (isclr(cg_inosused(cgp), ino % super->fs_ipg)) - bzero(di2, sizeof (*di2)); + memset(di2, 0, sizeof(*di2)); return ((union dinode *)di2); } @@ -166,8 +165,8 @@ static int virtualblocks(struct fs *super, union dinode *dp) sz = DIP(super, dp, di_size); #ifdef COMPAT - if (lblkno(super,sz) >= UFS_NDADDR) { - nblk = blkroundup(super,sz); + if (lblkno(super, sz) >= UFS_NDADDR) { + nblk = blkroundup(super, sz); if (sz == nblk) nblk += super->fs_bsize; } @@ -176,9 +175,9 @@ static int virtualblocks(struct fs *super, union dinode *dp) #else /* COMPAT */ - if (lblkno(super,sz) >= UFS_NDADDR) { - nblk = blkroundup(super,sz); - sz = lblkno(super,nblk); + if (lblkno(super, sz) >= UFS_NDADDR) { + nblk = blkroundup(super, sz); + sz = lblkno(super, nblk); sz = (sz - UFS_NDADDR + NINDIR(super) - 1) / NINDIR(super); while (sz > 0) { nblk += sz * super->fs_bsize; @@ -186,7 +185,7 @@ static int virtualblocks(struct fs *super, union dinode *dp) sz = (sz - 1 + NINDIR(super) - 1) / NINDIR(super); } } else - nblk = fragroundup(super,sz); + nblk = fragroundup(super, sz); return nblk / 512; #endif /* COMPAT */ @@ -234,10 +233,9 @@ inituser(void) int i; struct user *usr; - if (!nusers) { + if (nusers == 0) { nusers = 8; - if (!(users = - (struct user *)calloc(nusers,sizeof(struct user)))) + if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); } else { for (usr = users, i = nusers; --i >= 0; usr++) { @@ -255,14 +253,13 @@ usrrehash(void) struct user *svusr; svusr = users; - nusers <<= 1; - if (!(users = (struct user *)calloc(nusers,sizeof(struct user)))) + nusers *= 2; + if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); - for (usr = svusr, i = nusers >> 1; --i >= 0; usr++) { - for (usrn = users + (usr->uid&(nusers - 1)); usrn->name; - usrn--) { + for (usr = svusr, i = nusers / 2; --i >= 0; usr++) { + for (usrn = users + usr->uid % nusers; usrn->name; usrn--) { if (usrn <= users) - usrn = users + nusers; + usrn += nusers; } *usrn = *usr; } @@ -272,29 +269,24 @@ static struct user * user(uid_t uid) { struct user *usr; - int i; struct passwd *pwd; + int i; while (1) { - for (usr = users + (uid&(nusers - 1)), i = nusers; --i >= 0; - usr--) { - if (!usr->name) { + for (usr = users + uid % nusers, i = nusers; --i >= 0; usr--) { + if (usr->name == NULL) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { + if ((pwd = getpwuid(uid)) == NULL) asprintf(&usr->name, "#%u", uid); - } else { + else usr->name = strdup(pwd->pw_name); - } - if (!usr->name) + if (usr->name == NULL) errx(1, "allocate users"); - - return usr; - - } else if (usr->uid == uid) - return usr; - + } + if (usr->uid == uid) + return (usr); if (usr <= users) - usr = users + nusers; + usr += nusers; } usrrehash(); } @@ -303,15 +295,13 @@ user(uid_t uid) static int cmpusers(const void *v1, const void *v2) { - const struct user *u1, *u2; - u1 = (const struct user *)v1; - u2 = (const struct user *)v2; + const struct user *u1 = v1, *u2 = v2; - return u2->space - u1->space; + return (u2->space - u1->space); } -#define sortusers(users) (qsort((users),nusers,sizeof(struct user), \ - cmpusers)) +#define sortusers(users) \ + qsort((users), nusers, sizeof(struct user), cmpusers) static void uses(uid_t uid, daddr_t blks, time_t act) @@ -339,7 +329,7 @@ uses(uid_t uid, daddr_t blks, time_t act) #else #define FSZCNT 512 #endif -struct fsizes { +static struct fsizes { struct fsizes *fsz_next; daddr_t fsz_first, fsz_last; ino_t fsz_count[FSZCNT]; @@ -361,7 +351,7 @@ initfsizes(void) } static void -dofsizes(int fd, struct fs *super, char *name) +dofsizes(int fd, struct fs *super) { ino_t inode, maxino; union dinode *dp; @@ -375,13 +365,12 @@ dofsizes(int fd, struct fs *super, char *name) errx(1, "allocate fsize structure"); #endif /* COMPAT */ for (inode = 0; inode < maxino; inode++) { - errno = 0; - if ((dp = get_inode(fd,super,inode)) + if ((dp = get_inode(fd, super, inode)) != NULL && #ifdef COMPAT - && ((DIP(super, dp, di_mode) & IFMT) == IFREG - || (DIP(super, dp, di_mode) & IFMT) == IFDIR) + ((DIP(super, dp, di_mode) & IFMT) == IFREG || + (DIP(super, dp, di_mode) & IFMT) == IFDIR) #else /* COMPAT */ - && !isfree(super, dp) + !isfree(super, dp) #endif /* COMPAT */ ) { sz = estimate ? virtualblocks(super, dp) : @@ -400,9 +389,8 @@ dofsizes(int fd, struct fs *super, char *name) if (ksz < fp->fsz_last) break; } - if (!fp || ksz < fp->fsz_first) { - if (!(fp = (struct fsizes *) - malloc(sizeof(struct fsizes)))) + if (fp == NULL || ksz < fp->fsz_first) { + if ((fp = malloc(sizeof(*fp))) == NULL) errx(1, "allocate fsize structure"); fp->fsz_next = *fsp; *fsp = fp; @@ -416,24 +404,23 @@ dofsizes(int fd, struct fs *super, char *name) fp->fsz_count[ksz % FSZCNT]++; fp->fsz_sz[ksz % FSZCNT] += sz; #endif /* COMPAT */ - } else if (errno) { - err(1, "%s", name); } } sz = 0; - for (fp = fsizes; fp; fp = fp->fsz_next) { + for (fp = fsizes; fp != NULL; fp = fp->fsz_next) { for (i = 0; i < FSZCNT; i++) { - if (fp->fsz_count[i]) + if (fp->fsz_count[i] != 0) { printf("%jd\t%jd\t%d\n", (intmax_t)(fp->fsz_first + i), (intmax_t)fp->fsz_count[i], SIZE(sz += fp->fsz_sz[i])); + } } } } static void -douser(int fd, struct fs *super, char *name) +douser(int fd, struct fs *super) { ino_t inode, maxino; struct user *usr, *usrs; @@ -442,38 +429,36 @@ douser(int fd, struct fs *super, char *name) maxino = super->fs_ncg * super->fs_ipg - 1; for (inode = 0; inode < maxino; inode++) { - errno = 0; - if ((dp = get_inode(fd,super,inode)) - && !isfree(super, dp)) + if ((dp = get_inode(fd, super, inode)) != NULL && + !isfree(super, dp)) { uses(DIP(super, dp, di_uid), estimate ? virtualblocks(super, dp) : actualblocks(super, dp), DIP(super, dp, di_atime)); - else if (errno) { - err(1, "%s", name); } } - if (!(usrs = (struct user *)malloc(nusers * sizeof(struct user)))) + if ((usrs = malloc(nusers * sizeof(*usrs))) == NULL) errx(1, "allocate users"); - bcopy(users,usrs,nusers * sizeof(struct user)); + memcpy(usrs, users, nusers * sizeof(*usrs)); sortusers(usrs); for (usr = usrs, n = nusers; --n >= 0 && usr->count; usr++) { - printf("%5d",SIZE(usr->space)); + printf("%5d", SIZE(usr->space)); if (count) - printf("\t%5ld",usr->count); - printf("\t%-8s",usr->name); - if (unused) + printf("\t%5ld", usr->count); + printf("\t%-8s", usr->name); + if (unused) { printf("\t%5d\t%5d\t%5d", - SIZE(usr->spc30), - SIZE(usr->spc60), - SIZE(usr->spc90)); + SIZE(usr->spc30), + SIZE(usr->spc60), + SIZE(usr->spc90)); + } printf("\n"); } free(usrs); } static void -donames(int fd, struct fs *super, char *name) +donames(int fd, struct fs *super) { int c; ino_t maxino; @@ -484,18 +469,18 @@ donames(int fd, struct fs *super, char *name) /* first skip the name of the filesystem */ while ((c = getchar()) != EOF && (c < '0' || c > '9')) while ((c = getchar()) != EOF && c != '\n'); - ungetc(c,stdin); + ungetc(c, stdin); while (scanf("%ju", &inode) == 1) { if (inode > maxino) { warnx("illegal inode %ju", inode); return; } - errno = 0; - if ((dp = get_inode(fd,super,inode)) - && !isfree(super, dp)) { - printf("%s\t",user(DIP(super, dp, di_uid))->name); + if ((dp = get_inode(fd, super, inode)) != NULL && + !isfree(super, dp)) { + printf("%s\t", user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t'); + while ((c = getchar()) == ' ' || c == '\t') + /* nothing */; /* and print out the remainder of the input line */ while (c != EOF && c != '\n') { putchar(c); @@ -503,11 +488,9 @@ donames(int fd, struct fs *super, char *name) } putchar('\n'); } else { - if (errno) { - err(1, "%s", name); - } /* skip this line */ - while ((c = getchar()) != EOF && c != '\n'); + while ((c = getchar()) != EOF && c != '\n') + /* nothing */; } if (c == EOF) break; @@ -534,7 +517,7 @@ quot(char *name, char *mp) get_inode(-1, NULL, 0); /* flush cache */ inituser(); initfsizes(); - if ((fd = open(name,0)) < 0) { + if ((fd = open(name, 0)) < 0) { warn("%s", name); close(fd); return; @@ -551,11 +534,11 @@ quot(char *name, char *mp) close(fd); return; } - printf("%s:",name); + printf("%s:", name); if (mp) - printf(" (%s)",mp); + printf(" (%s)", mp); putchar('\n'); - (*func)(fd, fs, name); + (*func)(fd, fs); free(fs); close(fd); } @@ -563,29 +546,27 @@ quot(char *name, char *mp) int main(int argc, char *argv[]) { - char all = 0; struct statfs *mp; struct fstab *fs; - int cnt; - int ch; + int ch, cnt; func = douser; #ifndef COMPAT - header = getbsize(&headerlen,&blocksize); + header = getbsize(&headerlen, &blocksize); #endif while ((ch = getopt(argc, argv, "acfhknv")) != -1) { switch (ch) { case 'a': - all = 1; + all = true; break; case 'c': func = dofsizes; break; case 'f': - count = 1; + count = true; break; case 'h': - estimate = 1; + estimate = true; break; #ifndef COMPAT case 'k': @@ -596,7 +577,7 @@ main(int argc, char *argv[]) func = donames; break; case 'v': - unused = 1; + unused = true; break; default: usage(); @@ -609,18 +590,16 @@ main(int argc, char *argv[]) usage(); if (all) { - cnt = getmntinfo(&mp,MNT_NOWAIT); - for (; --cnt >= 0; mp++) { - if (!strncmp(mp->f_fstypename, "ufs", MFSNAMELEN)) + for (cnt = getmntinfo(&mp, MNT_NOWAIT); --cnt >= 0; mp++) + if (strncmp(mp->f_fstypename, "ufs", MFSNAMELEN) == 0) quot(mp->f_mntfromname, mp->f_mntonname); - } } - while (--argc >= 0) { + while (argc-- > 0) { if ((fs = getfsfile(*argv)) != NULL) quot(fs->fs_spec, 0); else - quot(*argv,0); + quot(*argv, 0); argv++; } - return 0; + return (0); } From nobody Mon Oct 20 16:11:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mV3qNnz6Cgqy; Mon, 20 Oct 2025 16:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mV1wfFz3VHT; Mon, 20 Oct 2025 16:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4JMabZ/HeeDylS+eyWwKrJ7iRHy2vxS5uxivoqY02s=; b=mLQfZH8t+WHF/O/wZkXytK+RMcrlLu6s++5GRJPgY87Mf7Q0UscKem6LsbH6ywRIB+WRwq iZVa9fv/SPO73SDtHeAuvI0xcFszAkoBQlmV9JY5SvlrgLkMHLtqvL0JHes8sM2h5Hf92w rptuamKXfun6CHNwfF085qofm2G9tYN/78fuT2PXSQlUGI7FpG/GqkSeM5xRxgmG+4MarK OmmORDuGWfcEiYOYnbR9xwYP3/RFoX4sEuZ5In1CiZ+2JHPveEBqCXDiOmQAwiN6Q7q8xa 1pnS/z3k7zgF7/oNJdP3C/K1QsyRv+WSKJtrEd1bazZpz2I18GFpd3R0MmbGVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4JMabZ/HeeDylS+eyWwKrJ7iRHy2vxS5uxivoqY02s=; b=CLuGX1CxWQddIffemvQwWjA9D1gzwjFnN4sKVdbRoAVO+xOSqeVJUo+PFqCZ+DHtqeNTok 3/oeZ7Vrhf46UQb7Dwm2cJMHyRgoE3U5H4rN6PAc73LB5C1PJn9uwqZlwZsqR4VY8WYXWj ghhXWvQaOnYhWah/fNJJK512mcyGhT1noquLmq+FmLRCrJNT2Fpu5sJB/wRMtxnI/OwM37 UZWpmEh2+syI7PB25sIR95LbJSueLfs9SLRCeey+2MTLtmSKjgAFOG/oaRXKi1VGf1ekg3 pEti3vq5W+AGllZbSC2Jik53EPTPINcfF+pFQnkgdRgaRGJoPl0LUUtT87h3vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976698; a=rsa-sha256; cv=none; b=JCDnYv55qYzd2LlYovKmiib0yTRGdaYlQ4MbJvdhfgxyvaFQwbzLtJr8os01zPY01NVloZ v5o15HKW1uvtgNmhPUYeD+BgFj4hEi0id8o291yC3DUmksGFh4+bda+SIKWYiu4ee82trK /EKErXasn7EVLrPCSau5mdRdECwyPRsr7spu9la1LKMzYj6vQV6SX4GB5wmEBdqAxEPLgg gFrcQuf6Ra0ReZBLdTV8LJWWcNha7BKIZj4sfKTnH4cSqDnqjhTYxQU2iNAVD8uWimMKVu dJod/jZn5koruJcbJMmW0+lB+TMikevon3mii0Hox3B0wy9Wi/XFVm4Mx3CuRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mV1V6vz4sK; Mon, 20 Oct 2025 16:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBccC036383; Mon, 20 Oct 2025 16:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBciR036380; Mon, 20 Oct 2025 16:11:38 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:38 GMT Message-Id: <202510201611.59KGBciR036380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9a7b48fef152 - stable/15 - quot: Drop the COMPAT version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 9a7b48fef15230740cdf7b69e40e6ceb2bd2318e Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9a7b48fef15230740cdf7b69e40e6ceb2bd2318e commit 9a7b48fef15230740cdf7b69e40e6ceb2bd2318e Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:22 +0000 quot: Drop the COMPAT version We've had this code for 30 years, but there has never been a way to build it. We have no idea if it still works, or if it ever worked. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53131 (cherry picked from commit 0eaca4a24b97c02685532f86c121a4cf415942c5) --- usr.sbin/quot/quot.c | 54 ---------------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 0a3e3094d940..ad9f65c94877 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -88,11 +88,7 @@ static void quot(char *, char *); * Due to the size of modern disks, we must cast intermediate * values to 64 bits to prevent potential overflows. */ -#ifdef COMPAT -#define SIZE(n) (n) -#else #define SIZE(n) ((int)(((intmax_t)(n) * 512 + blocksize - 1) / blocksize)) -#endif #define INOCNT(fs) ((fs)->fs_ipg) #define INOSZ(fs) \ @@ -153,27 +149,13 @@ get_inode(int fd, struct fs *super, ino_t ino) return ((union dinode *)di2); } -#ifdef COMPAT -#define actualblocks(fs, dp) (DIP(fs, dp, di_blocks) / 2) -#else #define actualblocks(fs, dp) DIP(fs, dp, di_blocks) -#endif static int virtualblocks(struct fs *super, union dinode *dp) { off_t nblk, sz; sz = DIP(super, dp, di_size); -#ifdef COMPAT - if (lblkno(super, sz) >= UFS_NDADDR) { - nblk = blkroundup(super, sz); - if (sz == nblk) - nblk += super->fs_bsize; - } - - return sz / 1024; - -#else /* COMPAT */ if (lblkno(super, sz) >= UFS_NDADDR) { nblk = blkroundup(super, sz); @@ -188,15 +170,11 @@ static int virtualblocks(struct fs *super, union dinode *dp) nblk = fragroundup(super, sz); return nblk / 512; -#endif /* COMPAT */ } static int isfree(struct fs *super, union dinode *dp) { -#ifdef COMPAT - return (DIP(super, dp, di_mode) & IFMT) == 0; -#else /* COMPAT */ switch (DIP(super, dp, di_mode) & IFMT) { case IFIFO: @@ -213,7 +191,6 @@ isfree(struct fs *super, union dinode *dp) default: errx(1, "unknown IFMT 0%o", DIP(super, dp, di_mode) & IFMT); } -#endif } static struct user { @@ -324,11 +301,7 @@ uses(uid_t uid, daddr_t blks, time_t act) usr->spc30 += blks; } -#ifdef COMPAT -#define FSZCNT 500 -#else #define FSZCNT 512 -#endif static struct fsizes { struct fsizes *fsz_next; daddr_t fsz_first, fsz_last; @@ -360,30 +333,12 @@ dofsizes(int fd, struct fs *super) int i; maxino = super->fs_ncg * super->fs_ipg - 1; -#ifdef COMPAT - if (!(fsizes = (struct fsizes *)malloc(sizeof(struct fsizes)))) - errx(1, "allocate fsize structure"); -#endif /* COMPAT */ for (inode = 0; inode < maxino; inode++) { if ((dp = get_inode(fd, super, inode)) != NULL && -#ifdef COMPAT - ((DIP(super, dp, di_mode) & IFMT) == IFREG || - (DIP(super, dp, di_mode) & IFMT) == IFDIR) -#else /* COMPAT */ !isfree(super, dp) -#endif /* COMPAT */ ) { sz = estimate ? virtualblocks(super, dp) : actualblocks(super, dp); -#ifdef COMPAT - if (sz >= FSZCNT) { - fsizes->fsz_count[FSZCNT-1]++; - fsizes->fsz_sz[FSZCNT-1] += sz; - } else { - fsizes->fsz_count[sz]++; - fsizes->fsz_sz[sz] += sz; - } -#else /* COMPAT */ ksz = SIZE(sz); for (fsp = &fsizes; (fp = *fsp); fsp = &fp->fsz_next) { if (ksz < fp->fsz_last) @@ -403,7 +358,6 @@ dofsizes(int fd, struct fs *super) } fp->fsz_count[ksz % FSZCNT]++; fp->fsz_sz[ksz % FSZCNT] += sz; -#endif /* COMPAT */ } } sz = 0; @@ -500,11 +454,7 @@ donames(int fd, struct fs *super) static void usage(void) { -#ifdef COMPAT - fprintf(stderr, "usage: quot [-cfhnv] [-a | filesystem ...]\n"); -#else /* COMPAT */ fprintf(stderr, "usage: quot [-cfhknv] [-a | filesystem ...]\n"); -#endif /* COMPAT */ exit(1); } @@ -551,9 +501,7 @@ main(int argc, char *argv[]) int ch, cnt; func = douser; -#ifndef COMPAT header = getbsize(&headerlen, &blocksize); -#endif while ((ch = getopt(argc, argv, "acfhknv")) != -1) { switch (ch) { case 'a': @@ -568,11 +516,9 @@ main(int argc, char *argv[]) case 'h': estimate = true; break; -#ifndef COMPAT case 'k': blocksize = 1024; break; -#endif /* COMPAT */ case 'n': func = donames; break; From nobody Mon Oct 20 16:11:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mW5tYDz6CgN2; Mon, 20 Oct 2025 16:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mW36jJz3VQY; Mon, 20 Oct 2025 16:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tSrqHq01XBfz+8YhKvEjIhST/w5GUP0+4mcoHviJHk=; b=kCWdykfDZggIh4hC9LONqyRpmj3GziFISaJpGeruJKExuN2rw/m8TOiXMtoFw25JiT8l/q DdRK5mfmJLJOgq7MVAyKC7DhlHamC0Zt8yNPRKIRdRep6LTkFDny/Gimqnaz0Q7DNIOJAc OVyDMDLfeHB27UG9CqWpZH4prDBn+4fEJg1AgI89g0HGBBy2jt4LIrp3WqvWzaVG205Wmd Ynv8ZKiPx1CJvU/nDv9a2/FhR6d2AxuUTbGwC7w+PbS2/AjJ/byR+DANU2oaYo4GJk7Ol4 2ATZx8TTATyt8nCi29Bh7fIAOH34Z59HX5tjQJZBy9tCX0iN894hD+zVcz1ozQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tSrqHq01XBfz+8YhKvEjIhST/w5GUP0+4mcoHviJHk=; b=i8X+xXs4vstkj1+/smhP3aZlhsqNKsQqKY0sVWb67tfXioB7eo+AkZeFh8eUpsullO2ibY 7XLuDCYP2VXGv2NCyYb6sU1A3v0a99UVmcLwGDiBApXD7+v4vhbztiHI20cxaUfjgAxN5T n60Po2/Hn409yO0gHF+5Om3IX9OvV3kqDh8VLvpV6twEJMRoLEYSpauKoQWZ/8JPh64ZlF ENidJXO+4LRlPOze9lzz7AF1WWhVy1ZDZJXg4F5kf/+XcQSLdHWSv2qsmixgeYbdQIN6fd wA/35/WJyeNDaGEZIUyAt9E5wrTLnIag5egm/EbTAy3SSwzL8H7wyRc/xFi+lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976699; a=rsa-sha256; cv=none; b=ZOuQIxftnQlPEG/3k5+qfBKiJoQsEY0VedCGhSsb78t74qSv06vROum/5HUTbO5vNW6Vm/ 2u7Vy/fOQMUj8D+uMQS1CWX/Txe9OQQojMnqvsyIfrSQUfprAn5D2yRN/zq8boxFagcv/J 5PRqQgAgra8snyvf2R/xOKF7lpiYnH8A/bCVvPzjjhS50dSXxNnZhD8plsDr7obebvXkkv HL/mukTOOQH6HQsPDTVGF2sjhA7rjPuUSqO03srwjMdxiZm5+8uBCllIlEPnR04N06JaSF UIuAZrMusFWW8rNEb4r125uPrn5zh3+wtrBc02fjaJRCALYMr/ry0QmVYA7sdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mW2RWMz4ZN; Mon, 20 Oct 2025 16:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBdOK036422; Mon, 20 Oct 2025 16:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBdE9036419; Mon, 20 Oct 2025 16:11:39 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:39 GMT Message-Id: <202510201611.59KGBdE9036419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c0d4bbcb8069 - stable/15 - quot: Drop the -h option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c0d4bbcb8069bd64f6ad070c099ebcf7cfde3e72 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c0d4bbcb8069bd64f6ad070c099ebcf7cfde3e72 commit c0d4bbcb8069bd64f6ad070c099ebcf7cfde3e72 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:22 +0000 quot: Drop the -h option There was probably a time, more than 30 years ago, when the actual size of a file had to be calculated and this option saved time, but all it does today is give incorrect results for no benefit. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53132 (cherry picked from commit 8209311c51d34c81edec8d09778201cb6e67c6a5) --- usr.sbin/quot/quot.8 | 6 +----- usr.sbin/quot/quot.c | 36 ++++-------------------------------- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 8da0625b246c..32e666e2a863 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -35,7 +35,7 @@ .Nd display disk space occupied by each user .Sh SYNOPSIS .Nm -.Op Fl cfhknv +.Op Fl cfknv .Op Fl a | Ar filesystem ... .Sh DESCRIPTION The @@ -53,10 +53,6 @@ number of files in this category, and aggregate total of blocks in files with this or lower size. .It Fl f For each user, display count of files and space occupied. -.It Fl h -Estimate the number of blocks in each file based on its size. -Note that this does not account for sparse files and is no faster than -reporting the accurate block count. .It Fl k Force the numbers to be reported in kilobyte counts. By default, all sizes are reported in 512-byte block counts. diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index ad9f65c94877..323648d8d550 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -55,7 +55,6 @@ /* some flags of what to do: */ static bool all; static bool count; -static bool estimate; static bool unused; static void (*func)(int, struct fs *); static long blocksize; @@ -63,7 +62,6 @@ static char *header; static int headerlen; static union dinode *get_inode(int, struct fs *, ino_t); -static int virtualblocks(struct fs *, union dinode *); static int isfree(struct fs *, union dinode *); static void inituser(void); static void usrrehash(void); @@ -149,33 +147,9 @@ get_inode(int fd, struct fs *super, ino_t ino) return ((union dinode *)di2); } -#define actualblocks(fs, dp) DIP(fs, dp, di_blocks) - -static int virtualblocks(struct fs *super, union dinode *dp) -{ - off_t nblk, sz; - - sz = DIP(super, dp, di_size); - - if (lblkno(super, sz) >= UFS_NDADDR) { - nblk = blkroundup(super, sz); - sz = lblkno(super, nblk); - sz = (sz - UFS_NDADDR + NINDIR(super) - 1) / NINDIR(super); - while (sz > 0) { - nblk += sz * super->fs_bsize; - /* sz - 1 rounded up */ - sz = (sz - 1 + NINDIR(super) - 1) / NINDIR(super); - } - } else - nblk = fragroundup(super, sz); - - return nblk / 512; -} - static int isfree(struct fs *super, union dinode *dp) { - switch (DIP(super, dp, di_mode) & IFMT) { case IFIFO: case IFLNK: /* should check FASTSYMLINK? */ @@ -337,8 +311,7 @@ dofsizes(int fd, struct fs *super) if ((dp = get_inode(fd, super, inode)) != NULL && !isfree(super, dp) ) { - sz = estimate ? virtualblocks(super, dp) : - actualblocks(super, dp); + sz = DIP(super, dp, di_blocks); ksz = SIZE(sz); for (fsp = &fsizes; (fp = *fsp); fsp = &fp->fsz_next) { if (ksz < fp->fsz_last) @@ -386,8 +359,7 @@ douser(int fd, struct fs *super) if ((dp = get_inode(fd, super, inode)) != NULL && !isfree(super, dp)) { uses(DIP(super, dp, di_uid), - estimate ? virtualblocks(super, dp) : - actualblocks(super, dp), + DIP(super, dp, di_blocks), DIP(super, dp, di_atime)); } } @@ -454,7 +426,7 @@ donames(int fd, struct fs *super) static void usage(void) { - fprintf(stderr, "usage: quot [-cfhknv] [-a | filesystem ...]\n"); + fprintf(stderr, "usage: quot [-cfknv] [-a | filesystem ...]\n"); exit(1); } @@ -514,7 +486,7 @@ main(int argc, char *argv[]) count = true; break; case 'h': - estimate = true; + /* ignored for backward compatibility */ break; case 'k': blocksize = 1024; From nobody Mon Oct 20 16:11:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mX66j2z6Cgl6; Mon, 20 Oct 2025 16:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mX3tV1z3VQs; Mon, 20 Oct 2025 16:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h+zfWY4u1F6oxp9EF1YJ/4hSeJK5FHKN8UDWRCkUDQU=; b=ARS74+l/4TCY/dtHENEkECQPt0dwyW5qywqCVC0IrXp/Eo595fikuZ603XpKHyMo+Ra3g4 u+TZWQeEOPHGCN1qozoc+jHnMEOr9ylTnHDnrPw9aw5jkQLen5w4YpVEzI1pjog1rzXzV5 A1iM1aUTnbefYIRPh9VE6lWxXZrbxe7xlLTeWcstMNytpIHmcf56CmCvmDqDgY0WzDA7Of ijL/eP/r+oYBFz0+uBTcopuXZmPUVAQA9Ujn/TNIs2xbeHjKr/n/AXA9Obdj9TsgKunCvA /17obFC9UMBLbEMaBJo7hjzr1+EeB8C9IvI1xRu+28ytMINwt60cP6NnBGwcdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h+zfWY4u1F6oxp9EF1YJ/4hSeJK5FHKN8UDWRCkUDQU=; b=LSSkLIX5Prk+hxCXfe40PeSxsGNPnyZZVul/7wZ1ynHWwfkbFgk4JOIaGx6phOmfdBOuYS oXlmsWCORLwiZYWomSBbW3UEmExqB+strkxZSmx0ciEb21BwBCWxrlfrqB/HYd7rtrNDuS ChATT8FiJh3R2b+E1UDl3I7ziEPZeGQQPgiACkVP55X67QGrzXGBnNlnaEQ9WhXmQUj2nD uJupRiInv/rE5u9UA3jplBnStFWOwFAOutWtQb6EVCgoFNsvMsGy4PqBa7viomdG/zTEjs m+yAtZBBExWVjWI5qkufbD76YwvppnQE/pXSoWhDGVrf3fSHPOfJyqCyCn7zUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976700; a=rsa-sha256; cv=none; b=DEgiPpDjzil2CmTpMc7arZcX5Wr8UHxcgYT7zQoqfD0Ismh4QzMpOwBj0Tsxnsxhbh/wrM 7wK/VecSZ5wv/WdxbKYRvvyqxdOIW1lS8waVuyUHaDrFZKNfw3oXcOQVsPw5KA6dU/F2vW xiCXwahwvbMsdtVkPcsn2GFR0N1yfShH7rTsHq8DT4Ik4GxlAwNkBExvYdvujU8cl1rNrF kAZx6TTWINWipO3AA9J9lnxmGJEv76aa69SBXlxgi4uXvQnQw7WuG9RG/vDpX4GRNyyOCQ QQjRXgNKxksFKBQqWhDqEFWL3YmvHym1aAJ3AQzhoqr0WFY1zvgBqz22XwHg9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mX3R7Nz4pY; Mon, 20 Oct 2025 16:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBeci036468; Mon, 20 Oct 2025 16:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBeF4036465; Mon, 20 Oct 2025 16:11:40 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:40 GMT Message-Id: <202510201611.59KGBeF4036465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b5f3f1a661ab - stable/15 - quot: Add tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b5f3f1a661ab69986c3379fa4c9c2b38785933db Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b5f3f1a661ab69986c3379fa4c9c2b38785933db commit b5f3f1a661ab69986c3379fa4c9c2b38785933db Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:22 +0000 quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/quot/Makefile | 6 ++- usr.sbin/quot/quot.c | 19 +++++--- usr.sbin/quot/tests/Makefile | 4 ++ usr.sbin/quot/tests/quot_test.sh | 102 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index e6a013f010de..9ab2f3e972d6 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1283,6 +1283,8 @@ .. pw .. + quot + .. rpcbind .. sa diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index 34ebcb1009c8..2f32c8f2df8b 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,5 +1,9 @@ +.include + PROG= quot MAN= quot.8 -LIBADD= ufs +LIBADD= ufs util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 323648d8d550..879580f649b9 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +56,7 @@ /* some flags of what to do: */ static bool all; static bool count; +static bool noname; static bool unused; static void (*func)(int, struct fs *); static long blocksize; @@ -227,7 +229,7 @@ user(uid_t uid) for (usr = users + uid % nusers, i = nusers; --i >= 0; usr--) { if (usr->name == NULL) { usr->uid = uid; - if ((pwd = getpwuid(uid)) == NULL) + if (noname || (pwd = getpwuid(uid)) == NULL) asprintf(&usr->name, "#%u", uid); else usr->name = strdup(pwd->pw_name); @@ -248,7 +250,10 @@ cmpusers(const void *v1, const void *v2) { const struct user *u1 = v1, *u2 = v2; - return (u2->space - u1->space); + return (u2->space > u1->space ? 1 : + u2->space < u1->space ? -1 : + u1->uid > u2->uid ? 1 : + u1->uid < u2->uid ? -1 : 0); } #define sortusers(users) \ @@ -469,12 +474,11 @@ int main(int argc, char *argv[]) { struct statfs *mp; - struct fstab *fs; int ch, cnt; func = douser; header = getbsize(&headerlen, &blocksize); - while ((ch = getopt(argc, argv, "acfhknv")) != -1) { + while ((ch = getopt(argc, argv, "acfhkNnv")) != -1) { switch (ch) { case 'a': all = true; @@ -491,6 +495,9 @@ main(int argc, char *argv[]) case 'k': blocksize = 1024; break; + case 'N': + noname = true; + break; case 'n': func = donames; break; @@ -513,8 +520,8 @@ main(int argc, char *argv[]) quot(mp->f_mntfromname, mp->f_mntonname); } while (argc-- > 0) { - if ((fs = getfsfile(*argv)) != NULL) - quot(fs->fs_spec, 0); + if ((mp = getmntpoint(*argv)) != NULL) + quot(mp->f_mntfromname, mp->f_mntonname); else quot(*argv, 0); argv++; diff --git a/usr.sbin/quot/tests/Makefile b/usr.sbin/quot/tests/Makefile new file mode 100644 index 000000000000..d4e64691f905 --- /dev/null +++ b/usr.sbin/quot/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= quot_test + +.include diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh new file mode 100644 index 000000000000..21088d162a53 --- /dev/null +++ b/usr.sbin/quot/tests/quot_test.sh @@ -0,0 +1,102 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Create and mount a UFS filesystem on a small memory disk +quot_setup() +{ + atf_check -o save:dev mdconfig -t malloc -s 16M + local dev=$(cat dev) + atf_check -o ignore newfs "$@" /dev/$dev + atf_check mkdir mnt + local mnt=$(realpath mnt) + atf_check mount /dev/$dev "$mnt" + echo "/dev/$dev: ($mnt)" >expect + printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect +} + +# Create a directory owned by a given UID +quot_adduid() +{ + local uid=$1 + atf_check install -d -o $uid -g 0 mnt/$uid + printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect +} + +# Perform the tests +quot_test() +{ + local dev=$(cat dev) + # Create inodes owned by a large number of users to exercise + # hash collisions and rehashing. The code uses an open hash + # table that starts out with only 8 entries and doubles every + # time it fills up. + local uid + for uid in $(seq 1 32); do + quot_adduid $uid + done + # Also create inodes owned by users with long UIDs, up to the + # highest possible value (2^32 - 2, because chown(2) and + # friends interpret 2^32 - 1 as “leave unchanged”). + local shift + for shift in $(seq 6 32); do + quot_adduid $(((1 << shift) - 2)) + done + # Since quot operates directly on the underlying device, not + # on the mounted filesystem, we remount read-only to ensure + # that everything gets flushed to the memory disk. + atf_check mount -ur /dev/$dev + atf_check -o file:expect quot -fkN /dev/$dev + atf_check -o file:expect quot -fkN $(realpath mnt) +} + +# Unmount and release the memory disk +quot_cleanup() +{ + if [ -d mnt ]; then + umount mnt || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + +atf_test_case ufs1 cleanup +ufs1_head() +{ + atf_set descr "Test quot on UFS1" + atf_set require.user root +} +ufs1_body() +{ + quot_setup -O1 + quot_test +} +ufs1_cleanup() +{ + quot_cleanup +} + +atf_test_case ufs2 cleanup +ufs2_head() +{ + atf_set descr "Test quot on UFS2" + atf_set require.user root +} +ufs2_body() +{ + quot_setup -O2 + quot_test +} +ufs2_cleanup() +{ + quot_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case ufs1 + atf_add_test_case ufs2 +} From nobody Mon Oct 20 16:11:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mY551Mz6Cg5f; Mon, 20 Oct 2025 16:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mY28LSz3VNK; Mon, 20 Oct 2025 16:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a88pk6zC6tQnpJ18ahd6nmVYoomCdSMJDWmLua9V9Zc=; b=FQCHcUIBghJGHgOyp3wRzuOMSBcFwhpgiBdKNQONUhjAxTTrUlg/YX3Ekb1e9VyBAsTIpo Zn0tICybKF2iYL1H5ZvKFNPh7016xI3NeRGrs+x5fryLXrSkcjRvaa1GPZJGerIfh0keXH AZPTWJiqa2wpcPq0z4ikNZBuMY3UlbjuUbRc7/RhWPaoB+kcydYH0SI/Ap4oIIb4iY0/Ht /RUUcO/dykMxDqgO3OsCHt4mEtYeZWdj+RkDiA8/d1qmJBxRIIxaJw7D+VvEkvIK3KgngU LKG2ImcOXU5QwHrQ+nIKW7uHZIH8e6ymQyWCqVBXh4iiP3eEJRR3JkZMu6Mkxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a88pk6zC6tQnpJ18ahd6nmVYoomCdSMJDWmLua9V9Zc=; b=yamrrR8m69gQyRHoerk8k8wQPFvh48//I1k877O+KcgRi9V2J3iveXpcNbMjqk/KNAIXZo Z5fLRW5OxLQ6V242VfBIUOktv/smbozxs/Mot2Q/HXUTT64Q4QmNo4MDzb2+garbQifenH 71xkjPonm8YW/iw/MqnKHGYWN45IfsaoToXm8ySkVTkXGbjWncL5WGTXADt2gOrb7p22SH UUFKZziv4p2tVnkfrN5IyHybHG8iLi28Z3/T97cs87vePu+XcA+l+qcZxF/fsZyA6Z2ibG odb5kewx3X2iZdCaAwdejohDXMIfbqn3AUx2K9ZS5Sf6Biwenj3xNZiLDM/1wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976701; a=rsa-sha256; cv=none; b=K0h6B5FRD0HSqyhtNGCNnJ4RAWEJcrIjhH+EAdu9Twpu3k/6XmyY+tCPYS9yjAcQjFEzee XjGmuFFBZlCT2jBIMiEOuC8sYfqBM7qmVsyAEHKKneAcbRT7c4G8p15qBE9k0dWIa8tBRi ARMsMAsPsk1ARNnuOpMsNwurWUMgb41gEc76FurK1HfWIDJvWUZP2keppkU8GpeGrNIk5E 6rSxEb3ovtBnLUrASx9L3MPl7/6ajJhZ2PyZxDV3YiF/7s6+yUpZ41/rZpGhVdrfQmjNWP 2Jdz2w1QkWqL2BQY3ZTzM7vhXysV0eLruV1Hd9ynXFs8nQQDG71M0XXllybMvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mY1SmYz4yD; Mon, 20 Oct 2025 16:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBfQ7036573; Mon, 20 Oct 2025 16:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBfGq036570; Mon, 20 Oct 2025 16:11:41 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:41 GMT Message-Id: <202510201611.59KGBfGq036570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c81b5640aabd - stable/14 - realpath: Additional test cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c81b5640aabd7fb6cd8111c884c3388a21532b42 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c81b5640aabd7fb6cd8111c884c3388a21532b42 commit c81b5640aabd7fb6cd8111c884c3388a21532b42 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:33 +0000 realpath: Additional test cases * Passing NULL should result in EINVAL * Passing an empty path should result in ENOENT * Failure with a non-null buffer should leave a partial result. As pointed out in a comment in the test case, this reveals a discrepancy between the documentation and reality. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53024 (cherry picked from commit f3386dfeb429faaa30a915a4a422a25e07c8bf39) --- lib/libc/tests/gen/realpath2_test.c | 113 ++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 12 deletions(-) diff --git a/lib/libc/tests/gen/realpath2_test.c b/lib/libc/tests/gen/realpath2_test.c index f89dd99cbb72..b8f951d9b10f 100644 --- a/lib/libc/tests/gen/realpath2_test.c +++ b/lib/libc/tests/gen/realpath2_test.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2017 Jan Kokemüller * All rights reserved. + * Copyright (c) 2025 Klara, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,6 +26,8 @@ */ #include +#include + #include #include #include @@ -34,6 +37,31 @@ #include +ATF_TC(realpath_null); +ATF_TC_HEAD(realpath_null, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test null input"); +} +ATF_TC_BODY(realpath_null, tc) +{ + ATF_REQUIRE_ERRNO(EINVAL, realpath(NULL, NULL) == NULL); +} + +ATF_TC(realpath_empty); +ATF_TC_HEAD(realpath_empty, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test empty input"); +} +ATF_TC_BODY(realpath_empty, tc) +{ + char resb[PATH_MAX] = ""; + + ATF_REQUIRE_EQ(0, mkdir("foo", 0755)); + ATF_REQUIRE_EQ(0, chdir("foo")); + ATF_REQUIRE_ERRNO(ENOENT, realpath("", resb) == NULL); + ATF_REQUIRE_STREQ("", resb); +} + ATF_TC(realpath_buffer_overflow); ATF_TC_HEAD(realpath_buffer_overflow, tc) { @@ -44,16 +72,11 @@ ATF_TC_HEAD(realpath_buffer_overflow, tc) ATF_TC_BODY(realpath_buffer_overflow, tc) { - char path[MAXPATHLEN] = { 0 }; - char resb[MAXPATHLEN] = { 0 }; - size_t i; + char path[PATH_MAX] = ""; + char resb[PATH_MAX] = ""; - path[0] = 'a'; + memset(path, 'a', sizeof(path) - 1); path[1] = '/'; - for (i = 2; i < sizeof(path) - 1; ++i) { - path[i] = 'a'; - } - ATF_REQUIRE(realpath(path, resb) == NULL); } @@ -66,9 +89,9 @@ ATF_TC_HEAD(realpath_empty_symlink, tc) ATF_TC_BODY(realpath_empty_symlink, tc) { - char path[MAXPATHLEN] = { 0 }; - char slnk[MAXPATHLEN] = { 0 }; - char resb[MAXPATHLEN] = { 0 }; + char path[PATH_MAX] = ""; + char slnk[PATH_MAX] = ""; + char resb[PATH_MAX] = ""; int fd; (void)strlcat(slnk, "empty_symlink", sizeof(slnk)); @@ -89,11 +112,77 @@ ATF_TC_BODY(realpath_empty_symlink, tc) ATF_REQUIRE(unlink(slnk) == 0); } -ATF_TP_ADD_TCS(tp) +ATF_TC(realpath_partial); +ATF_TC_HEAD(realpath_partial, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that failure leaves a partial result"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} + +ATF_TC_BODY(realpath_partial, tc) { + char resb[PATH_MAX] = ""; + size_t len; + + /* scenario 1: missing directory */ + ATF_REQUIRE_EQ(0, mkdir("foo", 0755)); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 8 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + + /* scenario 2: dead link 1 */ + ATF_REQUIRE_EQ(0, symlink("nix", "foo/bar")); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 8 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/nix", resb + len - 8); + + /* scenario 3: missing file */ + ATF_REQUIRE_EQ(0, unlink("foo/bar")); + ATF_REQUIRE_EQ(0, mkdir("foo/bar", 0755)); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 12 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/bar/baz", resb + len - 12); + + /* scenario 4: dead link 2 */ + ATF_REQUIRE_EQ(0, symlink("nix", "foo/bar/baz")); + ATF_REQUIRE_ERRNO(ENOENT, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 12 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo/bar/nix", resb + len - 12); + + /* scenario 5: unreadable directory */ + ATF_REQUIRE_EQ(0, chmod("foo", 000)); + ATF_REQUIRE_ERRNO(EACCES, realpath("foo/bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 8 && len < sizeof(resb)); + /* + * This is arguably wrong. The problem is not with bar, but with + * foo. However, since foo exists and is a directory and the only + * reliable way to detect whether a directory is readable is to + * attempt to read it, we do not detect the problem until we try + * to access bar. + */ + ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + + /* scenario 6: not a directory */ + ATF_REQUIRE_EQ(0, close(creat("bar", 0644))); + ATF_REQUIRE_ERRNO(ENOTDIR, realpath("bar/baz", resb) == NULL); + len = strnlen(resb, sizeof(resb)); + ATF_REQUIRE(len > 4 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/bar", resb + len - 4); +} +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, realpath_null); + ATF_TP_ADD_TC(tp, realpath_empty); ATF_TP_ADD_TC(tp, realpath_buffer_overflow); ATF_TP_ADD_TC(tp, realpath_empty_symlink); + ATF_TP_ADD_TC(tp, realpath_partial); return atf_no_error(); } From nobody Mon Oct 20 16:11:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mb5kXkz6CgST; Mon, 20 Oct 2025 16:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mb3Nyxz3VW5; Mon, 20 Oct 2025 16:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CkP+cNML8J7rkDzoiObM6r2KeYbAu0pxjdR6YkVFWPk=; b=pKIAk6OpVg9Xu8sTAx0WGLWGYu51ryjK1m/AL/dCq3w0FQcTYWol1W6P0rBK1/dyI/uZF/ 1dvpRIn1DPWyLjOWXSH7MtZDXb0MdvfcrHUCMvxDuTuP8Q1FCcIoW5WkXm21yf6WD1D+Sp Vlvj8jL2LeO/+PeyVuDvs7hYOb7STWMZ9mcdWBzXegAOPgxVJwh3xep1WhJMfRoDNsJe3T jkg/jmCk2xGXzVxMu94Qs3BhkVim4LZMZWflq0s+/UDxKCPt8QAy52cugQP9PiSf/EPUt4 JbLQAysqM1vjT9hkDLVeM5bsC8WwdmI6ipEi3v3SyZslSp59BD78GBk8MmFY5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CkP+cNML8J7rkDzoiObM6r2KeYbAu0pxjdR6YkVFWPk=; b=Uid58w/2Wu6MpXlaK1nIIeJLZNSkhWNx4blbiHyPrnC67Xpb91Pyqy8cI8UX3vfN8xAV3/ n14e8Q9SU8cijB0WZ56H3Lkr7Cyc+L0W6O0WTBPgIVhzZkx+Vox0ez87FYQzh3zNkrZfG2 GHsSloO+Hs0tuBe4a2lfIiLPHhb49eq3kb+qNnj4VRMl6USzzM6oro5cvOYmvdfeKzIU/d QrQiB6tYXKSu9cB0ynmPI065GB4EgWF/ME1iycZ4NZZSxRBBhdBmCRLtsQ5xbGG8sGTfZW ms2VuaKDB26Bwh6OcuBcFhMfY2lJdmxXAWkj8/yi4PaueJXCDiYI+9RpsGfwww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976703; a=rsa-sha256; cv=none; b=u5NnfmOqSj2CjzjCAY24830GLolAAFbb86zp4F5CqrAzc6HKOyyiYZxa0Ra8T1ImhYKJku u1S7Q0g9QugYANcvQOXWYpSMdnLM+STwYLfhRcL6BvSWEwzau/1MRDsfRuIBHqOFHQ+jr/ 5IloVMTp3rDPcd70WKvxml82dqjDDtyHGvqbTFhBPTzhxVW7TsXC+RRqvTafzMHSGxo65o lZ0wVg5igF4Tk7V1QYHM0Bdg9ttnGh1Ya4kRrHplI50U0aKW4oX0jMc6JmaLLJmr7+ZcpG PH4yhNboCcLcqxyBBzD67CtTaYGQD5snAhu/aX4c5Yp3numuwnXLx7bVPUCWFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mb2xrVz4ct; Mon, 20 Oct 2025 16:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBhas038152; Mon, 20 Oct 2025 16:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBhYI038138; Mon, 20 Oct 2025 16:11:43 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:43 GMT Message-Id: <202510201611.59KGBhYI038138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4ab2e9d4feec - stable/14 - realpath: Belatedly document POSIX conformance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 4ab2e9d4feec969a634f26924822da94efabab7c Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4ab2e9d4feec969a634f26924822da94efabab7c commit 4ab2e9d4feec969a634f26924822da94efabab7c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:34 +0000 realpath: Belatedly document POSIX conformance We've been mostly POSIX-conforming since r236400 and fully since r240410, which fixed a corner case where a missing non-leaf directory would be reported as ENOTDIR instead of ENOENT. Sponsored by: Klara, Inc. Fixes: 7877ed7ce33e ("Avoid mapping ENOENT to ENOTDIR for non-existent path components.") Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53027 (cherry picked from commit 7c66667d45e95af59f59e41ef169119a974a6be1) --- lib/libc/stdlib/realpath.3 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3 index ec35518d8986..28381b00bbc7 100644 --- a/lib/libc/stdlib/realpath.3 +++ b/lib/libc/stdlib/realpath.3 @@ -30,7 +30,7 @@ .\" .\" @(#)realpath.3 8.2 (Berkeley) 2/16/94 .\" -.Dd May 11, 2012 +.Dd October 10, 2025 .Dt REALPATH 3 .Os .Sh NAME @@ -110,11 +110,11 @@ and .Xr getcwd 3 . .Sh SEE ALSO .Xr getcwd 3 -.\" .Sh STANDARDS -.\" The -.\" .Fn realpath -.\" function conforms to -.\" .St -p1003.1-2001 . +.Sh STANDARDS +The +.Fn realpath +function conforms to +.St -p1003.1-2001 . .Sh HISTORY The .Fn realpath From nobody Mon Oct 20 16:11:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mZ5bjCz6CgKJ; Mon, 20 Oct 2025 16:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mZ2fwyz3VVp; Mon, 20 Oct 2025 16:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/o0qBtyaJRStdQ4+5vnFAVROiypet62IFnKB81L0ky4=; b=AikNYr285FyWEdblwBY6ZQDVdXKZaRqboK+lRArllgAh9TEj9wbIEZt1W3zz9Yf7FYGaGm T1QkCcx431dcL23HR5CxY92vOkAKGUyDea1xY0vJhkpF9ojk2lfVwwjZgobPYgm75d5G// wygghR+X65P9Z3Vxh0ACRTvpN6Z76DiufimWvr68Y4XGvTqjNISThBhH8HJorIjAlBTZx4 Dob/XS0hKa9VP996DiVbOJdDU3g0p1UjJvJx5s3pCzABS+NvpuyuaVra+LG1fHK0/7NL2K O+jHSTyGx35WaV+aPYyHLgvmAO2jgTp+PmJlt5ehEzR33MEUirlq4I1/TOa0Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/o0qBtyaJRStdQ4+5vnFAVROiypet62IFnKB81L0ky4=; b=sdEPq0UL7X19Bho/LOqDN4GCC4SzFzecozwSQPPCgrZFIMOJjpKuS13zK/A/+0RQB2vsme j7Q3VpqTVe8XXjA8NgJg5EVic52wGaYChWsY/Z9Edq3duAK/Wc0N8NQUVwiALjjaizVZrl hAyy7+k+yfTm2Rciy/EQABG7HKvd6Y/lN3zRSfMlaeHWeNOwZzcaKkpn3EpeA4G4R2L1Ld 5yj62zA0tTI1zgUrYt6nnAb99s3dpNEeRJzYrM4KI3wkzEkRnFT3uOcCpwZGxViJ1te+7X AYRDTTEOq5z/wI4ZS2f7+dHv1R3wUGv/g335zLxOugv2bOgpq+pvXH8sfzAT4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976702; a=rsa-sha256; cv=none; b=sPdPXbjlbPwDR28W6am3PbGZS2UzIW7SRRFncFiHhzIdlkuMP7UglGtRH32RFFwzKEdxY5 yPn1/AT6mkEbAk9cgEqFStl+ZTdKdAfaD4de3m94WSlBC0l3N3wQ0jqlW4EUZPoFyBQpOl Mje3QK08nJ2r9j+3nrZiaKqKVzm9RLsElqbolaXQ7JS0hYsKVSLklIeAHX5lYZg3xXmIvH d++D4Bijb5xfmXuH920Er56gy5CrEQ4v9uzZItTz+sDqlI8tN9eYE4wZmRd2Wy9vpYKw7P PyZKbzl0nTAsh6Ehxn/lce+wI/HqRHdFeQTVza5F6GIr82cMxvk/fTzpsE/xMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mZ2Fk4z4sM; Mon, 20 Oct 2025 16:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBgiu036691; Mon, 20 Oct 2025 16:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBgxK036683; Mon, 20 Oct 2025 16:11:42 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:42 GMT Message-Id: <202510201611.59KGBgxK036683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bebae0e23129 - stable/14 - realpath: Report correct path on failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: bebae0e231290833b04935e4c18e25931e766587 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bebae0e231290833b04935e4c18e25931e766587 commit bebae0e231290833b04935e4c18e25931e766587 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:34 +0000 realpath: Report correct path on failure If lstat() fails with EACCES or ENOTDIR, the path we need to return in the caller-provided buffer is that of the parent directory (which is either unreadable or not a directory; the latter can only happen in the case of a race) rather than that of the child we attempted to stat. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53025 (cherry picked from commit 1406de21e176d8700240ac9e473df007cd41eec1) --- lib/libc/stdlib/realpath.c | 14 ++++++++++++-- lib/libc/tests/gen/realpath2_test.c | 11 ++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index 64f1dbdf1b7d..f23a3fd8c58e 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -56,7 +56,7 @@ realpath1(const char *path, char *resolved) { struct stat sb; char *p, *q; - size_t left_len, resolved_len, next_token_len; + size_t left_len, prev_len, resolved_len, next_token_len; unsigned symlinks; ssize_t slen; char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX]; @@ -105,6 +105,7 @@ realpath1(const char *path, char *resolved) left_len = 0; } + prev_len = resolved_len; if (resolved[resolved_len - 1] != '/') { if (resolved_len + 1 >= PATH_MAX) { errno = ENAMETOOLONG; @@ -140,8 +141,17 @@ realpath1(const char *path, char *resolved) errno = ENAMETOOLONG; return (NULL); } - if (lstat(resolved, &sb) != 0) + if (lstat(resolved, &sb) != 0) { + /* + * EACCES means the parent directory is not + * readable, while ENOTDIR means the parent + * directory is not a directory. Rewind the path + * to correctly indicate where the error lies. + */ + if (errno == EACCES || errno == ENOTDIR) + resolved[prev_len] = '\0'; return (NULL); + } if (S_ISLNK(sb.st_mode)) { if (symlinks++ > MAXSYMLINKS) { errno = ELOOP; diff --git a/lib/libc/tests/gen/realpath2_test.c b/lib/libc/tests/gen/realpath2_test.c index b8f951d9b10f..431df8721ae0 100644 --- a/lib/libc/tests/gen/realpath2_test.c +++ b/lib/libc/tests/gen/realpath2_test.c @@ -158,15 +158,8 @@ ATF_TC_BODY(realpath_partial, tc) ATF_REQUIRE_EQ(0, chmod("foo", 000)); ATF_REQUIRE_ERRNO(EACCES, realpath("foo/bar/baz", resb) == NULL); len = strnlen(resb, sizeof(resb)); - ATF_REQUIRE(len > 8 && len < sizeof(resb)); - /* - * This is arguably wrong. The problem is not with bar, but with - * foo. However, since foo exists and is a directory and the only - * reliable way to detect whether a directory is readable is to - * attempt to read it, we do not detect the problem until we try - * to access bar. - */ - ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + ATF_REQUIRE(len > 4 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo", resb + len - 4); /* scenario 6: not a directory */ ATF_REQUIRE_EQ(0, close(creat("bar", 0644))); From nobody Mon Oct 20 16:11:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0md1b6Sz6CgSY; Mon, 20 Oct 2025 16:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mc3stHz3VWZ; Mon, 20 Oct 2025 16:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tU0/wSWSspPnu3cLI303SvXvStFXflgealSF/zVCAFY=; b=MsgQL1eXDccpeDCvoWOF1cG31iDU6UwZbfpFcFqS2AjTxdEuY26CzOz1VpeAw4dHm5FHgg 0kst9lQiMYdscDdGzcIq9PlANd1+mgx5XzrLs7z7idDqEWT5BlRIPC5tfTmrIRz0MTzQ3/ V9LW3q5HcYvTlm+tEtjK/KnHM7qeKQz7/QHEiVH8iNCRceeMrxmkLBkzr6v8uscQY/bbpv Pjsiat7WKqC19iv157DUwX0eU6YbGY18DCYh0J5Fo45kqsUyBuhdORG+oUqU7U+htVvTQF VxfxYvBhDeQsZws1yJgU8NDvApQPTQPBxj9zfz/wQPvWLL5OvXssACjl36RbZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tU0/wSWSspPnu3cLI303SvXvStFXflgealSF/zVCAFY=; b=GeArjq3rg6im7ZB+Q8Xrx+nGRWcvEo8PT4VndY3uewZKvGuOtrvedNe4RAG1TFL/3orU3U 4tHhAnAzQV66iRvU8m447jA+ZbvmO1fc4XGJEl6y6g0uAcCi+/kLmp3Kcj8p7pHMwFEox/ gyROK6dniYrU+TP2TvVTb99tpDL8YxMQMyr9ueo4SSv8fWdWIsmMfHt17n4WCzIt+M0SBc DyMMlCO586Mk6Rufm+3GafnNbrneRcDr0bxMivj4qzp6UiS42OcpU5NZDxx7rsWMsb5q/h /Gtb4eDEkOGsEkT+Xr69oltPquo33wSUwyvTNQy0WChktEfMv9wM/9bdQVrKWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976704; a=rsa-sha256; cv=none; b=PglBhFrgmaljNs2YHfnJSRY1h+uzX/ZovpBVkpUEWNPzT/7ciTW2yEWOroakr12jfkzB3L tnC2NEa45/kutWxueUiRKDWkbysuygxfl8umLSUtgcq2aJBWYPsJa2+0OBzRkyXoiXjaA3 b10shbOovp+7y8OTkrPCUyFldL06UAgAQw4fGNjJdmgx8mbuu7j7J86AHmVFWzkwgtxJWs ozliStmzd847n4dpScSxXCBmZUOC+fHhWXqKrNv6WIa2rkm0EXrGM8zzy3RnXxf7Nx04O2 uJpfdFDCjWV8OjPQt26Q0wBVj6LCsIVo3g5UAhdKlNuJkUhzSjHh3B/KWcW+UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mc3Ldcz4Zb; Mon, 20 Oct 2025 16:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBilb039375; Mon, 20 Oct 2025 16:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBiDt039368; Mon, 20 Oct 2025 16:11:44 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:44 GMT Message-Id: <202510201611.59KGBiDt039368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: edeff9b3f5ef - stable/14 - quot: Fix benign buffer overflow List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: edeff9b3f5ef5a7e926c1cda87d3da6c40e80ab6 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=edeff9b3f5ef5a7e926c1cda87d3da6c40e80ab6 commit edeff9b3f5ef5a7e926c1cda87d3da6c40e80ab6 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:34 +0000 quot: Fix benign buffer overflow If it encounters an inode whose owner does not have a pw entry, quot allocates a 7-byte buffer (8 in practice, since that is the minimum allocation size) and uses it to store the numeric uid preceded by a hash character. This will overflow the allocated buffer if the UID exceeds 6 decimal digits. Avoid this by using asprintf() instead. While here, simplify the common case as well using strdup(). Reported by: Igor Gabriel Sousa e Souza MFC after: 3 days Reviewed by: obiwac, emaste Differential Revision: https://reviews.freebsd.org/D53129 (cherry picked from commit 5854d1cbab1073d78519e7ad9a6eb5726341d587) --- usr.sbin/quot/quot.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 27f0c1ee0068..7a7362dea996 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -281,14 +281,10 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { - if ((usr->name = (char *)malloc(7))) - sprintf(usr->name,"#%d",uid); + asprintf(&usr->name, "#%u", uid); } else { - if ((usr->name = (char *) - malloc(strlen(pwd->pw_name) + 1))) - strcpy(usr->name,pwd->pw_name); + usr->name = strdup(pwd->pw_name); } if (!usr->name) errx(1, "allocate users"); From nobody Mon Oct 20 16:11:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr0mt3XQ8z6CgnV; Mon, 20 Oct 2025 16:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mt0gRCz3VtK; Mon, 20 Oct 2025 16:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4wB6+Fu7LnbS+PPmpBjXFLjRQQAQppjWbbadywAky+w=; b=COa7S5Blz9pJq9byqmwWF0K6vxyFicWm4XwlOQ4BKmzi3Y1m4yOqjDe1fYebOgra3v3Iyo nlVAgo/8gXtfV0bVUfmUfO0ehw3MFpMZNh/P7a6ZPXylYRQqio/+N1FQtbn6AglMF+3Pi1 GWWZ/t3bp0sbNJcWdNf9tMLRY2PU+BkXZOS1ZAFLpLp6XuLfUAtpGOM05dUtI4sZtolIzl +U44wqivQl9nduA2fR/sWHW9ZBhy1Se0AgVAlVZNSIz3sAquBuQ9WTzUeyHpA8kQCO48Qm fcJA2tXrgGtJyFc9NffAo/nLsShc9H+GSgOVpRS0WogQuT2l1FOxM4eU9XBmtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4wB6+Fu7LnbS+PPmpBjXFLjRQQAQppjWbbadywAky+w=; b=B42qWAthlGVkUtlt/UFJ6U/WpthSselS/C+BljT/alHhN/2e1f7sjWj9hgyW1z+V1sdJNz UbxS7WcRu6qnOkUi5He+608uZtXAKyIgNuLewvV4V19XQDZ2VdHHOuzuncftVD9cBrTTt/ IWPZyTuJSh7RNXDJTuavGc3yRYNwbkrhNQBoruuFBH3gkx3a9F3bk4pZPLA/zKOPf/gW3n 2LE3eFBa1k3hVHfClV3luzqwV8hMxxHqdVzKOigkSzhzJ/ZPyZH1WiEp67RKsUBzvb5GNS zoyocf2aKCL6O8xruuo0RmsE8i9MZ71UPPoDA7E5tnsmcDuFlShQu+23EakFpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976718; a=rsa-sha256; cv=none; b=NegnjVhGRXKuQ7e0pIUwWbaqHtzkILSNp7LVGME8NrVoue529ZgRYw5c6XX4YI6ThJHAua 4s4tl9l6UY59eaaDLtCYDSjqc9i2M3pdki7cI7UqDJh4RSF/tvNEfDfR7dkKwQ5ytPesWf SYBORaO+UHNi8++oYzbsARKmOlb7gd0qn9hpwr0/TAlWyNJ5zFmABGQ49E0IDWTxCo4OMQ 6Q1pWQDO/keRgKDOjrniUY1WYkM8gCRMFDqwirzUcr+Q9JCA5mFbzAGd0X4dHWloA+R84X 2VlKXFmrEzMTNjFtWw4nyL8ffmkAvQSXiluuVdqiir0RAYl1ScKK/GKdriglwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr0mt0DBLz4Jp; Mon, 20 Oct 2025 16:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGBv7k041597; Mon, 20 Oct 2025 16:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBvPj041594; Mon, 20 Oct 2025 16:11:57 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:57 GMT Message-Id: <202510201611.59KGBvPj041594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bbf986d0f140 - stable/13 - quot: Fix benign buffer overflow List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: bbf986d0f140d847b9e0c808bf6006b62e85e78e Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf986d0f140d847b9e0c808bf6006b62e85e78e commit bbf986d0f140d847b9e0c808bf6006b62e85e78e Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:48 +0000 quot: Fix benign buffer overflow If it encounters an inode whose owner does not have a pw entry, quot allocates a 7-byte buffer (8 in practice, since that is the minimum allocation size) and uses it to store the numeric uid preceded by a hash character. This will overflow the allocated buffer if the UID exceeds 6 decimal digits. Avoid this by using asprintf() instead. While here, simplify the common case as well using strdup(). Reported by: Igor Gabriel Sousa e Souza MFC after: 3 days Reviewed by: obiwac, emaste Differential Revision: https://reviews.freebsd.org/D53129 (cherry picked from commit 5854d1cbab1073d78519e7ad9a6eb5726341d587) --- usr.sbin/quot/quot.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 037db7ba3f55..7042acf07bc4 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -281,14 +281,10 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { - if ((usr->name = (char *)malloc(7))) - sprintf(usr->name,"#%d",uid); + asprintf(&usr->name, "#%u", uid); } else { - if ((usr->name = (char *) - malloc(strlen(pwd->pw_name) + 1))) - strcpy(usr->name,pwd->pw_name); + usr->name = strdup(pwd->pw_name); } if (!usr->name) errx(1, "allocate users"); From nobody Mon Oct 20 16:42:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr1Rj0X6Mz6CjyN; Mon, 20 Oct 2025 16:42:09 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr1Rh6ybjz3drb; Mon, 20 Oct 2025 16:42:08 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978529; 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: in-reply-to:in-reply-to:references:references; bh=meAnI7BpmFRbArsWHXtdeDs30VXf6aGNSah0Yfnoouo=; b=XnqDpZU9f9DSCJf7px+WGYw+KH8ZVmjrWwE6lRFB8+bzgzs5hhNirw8K7wiOS5NCO08E+J rd0NCQAlfJT2+E40heEUNMNqOvEeJgBnky8myPl+PhDu9BRAqsWLQvyehIeoD5Qi928J2Q FBT4gu2iXAIMSYg2j42kSu6/WWES8eZ9ra4ji56TuaoXmvWDuM1Xib2AP/G2FX44SAFZ6i VUF3u8iyC3fd4A0/CKi572ld3J5yqAT/344XwZA07YuhbjeNCJ+QFmM7gTh0qxPWNU2mGZ NIeOIHpPetvn47xU8TjzFEGBF2CqQGCj1+kHA2J8HIsk37v7lQuie5YoUnJf5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978529; 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: in-reply-to:in-reply-to:references:references; bh=meAnI7BpmFRbArsWHXtdeDs30VXf6aGNSah0Yfnoouo=; b=rGZS97JFlG09tsbVQQbaIBT/McJ+gxA0OTFEhK6VSb22aaGEhmOo9HTJgyHb88Yl3SYwgo Ep4H94vtveAkzj8lVHEtvLszJtkOx6Pd5mEExh9x8Lc6nipHZt8thOile+dH+OOsNaiuU2 PkqAAaszx17PKcvBsfa4SI8USR6WfJjWsLOSWkaLcmmUyaQmxyCAvyW0ql5R0WX7VDW00u jzmFwW8LlwGEhNy54bKu+1/03Bj7zdJYqlh+kmj4ow5cyUX96xJCeKSwNtQUMx/TMwzvhY pQQ29Jrm2l+w1Vsh6/qUqAki4MVxUNGXOipX2MsfbMyn32uMc2N3HJG6ObLrZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760978529; a=rsa-sha256; cv=none; b=FPhOJRYzYVXY3F/VYCkH4nmsVoV9iFOPOyi+ji9MBGiGKFH6JA8cB1LGKHRD5XCwjP16Zi tHStKXRqYdpNBvRbNZlecxf17Q5p2P4uOKcjnGjUB4zEHPpcKo0QK2QQ9ExHDQaz41M3NW yqmNpkH7k/FOQ5CVvNzixQOnEP2QgovxeBLKw5kZtJgMJEKZgmiVoajj4HQmkJygHxTciS xO6sWpf66fABbO0wkAKWH7WXAs5yvIM8UCPIBF0Y0TZauBh+hzCdq8IYq5FJ65jOq4H2j4 NqykjBDKhbfB6xxlv2234BFnmfNdyre9zl+fapUW/ttmaJM8B5FJzXb9I2R2hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:c54:bed0:922e:16ff:fef1:acef]) (using TLSv1.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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cr1Rh5n6qz19Qk; Mon, 20 Oct 2025 16:42:08 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id E41A7883FC; Mon, 20 Oct 2025 18:42:06 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ryan Libby Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 195b00ec45e5 - main - quot: Clean up In-Reply-To: (Ryan Libby's message of "Fri, 17 Oct 2025 15:01:04 -0700") References: <202510171155.59HBtMCp004658@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 20 Oct 2025 18:42:06 +0200 Message-ID: <86h5vt4ja9.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ryan Libby writes: > Dag-Erling Sm=C3=B8rgrav writes: >> In function 'usrrehash', >> inlined from 'user' at /workspace/src/usr.sbin/quot/quot.c:244:3: >> /workspace/src/usr.sbin/quot/quot.c:210:22: error: argument 1 range [184= 46744071562067968, 18446744073709551615] exceeds maximum object size 922337= 2036854775807 [-Werror=3Dalloc-size-larger-than=3D] >> 210 | if ((users =3D calloc(nusers, sizeof(*users))) =3D=3D NU= LL) >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> In file included from /workspace/src/usr.sbin/quot/quot.c:51: >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h: In function= 'user': >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h:92:10: >> note: in a call to allocation function 'calloc' declared here >> 92 | void *calloc(size_t, size_t) __malloc_like __result_use_check >> | ^~~~~~ > > Probably it is from > -WARNS?=3D 2 > > I think gcc is saying that it thinks nusers may be negative. It's saying nusers may be large enough that the result of multiplying it by sizeof(*users) exceeds an arbitrary threshold, which is technically true but completely unhelpful. This gcc option should not be used. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Oct 20 16:47:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr1Yf5Hblz6CkTh; Mon, 20 Oct 2025 16:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr1Yf4pNCz3fS6; Mon, 20 Oct 2025 16:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nz804yH+db5wi/bd+tOHl3B2tAsj22NzMHgzfQGnHM8=; b=bbVEeHg0eS1UPYVbNQFeKQz8jdC0e8Fns/Difq1UM1mP01hsl4YF5tZN1D8WKoObhnQuaI vXiKGaqIGLQWdSW4twSM3J+fyaF0yvmrAZvfR8Lrh7ZkqytLiSQ6aXn2YmvpCxzhEvyS43 ZLepc/rzTSk2ODWx1Is5fhYGMuzwYlWnBEvpP5o6cgUVxSmYgjVJtOuTIqyalvzL0vdLzT joswvpAZxvV/2q+Pgy7mZghLwqBD7HTFcolR0XRZibBxKQC4pGstFWKp7ghZ6BzcND0inm /A1RAeS+QnCUQI3COSIZDlIEhm00vSqIPTAvtOt8z+uzx7a313cv73NR/5IRWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nz804yH+db5wi/bd+tOHl3B2tAsj22NzMHgzfQGnHM8=; b=ofrd0HaLEaF4fGSAX//1RbjKyMYCXxrR4L6ULYgj4xG2uKf6UIaTwTeIvLJk9ma2hDSzS/ /UJGc4/S15tQuzPUmPRQRtROLqOJiA/KEoZQAFFi/NQFf0eMUVl7PQmMHF4K/H9Y+mDFJw MvB7B7BrompiFuBA1CgmRcxgzMWm4WZR+zcgJqtTEzT9HcRRjK/aCgHMoIKW27Kttke+iH fJGm5zGJP3P0V3eaJ/RQbVtzRe6YfCzJvUEbqV8cxgSuRmHSaiAJrGXFouf3KjaYjjODoy cpUso7pdlN38znvyx8EWHuRcwpGqIY7H31pKRk0PyDORKBuNmhTbMWD0EHq8gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760978838; a=rsa-sha256; cv=none; b=OOkKOMm08SKOOzVbBUHIhTTOw2bg7tHwJd/UIj5AxRa/+Z8zru/GHq0blUHGKc0vBGfbPC UDPYItzgSsCeUe02Oe0MdybX6gvbsUkEyJkZxH6pMNNXnlWvfzkBs4P1oLqQ8hQKLYP3fs HXcCZK30TNosvB4l+kF5ZtzKGHWF0kEQt5SjOthHYZ4YtgQOlKv8BH1XCWFArzxfrbCeJP wuqfMBtI7mWeaJpdiO7+JJd9fxGg7MUAa3PmXOey2Gn9uNQdaaKiZZIC9g9+PbqEzAqXsq jSqHFyQwvXtzPPw3jziLnYL3YIC5QbiIfAbsWlcqZi7GIuJA0Sl6NbLbyEo+1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr1Yf4KRpz65R; Mon, 20 Oct 2025 16:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGlI6a099669; Mon, 20 Oct 2025 16:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGlIZj099666; Mon, 20 Oct 2025 16:47:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:47:18 GMT Message-Id: <202510201647.59KGlIZj099666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3e138efaf4ba - stable/15 - linprocfs: Add nodes for inotify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3e138efaf4baa7517ac00b85ee6c1711c290d7c3 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e138efaf4baa7517ac00b85ee6c1711c290d7c3 commit 3e138efaf4baa7517ac00b85ee6c1711c290d7c3 Author: Mark Johnston AuthorDate: 2025-10-17 12:55:56 +0000 Commit: Mark Johnston CommitDate: 2025-10-20 16:45:37 +0000 linprocfs: Add nodes for inotify These map directly onto sysctls under vfs.inotify of the same name. Reviewed by: olce, des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53142 (cherry picked from commit 28c0ef76841bbb322b6e39668e1c8e997c1f8000) --- sys/compat/linprocfs/linprocfs.c | 77 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 95b212be1306..7ac48786c77b 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -2216,6 +2216,67 @@ linprocfs_dosysvipc_shm(PFS_FILL_ARGS) return (0); } +static int +linprocfs_doinotify(const char *sysctl, PFS_FILL_ARGS) +{ + size_t size; + int error, val; + + if (uio->uio_rw == UIO_READ) { + size = sizeof(val); + error = kernel_sysctlbyname(curthread, + __DECONST(void *, sysctl), &val, &size, NULL, 0, 0, 0); + if (error == 0) + sbuf_printf(sb, "%d\n", val); + } else { + char *endp, *newval; + long vall; + + sbuf_trim(sb); + sbuf_finish(sb); + newval = sbuf_data(sb); + vall = strtol(newval, &endp, 10); + if (vall < 0 || vall > INT_MAX || endp == newval || + *endp != '\0') + return (EINVAL); + val = (int)vall; + error = kernel_sysctlbyname(curthread, + __DECONST(void *, sysctl), NULL, NULL, + &val, sizeof(val), 0, 0); + } + return (error); +} + +/* + * Filler function for proc/sys/fs/inotify/max_queued_events + */ +static int +linprocfs_doinotify_max_queued_events(PFS_FILL_ARGS) +{ + return (linprocfs_doinotify("vfs.inotify.max_queued_events", + PFS_FILL_ARGNAMES)); +} + +/* + * Filler function for proc/sys/fs/inotify/max_user_instances + */ +static int +linprocfs_doinotify_max_user_instances(PFS_FILL_ARGS) +{ + return (linprocfs_doinotify("vfs.inotify.max_user_instances", + PFS_FILL_ARGNAMES)); +} + +/* + * Filler function for proc/sys/fs/inotify/max_user_watches + */ +static int +linprocfs_doinotify_max_user_watches(PFS_FILL_ARGS) +{ + return (linprocfs_doinotify("vfs.inotify.max_user_watches", + PFS_FILL_ARGNAMES)); +} + /* * Filler function for proc/sys/fs/mqueue/msg_default */ @@ -2313,9 +2374,7 @@ linprocfs_domqueue_queues_max(PFS_FILL_ARGS) static int linprocfs_init(PFS_INIT_ARGS) { - struct pfs_node *root; - struct pfs_node *dir; - struct pfs_node *sys; + struct pfs_node *dir, *fs, *root, *sys; root = pi->pi_root; @@ -2466,10 +2525,18 @@ linprocfs_init(PFS_INIT_ARGS) NULL, PFS_RD); /* /proc/sys/fs/... */ - pfs_create_dir(sys, &dir, "fs", NULL, NULL, NULL, 0); + pfs_create_dir(sys, &fs, "fs", NULL, NULL, NULL, 0); + + pfs_create_dir(fs, &dir, "inotify", NULL, NULL, NULL, 0); + pfs_create_file(dir, NULL, "max_queued_events", + &linprocfs_doinotify_max_queued_events, NULL, NULL, NULL, PFS_RDWR); + pfs_create_file(dir, NULL, "max_user_instances", + &linprocfs_doinotify_max_user_instances, NULL, NULL, NULL, PFS_RDWR); + pfs_create_file(dir, NULL, "max_user_watches", + &linprocfs_doinotify_max_user_watches, NULL, NULL, NULL, PFS_RDWR); /* /proc/sys/fs/mqueue/... */ - pfs_create_dir(dir, &dir, "mqueue", NULL, NULL, NULL, 0); + pfs_create_dir(fs, &dir, "mqueue", NULL, NULL, NULL, 0); pfs_create_file(dir, NULL, "msg_default", &linprocfs_domqueue_msg_default, NULL, NULL, NULL, PFS_RD); pfs_create_file(dir, NULL, "msgsize_default", From nobody Mon Oct 20 16:47:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr1Yg6cHYz6CkgL; Mon, 20 Oct 2025 16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr1Yg5ynWz3fMK; Mon, 20 Oct 2025 16: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=1760978839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkgiqMalMIQDQ0+lZbF/mw38nR9vyaKSLyRIGPBKCdI=; b=dy8f/WBqZBrTeExLttFeWj0diY9AkEGMAJaIWOPOTWkAdx2/U1cmq/9CAPJaB/xbpCZ+a7 Lx18ZFDsU6lCI6ISQkYNcYqYw6wtrMr409RbDQrh4FqVxGa7Gk39qUS44NhzK0mxLaSqyI TRho2kW7zOMOyIyod80y9dGuBrsYznj3ZHPqWDzuZMfez2hhg19bbB8fEptaIbShgQiWzQ b5ZSx+83mEhkLB024SAaKi3AaG9UB9gejAMBmbebUWG7Q3+kYWgo2w4oSQZ7phXJHqlkQp zNy2cIOtNe92uNiXVOA4IRibt3h+CRnEaONwL0la+jenrQCLav+qc3rX/WFJag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkgiqMalMIQDQ0+lZbF/mw38nR9vyaKSLyRIGPBKCdI=; b=XECZEszMCBENoWPdivgyUdshQLkNwWQdO4/vK0PZ0g/6kK87n10+BeqLVzLm/n7+hzpDkd LQ9gnneJUaDlQaOSmnTX8UoHc+AX0PWtBoTfQgnCJeisQY1gArMH+OxLfKJ5Ee/Kuv4GCs 5ukQIMbBmtb7Nw8ju/NO48NzFEbdrepKO5VAS0Cy6QGNyQ55tp8ve7ApYRsZ6dGKwPpPRq 45etY/4c090W4yY/liIwcYFDri2QEA9/Nv517QJKhz+RdwyagU7sT9572k8WulPWhx+IGe +d+9nf8gCELAEWrWtws9XXnkdAmJq7KJpo97lywmzUZWMbwZtHjdJrgTuW2sgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760978839; a=rsa-sha256; cv=none; b=bLQfOiMOnfn3aUCuQoF7Z1hvlRBi4QyJh5LikKbrZWYabX4tsbASJLQ3MyHliP9m3vBtpq IdcweWV5HD3orOQmBoPEXeZZWk+YSLPk6NZrytSr2wAsraadRtMb5xEO0LbUAwI5v3DChu VhiBUZQOCFZpYhiPW72M6vZHAB/P8qpgn7Rgw+uaNZ/bSWHkidt10jN0TbuvLWVEfZomol 0fR5JGhEZqq96aE19OQ8bflnmo/gr1okrhJ1aYt2PJY+7//o+qAcYg7MJOkYVuyqcP3XhW 2pviYhtV+5Tgm+5zGMM3NwN265HzhgoNXcxtK6NTJuoe+IXDorCk5GGJxXtACQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr1Yg5XWrz5pY; Mon, 20 Oct 2025 16:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGlJTm099705; Mon, 20 Oct 2025 16:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGlJEF099702; Mon, 20 Oct 2025 16:47:19 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:47:19 GMT Message-Id: <202510201647.59KGlJEF099702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 511311e4f7a6 - stable/15 - vm: Fix iterator usage in vm_thread_stack_create() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 511311e4f7a6220234bc5bced1e8e0fae96d02a6 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=511311e4f7a6220234bc5bced1e8e0fae96d02a6 commit 511311e4f7a6220234bc5bced1e8e0fae96d02a6 Author: Mark Johnston AuthorDate: 2025-10-16 23:12:54 +0000 Commit: Mark Johnston CommitDate: 2025-10-20 16:46:02 +0000 vm: Fix iterator usage in vm_thread_stack_create() After commit 7a79d0669761 we no longer hold the VM object lock when initializing or advancing the domainset iterator in vm_thread_stack_create(). We could lift the lock out of vm_thread_stack_back() but that poses complications since we cannot allocate KVA with a VM object lock held. Instead of overridding the object's iterator, just borrow that of the current thread. Kernel stacks are basically always allocated with a DOMAINSET_POLICY_PREFER policy, so it's not very important to maintain a global iterator for round-robin allocation. As a part of this, fix up flag handling: make sure we handle M_NOWAIT/M_WAITOK from the caller. Delete a comment in vm_thread_new() which refers to a non-existent consideration (stack swapping has been removed). I suspect vm_thread_new() can use M_WAITOK but opted not to make that change here. Reported by: olce Reviewed by: olce, alc, kib Fixes: 7a79d0669761 ("vm: improve kstack_object pindex calculation to avoid pindex holes") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52982 (cherry picked from commit 3b9b64457676561b8de2bec7c94c561bbd807b0c) --- sys/vm/vm_glue.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index e0f1807a1b32..18d789c59281 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -441,19 +441,16 @@ vm_thread_kstack_arena_release(void *arena, vmem_addr_t addr, vmem_size_t size) * Create the kernel stack for a new thread. */ static vm_offset_t -vm_thread_stack_create(struct domainset *ds, int pages) +vm_thread_stack_create(struct domainset *ds, int pages, int flags) { vm_page_t ma[KSTACK_MAX_PAGES]; struct vm_domainset_iter di; - int req = VM_ALLOC_NORMAL; - vm_object_t obj; + int req; vm_offset_t ks; int domain, i; - obj = vm_thread_kstack_size_to_obj(pages); - if (vm_ndomains > 1) - obj->domain.dr_policy = ds; - vm_domainset_iter_page_init(&di, obj, 0, &domain, &req); + vm_domainset_iter_policy_init(&di, ds, &domain, &flags); + req = malloc2vm_flags(flags); do { /* * Get a kernel virtual address for this thread's kstack. @@ -480,7 +477,7 @@ vm_thread_stack_create(struct domainset *ds, int pages) vm_page_valid(ma[i]); pmap_qenter(ks, ma, pages); return (ks); - } while (vm_domainset_iter_page(&di, obj, &domain, NULL) == 0); + } while (vm_domainset_iter_policy(&di, &domain) == 0); return (0); } @@ -532,15 +529,9 @@ vm_thread_new(struct thread *td, int pages) ks = 0; if (pages == kstack_pages && kstack_cache != NULL) ks = (vm_offset_t)uma_zalloc(kstack_cache, M_NOWAIT); - - /* - * Ensure that kstack objects can draw pages from any memory - * domain. Otherwise a local memory shortage can block a process - * swap-in. - */ if (ks == 0) ks = vm_thread_stack_create(DOMAINSET_PREF(PCPU_GET(domain)), - pages); + pages, M_NOWAIT); if (ks == 0) return (0); @@ -660,7 +651,8 @@ kstack_import(void *arg, void **store, int cnt, int domain, int flags) ds = DOMAINSET_PREF(domain); for (i = 0; i < cnt; i++) { - store[i] = (void *)vm_thread_stack_create(ds, kstack_pages); + store[i] = (void *)vm_thread_stack_create(ds, kstack_pages, + flags); if (store[i] == NULL) break; } From nobody Mon Oct 20 16:54:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr1jw4wlKz6Cl5d; Mon, 20 Oct 2025 16:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr1jw4DGqz3h42; Mon, 20 Oct 2025 16:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760979268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTJLarUbh8XQcEWUjQzQM2hNuGEE67g4cCopSOZlqLM=; b=xHXiRNm3EkFjcksNiJOXswxbLKv2PYw+3KFkJG0baKzh3wEThTRcpz0c8/+QcPRY9BBawj tl6E9J3O7dFCoNIHqZQriv7Lfj0Y2M5cEeK0k3Q/bEkh0ukgE2UZxMfOjL4/o/I+7378B1 Ll1GR8OEy803pfDZz2z4o+GSgPNm12Yp6dH6bc9/BXYCPZRWaUVoQiyBAOaTKt6a3Nckn6 KjUfUU8SmwAeubXm+NMv6oTuGBXwWjcUtcq/MxnRBbTtyYWTa61RWYFIQz27pWRccTVjsz QzKmTvxVsk2eJlwqNL7VP4JVhFzWQ4Re3471UwKjp5JNhjjZzN4spWJpzU7aYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760979268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTJLarUbh8XQcEWUjQzQM2hNuGEE67g4cCopSOZlqLM=; b=bNgWVayXs15fU5E3u9gqoyXHOeLHXndCPj7xumeZyqjrI9haMOsi7sJ4cXhfzB1uSoHk0j +NIlEmfrMVC9c99GjAVfACrF9y+PLvje/qRECkkzL6m+VTwUTTYvgYyocVYyY7UcvoDDz9 CC8p1rxSU3DfKUPnjvH72E2qQPs/b3HoTDlDa44tSzi5PJ9ZpNXeWJEe4bsNHK5TbNZo2+ X1oCkPlHxUM07jwff3ZshStVsQaO9oid6NOBQH6U6FLFEduePCj8s36ihvgBBqccJfWWcb V/mOSyjJEmIqDErTUpT+UElB9L81FKm0sZIVGDWJOV5usaRiFKGo8D9B+5ZtRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760979268; a=rsa-sha256; cv=none; b=LGUhl2ZaTyYTG1IKOHeo9gxyFdVmoMRhxAD4z9A0/YputKSomXDI6ar2rRrQNfjdMpM5nk Txqz5d10dRpXuVaYF1jNMv78RnjOLZV/lEIpv1Uj0hyD8JDPM+dPN5I24UXgxmqR6cHk82 jgmdOZ5nnLX1/DHS3tAw0q8fsQt62WNGDxo2POdEC7GyYy3Mi4V+JIZHLmXW+WH0sJ4DGU oD/gVEIaj2dc2g87Q7CH3mkORQ4EHBLiPtt6xtRDThGpG6F6HsIILjJJrybH642tiDhDNs KXa5BKKdIv7hzU658KkvOBCWtM0rOAMwbdAz+IRd7N1/EW3oTa+TBegUHWXScQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr1jw3mBmz5n6; Mon, 20 Oct 2025 16:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KGsS6O017502; Mon, 20 Oct 2025 16:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGsS4p017499; Mon, 20 Oct 2025 16:54:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:54:28 GMT Message-Id: <202510201654.59KGsS4p017499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 78f70d4ff9dd - main - jail: fix a regression that creates zombies when removing dying jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78f70d4ff9dd4af2318b25023a7f55be7402ec60 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=78f70d4ff9dd4af2318b25023a7f55be7402ec60 commit 78f70d4ff9dd4af2318b25023a7f55be7402ec60 Author: Jamie Gritton AuthorDate: 2025-10-20 16:49:14 +0000 Commit: Jamie Gritton CommitDate: 2025-10-20 16:49:14 +0000 jail: fix a regression that creates zombies when removing dying jails When adding jail descriptors, I split sys_jail remove in two, and didn't properly track jail held between them when a jail was dying. This fixes that as well as cleaning up the logic behind it. PR: 290217 Reported by: David 'equinox' Lamparter Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53200 --- sys/kern/kern_jail.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3697d95fe0e5..00732d55cd46 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2909,12 +2909,6 @@ prison_remove(struct prison *pr) { sx_assert(&allprison_lock, SA_XLOCKED); mtx_assert(&pr->pr_mtx, MA_OWNED); - if (!prison_isalive(pr)) { - /* Silently ignore already-dying prisons. */ - mtx_unlock(&pr->pr_mtx); - sx_xunlock(&allprison_lock); - return; - } prison_deref(pr, PD_KILL | PD_DEREF | PD_LOCKED | PD_LIST_XLOCKED); } @@ -3461,12 +3455,17 @@ prison_deref(struct prison *pr, int flags) /* Kill the prison and its descendents. */ KASSERT(pr != &prison0, ("prison_deref trying to kill prison0")); - if (!(flags & PD_DEREF)) { - prison_hold(pr); - flags |= PD_DEREF; + if (!prison_isalive(pr)) { + /* Silently ignore already-dying prisons. */ + flags &= ~PD_KILL; + } else { + if (!(flags & PD_DEREF)) { + prison_hold(pr); + flags |= PD_DEREF; + } + flags = prison_lock_xlock(pr, flags); + prison_deref_kill(pr, &freeprison); } - flags = prison_lock_xlock(pr, flags); - prison_deref_kill(pr, &freeprison); } if (flags & PD_DEUREF) { /* Drop a user reference. */ From nobody Mon Oct 20 17:12:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr26t6xydz6CmM0; Mon, 20 Oct 2025 17:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr26t66qXz3lvT; Mon, 20 Oct 2025 17:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760980358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCUha8fvG+41/k9n3FL9lRAneH1HCM2gseT0B+s+G6w=; b=IsArZp08VMULMOAgHdDbATtL7aMHVQL9lCPFCTalg88DphK/64+VFiHOdSdMA4g2Q6aLX4 xt+6pz1Ixz36kkne+VApCnyZl2ug5zOtyAJ66LlY5ZtAy14i+os9iuN7kK9AN88x8tvGkN QJLaY8nIyV4pwwjXvZE7/gioxpNUcefWFGx9KQpQS8KF6ykW4C0zgqc6syBg40xFtQyXnP Buds9QE3NYPXP32/uOa7ploJghBgL8mPvLboSst08Ya8s2AYkQFxNO1fEywuR8J5UjOni6 BIEydGf9sYPzuj3eLQCaU20prDySsT/85CXKbL4DEASRNKM8T+OVuFgF94Vr5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760980358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCUha8fvG+41/k9n3FL9lRAneH1HCM2gseT0B+s+G6w=; b=mYqV+nkYdzb5d69Xjr5KIi8crx6N8LXysQ7mJ4ZLz/764ZLuV5NVbEFFpI4WiF+Uno/e8Z 2/8jG0t/DQZT3jr+N57+Ftp+bvJNVAEMTc+9EwuW/4eMm3G3wsjtWiGvwmDhcTQMDivvb0 2VKvhlitdWblHA5OquuDnhVP5MqbC+JJo6ZWx+RFqjJGP4Nt5vSdQ1D6JYL2vkz9fPxS44 +4SGdmDKbYJBoZlIyd9tdkUaZvPlam/6srkZKnVYPUnH8++5xIJP3dfhVdLwIgYOlOD5TA +VHoJo+81Bb4aOZ2wd9Lxr83ZlauAJ9oOcn8DwdCXpnn8uFHfgKHkgwi41JUdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760980358; a=rsa-sha256; cv=none; b=l0fBZlqFRgXF6OoIMDEgeBncW1VW/JkAiwnFiOqcteS/iyXAqpfucL5H3R+G2l1Pmd3fL1 AHvNkIn7Ca9NPTbUJ+RthPslgW7WnpaeAvTR+7FtgzLOQWwFjdQ5EPCjc8qhdmihaGLwZ9 YfI1k7szlXejAN4HeMLrHj7XTBawmhMMS0ViXKcL37OcHH+4sZ/KugADVA0R+IyHniPRYg YAxjd3JSTAhYw8AWnp6Vdt7tGTMu0y+KS4utFC56X4ZcC9gRLtzfTxWNshAQrSGZRaTBnl kHKfi5ETJvDSUkGCXUEV9aTEeqfOKCAlxVRqtoRW/g3GFmWGtrgIkWw2bgC8Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr26t5hYHz6fw; Mon, 20 Oct 2025 17:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KHCckC056011; Mon, 20 Oct 2025 17:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KHCc9K056008; Mon, 20 Oct 2025 17:12:38 GMT (envelope-from git) Date: Mon, 20 Oct 2025 17:12:38 GMT Message-Id: <202510201712.59KHCc9K056008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a1b0fae4182c - stable/14 - libc: Avoid installing timezone.3 multiple times List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 commit a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 Author: Ed Maste AuthorDate: 2025-10-20 16:16:21 +0000 Commit: Ed Maste CommitDate: 2025-10-20 17:10:44 +0000 libc: Avoid installing timezone.3 multiple times Commit a34940a9756a ("timezone: Move to the XSI/POSIX definition for timezone") was not merged to stable/14. The MFC of 29810aa6ae70 ("libc: Move tzset.3 to stdtime") didn't take this into account and ended up installing two different versions of timezone.3 over top of each other. This is a direcct commit to stable/14 as the issue is not present in main. If a34940a9756a gets merged in the future the reverted part of 29810aa6ae70 will need to be reapplied. Fixes: 29810aa6ae70 ("libc: Move tzset.3 to stdtime") Sponsored by: The FreeBSD Foundation --- lib/libc/stdtime/Makefile.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc index 842166201fd1..1c5880797f43 100644 --- a/lib/libc/stdtime/Makefile.inc +++ b/lib/libc/stdtime/Makefile.inc @@ -31,5 +31,4 @@ MLINKS+=strftime.3 strftime_l.3 MLINKS+=strptime.3 strptime_l.3 MLINKS+=time2posix.3 posix2time.3 MLINKS+=tzset.3 daylight.3 \ - tzset.3 timezone.3 \ tzset.3 tzname.3 From nobody Mon Oct 20 17:15:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2Bh0MJ3z6Cn1j for ; Mon, 20 Oct 2025 17:15:56 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yx1-f41.google.com (mail-yx1-f41.google.com [74.125.224.41]) (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 4cr2Bg3ssfz3n6Q for ; Mon, 20 Oct 2025 17:15:55 +0000 (UTC) (envelope-from rlibby@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-f41.google.com with SMTP id 956f58d0204a3-63e1e1bf882so3120580d50.1 for ; Mon, 20 Oct 2025 10:15:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760980554; x=1761585354; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1w789M6mhs/jjZ1l89TZzozgf+PqRLTBz/FbwemtXeI=; b=VSvUeC/BKkc252rIthSMbE6GDXPa/UT0mOTgJg+FcCA5Z+Pr9FthfvIAjBf8fplh6q 6Yx7qAgaVskbvZHCyGh94x4yIp2jSRhnaFvm12mLvCQ+HqnsdlnDJoMBKNYbXVlYU7fX LVKldkerM3GzQ49bbNOOGix8SGBWKEneFuHNX6YcAWRyP6MmIUaK3NBqwgPhg8SHFsbR WLyvj2m6F0Ll5lErWe6IxTkn4fX3cN6+PNGPmuEoCiyqWUC1+Lyx7Rd91T79qyHGo1nl faaoNQNyMDaShUo28ImSEgW5IoZ/W+pf5WhigTwtwC80K2u6XvgAmEl9+Xbwovq5Lt7Y aIWg== X-Forwarded-Encrypted: i=1; AJvYcCXsL691PsSa9x8deDztjHfPgCd5AgH6dcAPopXIYxINV2TQumz0VYwZ4XwuqfJ+T30JQjGFpgDZjT1iN+N7CTuB65lS@freebsd.org X-Gm-Message-State: AOJu0YwLYWCzPWss5lT36C2y3IpAC7H/1ntnT+oGGe3D7SxQza9Oe+eZ ift+ocjkvDnXhd14nt8cjfbCSCIaWdwlP3MRA7Zblcr5USRBqRuHrOQJIN1l2g== X-Gm-Gg: ASbGncskMr0RYmpK0Gm+et3t5q8Qi8u4eFRS5IAvnD7NMp+XTDbij1Gf6nYJnFSr3le QUo+p/7RvdWf0j60fP1HMV05s8dlc37gWm06e9A0nsZdyCaXgwL+OQ1xoN/VtPn/z5S2GqCJhze 9t40Q3LRob3oV0dSTO2r3iWzh6MwLHTUC/Pfa+M5ByohVGAUSTxjFXXrvar23HxFc7JyhAoJojn yVtcPO9kkhcPriI7QnxADkJIhXii9PcsPVxI07JzqNj2sZynYd9xhLnvqdEgrNhWtbcuaFUUsJq WhQGjPW6jjDC6FwFgM7WAZ5BNHK61hwSfxvgwmrVrjSX0/JgDP9Bmlt+12ZY4c4VEvnW3e4QUFt fBjEZau9SaGsVU3Pmo4zKZvLbcfsG6jrpd9iVBm+L45y1b17a81aJpp9fQ+aIUIS5rhXlBFrh/I bMlPYTuMpq3on8UnxifPnDBnPhNgQBWSKcZYLDzzr/W9L/945SlA== X-Google-Smtp-Source: AGHT+IEEz08NXcohrWZqbc7diCfTErnzcjLuRsEPtZtHU18QetuMScl8HX2OmjnoYNnSfOnsl74yVA== X-Received: by 2002:a05:690c:3341:b0:783:796c:c198 with SMTP id 00721157ae682-783796cc30amr185060917b3.41.1760980553997; Mon, 20 Oct 2025 10:15:53 -0700 (PDT) Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com. [209.85.128.175]) by smtp.gmail.com with ESMTPSA id 00721157ae682-784673bb9e9sm22452947b3.15.2025.10.20.10.15.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Oct 2025 10:15:53 -0700 (PDT) Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-7817c2d909cso51459177b3.1 for ; Mon, 20 Oct 2025 10:15:53 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCW8S1KHRfWdCAlMr9xhddcW8JKClB/hGEZTQV82gogxMGS70lR2NL1TGadCmxznqnKT60eOzhZMR9afA6RC6mhpAeX5@freebsd.org X-Received: by 2002:a05:690c:314:b0:780:f794:6e21 with SMTP id 00721157ae682-7836d1ece75mr226854937b3.24.1760980553166; Mon, 20 Oct 2025 10:15:53 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202510171155.59HBtMCp004658@gitrepo.freebsd.org> <86h5vt4ja9.fsf@ltc.des.dev> In-Reply-To: <86h5vt4ja9.fsf@ltc.des.dev> From: Ryan Libby Date: Mon, 20 Oct 2025 10:15:42 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AS18NWDwoFrYxXv405e3oJXZtwD1pt731dpI2CHcxaVXb9q3H3IVI0a8pTG6XB0 Message-ID: Subject: Re: git: 195b00ec45e5 - main - quot: Clean up To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:74.125.0.0/16, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cr2Bg3ssfz3n6Q On Mon, Oct 20, 2025 at 9:42=E2=80=AFAM Dag-Erling Sm=C3=B8rgrav wrote: > > Ryan Libby writes: > > Dag-Erling Sm=C3=B8rgrav writes: > >> In function 'usrrehash', > >> inlined from 'user' at /workspace/src/usr.sbin/quot/quot.c:244:3: > >> /workspace/src/usr.sbin/quot/quot.c:210:22: error: argument 1 range [1= 8446744071562067968, 18446744073709551615] exceeds maximum object size 9223= 372036854775807 [-Werror=3Dalloc-size-larger-than=3D] > >> 210 | if ((users =3D calloc(nusers, sizeof(*users))) =3D=3D = NULL) > >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > >> In file included from /workspace/src/usr.sbin/quot/quot.c:51: > >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h: In functi= on 'user': > >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h:92:10: > >> note: in a call to allocation function 'calloc' declared here > >> 92 | void *calloc(size_t, size_t) __malloc_like __result_use_che= ck > >> | ^~~~~~ > > > > Probably it is from > > -WARNS?=3D 2 > > > > I think gcc is saying that it thinks nusers may be negative. > > It's saying nusers may be large enough that the result of multiplying it > by sizeof(*users) exceeds an arbitrary threshold, which is technically > true but completely unhelpful. This gcc option should not be used. > > DES > -- > Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org The message is poor but the limit is not so arbitrary, it is PTRDIFF_MAX. It's saying that (size_t)nusers may be huge, because it infers that nusers, being signed, may be negative -- though in reality it will not be negative. It says the range that will result in huge values, (size_t)INT_MIN through (size_t)-1. Sure, you could disable the warning, kern.mk does that and one other user make file does too. Or you could convince gcc with a type constraint, or somehow else. In any case, we should fix the gcc build. Ryan From nobody Mon Oct 20 17:44:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2r95yRlz6Cq8r; Mon, 20 Oct 2025 17:44:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr2r95G77z3tSK; Mon, 20 Oct 2025 17:44:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7xYiLgkn0QVvEC8E/poAYVUtfSgsnXO/bhgcpAVCnQ=; b=hBEZ/5o3o/2yEf1AVcpfWKEU23yPAfGMX5U5ZSOAgSDxFBHsNrWwDPGOnwLvToHyuTjMzU 8Q+8QDbA9T8XGhiivQscw5iqtUY23mVOititB6wDNULfyPXytMHWrwBwHlBqSHc52aotQZ +rwnx6X8og0HuZ7em8rmkW+R0WnQZO/KyMblEXul9YjIowlokHUmgwrMV2nORYkx4BoWI0 KA5dPwxUFSaZKEP5H3r+iOfsKL8eCBkm+LEyfy8IveZbIooxFcYDNjxd4A9ZmC7sGc0K+P UTN5PL2dUmLQUs/UsgjMY0fS8FwekDLk3JolBsjEQvuA9yFlruOA7OB0IJsCvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7xYiLgkn0QVvEC8E/poAYVUtfSgsnXO/bhgcpAVCnQ=; b=airWAYJAQCfq1cDiWhUesNkYvYyweRfIPaApda/GW/yG1x+dkYo15xDeHypD+qvIJO2F2m xvjVHB7JGSu59FzrFJbwJGJ2AZB4FYPHacBbQxknCRRLAciwYuWYcyeD+ofDQd+7wUkCQ4 1nYh7Aj+bJvECbtt8fB0HM2sNGYU1YB7mZ6DtfsvBfmUWfJfmNT6/+9M3u/IvT5CwGXW/z /aazpXncQA7S+NkcJWt20h90w3OkbqXLiXfXjZc4pkp02DcEkuwCdZJ2onXp+DIIpBanvM RB78P2VovQ1ZJ3Y6nWog9qMG+cJMVBVlLRySuyANGlKauZymuuCT26oTFoP2IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760982297; a=rsa-sha256; cv=none; b=mf0j/6S2iD9BXCQLaLPibdbzIyHr146KjIi+4C89RevMgOhhGnYhxXiPJteZeYSeABpN4U hYxvPqDw5Y3ncPrLsnhtYYDvnCJGkLJJP4xPBHWThNjn/+uoTHIou5zn5dRVU37RRRPrUa jwrxH4C6xcVTEYecjC7ZnMcy4Gu7mQYYmq7bZEphQRM1pOnNauqlaNyeeYQMv1iYskgBKE 6EWRvDXTqWYopY+8y1lcDOeW2yTlEIEgH7ER/8mBeeeg8pJxFasZrmVSrE5sem+cUnWKFe C1kHxlaXUkkPsDDqLg+t7p/L4qEotaEOAZZuVVYAvIN9Pe1PKLcl2zFVcVvrqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c] (unknown [IPv6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cr2r93GnFz1Bkq; Mon, 20 Oct 2025 17:44:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 20 Oct 2025 13:44:56 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Content-Language: en-US To: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/20/25 10:59, Warner Losh wrote: > On Mon, Oct 20, 2025, 8:42 AM Lexi Winter wrote: > >> John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org>: >>> On 10/17/25 15:14, Lexi Winter wrote: >>>> Makefile: Don't allow install{world,kernel} with pkgbase >>> >>> Can we document how users who want to build from source can do so from a >> new installation >>> that uses pkgbase? I guess it is something like: >>> >>> - pkg install sources if not already (or git clone the right branch/tag) >>> - etcupdate bootstrap >>> - (clearly can't just use pkg delete with a >> glob, so need >>> something else) >> >> this should eventually be in the Handbook. > > > Install* should eventually just do the right thing like ports: stage the > packages, make the packages and the install from the packages. 16 time > frame, though. Hmm, 'make installkernel' needs to still create kernel.old for those of us doing development (or really, just running main. The tb(4) driver turned my laptop into a brick recently and I needed kernel.old so I could recover). AFAIK, pkgbase doesn't have any provision for doing that. Also, `make installkernel INSTKERNNAME=test; nextboot -k test` is a key part of my workflow for testing kernels. I'm fine with using packages to ship updates to users running stock sources, but please do not make it harder to do development. When hacking on userspace components I often need to be able to do just 'make install' of a single binary or library onto an installed system knowing that a future installworld or `make install` will revert to "stock" binaries later. Please don't break that. It's like when I work on changes to GDB or LLVM, I use the native build system to build the modified version, I don't try to hack up a port to build a package with the extra changes I have either in a working tree or committed on a feature branch. -- John Baldwin From nobody Mon Oct 20 17:48:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2w82VG3z6CqjZ; Mon, 20 Oct 2025 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr2w81Zclz3ty3; Mon, 20 Oct 2025 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMVXWPTeBLV1WqVm7dWZSHNKuj0Y+4yiFq8Td+IXANw=; b=QpPUe1QAaKHlXcZeVUA4oKea3hUDYNo5sXCZ98z0uj1bv7cc+ayCCD1Ii5ZQsYUQvqoPsk 9l9HsrCgODANn0ILApnZgQsDH5OG5AI2tTqzt6qQdoGUAmalbr8cjB4U4gfAFN9BlSDh1a kL2zM+owKeR7Rj0fSB7eZCSO5H/R3aX15LhstpUC6waOWJjXfbtfq+TSW8qxK7vvp7HvVY lVZONKFfd/eA6sZIOIlmpI+TItCj99dAltdgC4rCuoS8ErHf1jRPYGDm4H4dwXETkbwlhx 5491v9osmcN0mq7nTfd2s3aoYiL3MxpEivw1H4E7tiR32VdYO3njl9p+VKphLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMVXWPTeBLV1WqVm7dWZSHNKuj0Y+4yiFq8Td+IXANw=; b=tfBzSX57X2M+06yru3fhnZoCcASQDEs506fG1WOA0GYA/GfyHiA6lvLN5XP5sNN3JKwtnl R7oU8UIyXCQ8WpacibJlQ2FYlAshaiCMpMWka3d2j3ZY4d8y0zdBb83woUhBR8pht9KiPP MKU98etU6qTsWDHxfRUX8pIVqYgx3l6/eOhoYUZML3piMOao9kZV+BoPPXzlbbdUSfiZ/a Lh+CT6J3Xc9C6Heqq2vcusI62OP5fgaF3OC8qxjFFNmFrnH1fit/eFlYW7zmfDfZR5KoFD mBcfKqzGXSucRFDCOewRuVbyEyR3Uet7bTmfdJQsRO4eWU1+9SJkN/iKVNdnGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760982504; a=rsa-sha256; cv=none; b=XqtOmtvDurwXcZ+mrJkIgWqVKuOjgSiqyU1E9Y+eVy7ugJ7w+j15U1u1hdk70nljQ3+QKn oYtpZYjGDfm+kN8vBEstEXqt29TTx1MkowahXRX1GgAx5WnNd705OsCgns58CDFtrwU5tr +HiPRp3r+/Dph64ukia9EBByTusQwHFXDFdrlHobDb47mowNibat72Ms4HP+G66yJFPGFP ttVlVtmbhPPhR6hRIGaMWb16CTT/MFzDEJTpOVFsNLJMWffisgWTwn3fFpblKlcuVdr4+l z9utKfHYjWA+bWuMd+2IQ6QaYL3JAoMG2r6aa/37j1FuWmkNWSnAghg0kB9d8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr2w80kdJz7Yx; Mon, 20 Oct 2025 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KHmNqS013837; Mon, 20 Oct 2025 17:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KHmNTd013834; Mon, 20 Oct 2025 17:48:23 GMT (envelope-from git) Date: Mon, 20 Oct 2025 17:48:23 GMT Message-Id: <202510201748.59KHmNTd013834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: e3bd658fad96 - releng/15.0 - login.conf: Remove never used ignoretime/ignoretime@ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e3bd658fad96ee493e5b6ea912bce666a2027d7e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e3bd658fad96ee493e5b6ea912bce666a2027d7e commit e3bd658fad96ee493e5b6ea912bce666a2027d7e Author: Paul Armstrong AuthorDate: 2019-09-06 21:40:01 +0000 Commit: Colin Percival CommitDate: 2025-10-20 17:48:09 +0000 login.conf: Remove never used ignoretime/ignoretime@ Approved by: re (cperciva) PR: 240378 Reviewed by: otis (mentor), glebius (src committer) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52991 (cherry picked from commit 4835fc45efe8b593fa49786ec4bfb6ce5050756c) (cherry picked from commit 34710b2c08c95b8cdee96e77693c2e4ddef9bfbe) --- usr.bin/login/login.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.bin/login/login.conf b/usr.bin/login/login.conf index 1069da17b4db..c65a83caa565 100644 --- a/usr.bin/login/login.conf +++ b/usr.bin/login/login.conf @@ -46,7 +46,6 @@ default:\ :umtxp=unlimited:\ :pipebuf=unlimited:\ :priority=0:\ - :ignoretime@:\ :umask=022:\ :charset=UTF-8:\ :lang=C.UTF-8: @@ -149,7 +148,6 @@ russian|Russian Users Accounts:\ # :requirehome:\ # :passwordtime=90d:\ # :umask=002:\ -# :ignoretime@:\ # :tc=default: # # @@ -174,7 +172,6 @@ russian|Russian Users Accounts:\ ## #staff:\ # :ignorenologin:\ -# :ignoretime:\ # :requirehome@:\ # :accounted@:\ # :path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\ @@ -265,7 +262,6 @@ russian|Russian Users Accounts:\ ## - no time accounting, restricted to access via dialin lines ## #site:\ -# :ignoretime:\ # :passwordtime@:\ # :refreshtime@:\ # :refreshperiod@:\ From nobody Mon Oct 20 17:48:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2w937rkz6Cqjb; Mon, 20 Oct 2025 17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr2w91mqJz3vKX; Mon, 20 Oct 2025 17: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=1760982505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30E6e4SxfMaYl71qmfoYFeT7Gw0qtinGfx1suWVxggI=; b=rXNhMNDsQNU3EU4eo0ljuGV8/IM3rGUk0ZvmTf6DpD8L4YIskH56WYl1/bBoAEMFEz6kzy jjNh/hT5BfFwumwFRZoGee5vazJzkhBmng6LdCZ7UgODO5L0UDFJZ+fZ2BrxWOt4WufZlQ owWCINBdZ+beUEKeEwZADOZixOLjMU8cySBBIpHqye0WMv5g6PIuDMxyUhjYDyrAUva04J dJXzxd3YSgPMTpHvCBxezj5x2P4K6VPYPE3h9Xo5tB8BgZlXv7hXiu8g+mRZ4OabpT/mNZ 9aLFIwQjcyDcxtHT65z8YaQa67x5kvU0ZUJaYr9WwlkskELw8Iiz/3YgonO61g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30E6e4SxfMaYl71qmfoYFeT7Gw0qtinGfx1suWVxggI=; b=pvfjeWT2ly7Jrvb7pxY62OP3obHMNe/NHF5L6L2APrikkpmk2xgM+KtyfqOLjuoFEBM6tS eBhrn3mKoheex/0RdGORNB3v45nIvawk/L0s9sHyWGriTZlooiJC7X6VHD7saJd8rJxV8O CRVF2fLWFjvPyvV2Qi4TEe7OBeEVuu2SEHukteXb3PGQxxmIROfQPstHAzK1UgOlYA7ySu gSvrnALFXZki8ihEk7y5Rw6Cw81anIz3HHjI+AdurVR6/eoxrsNZFkX7lK6s1ScPc/jsrD iNwCEYrhpjjsLhG0CtXpYSQDxrY3EA8nbPRnpWp/GcsGVnhG5JeHqjKryxbobw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760982505; a=rsa-sha256; cv=none; b=oRkZFuxo4hONhBiB5+o767D9S+f3T0oyNcZlLET2BgHLTsB+PeZRALLhvhcweFSD4hfV6t 6FS1RpNd5kKvVQg1LxFa7/XuYZes0hZ3TpkJA+mKASQXDse679L/4lED/ZjiRq8m70MftC fdfR6E9rihwF9FY/U4Col5yFmjneHeSNk61Pl55HRAYwHzjWzVcfVYjf35Qu6DDAbkRRnp HVS0qC+ZKXZgo4l39BgMXcsFl61DMHuHgbn/B+uKKtp5VppPPiJD8UudrftgYTH4EmLtuE 0K7XI8et2szmcg7R1H21IT1OxUL2vCpep1jGy7LvCh5kCaVBFkTVeTkpUV/9EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr2w915tLz7XG; Mon, 20 Oct 2025 17:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KHmPRD013874; Mon, 20 Oct 2025 17:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KHmPmK013871; Mon, 20 Oct 2025 17:48:25 GMT (envelope-from git) Date: Mon, 20 Oct 2025 17:48:25 GMT Message-Id: <202510201748.59KHmPmK013871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5773d056fb4a - releng/15.0 - manpages: Use canonical names for Linux filesystems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 5773d056fb4ac151d2897fa3051e8c5243aa79f8 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5773d056fb4ac151d2897fa3051e8c5243aa79f8 commit 5773d056fb4ac151d2897fa3051e8c5243aa79f8 Author: Michael Osipov AuthorDate: 2025-10-17 09:24:12 +0000 Commit: Colin Percival CommitDate: 2025-10-20 17:48:13 +0000 manpages: Use canonical names for Linux filesystems The manpages of linprocfs(5) and linsysfs(5) document incomplete names without "fs" suffix. Make them identical to other filesystems. Approved by: re (cperciva) PR: 283079 MFC after: 3 days Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53155 (cherry picked from commit 88b9ca860ef332d4d32e97e0f8a166f12cffc8e3) (cherry picked from commit 6ec0fbd8ff11c7180e52e9c30a071da8f532fd47) --- share/man/man4/linprocfs.4 | 4 ++-- share/man/man4/linsysfs.4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/linprocfs.4 b/share/man/man4/linprocfs.4 index 53940d7c02b0..dcd1c642b409 100644 --- a/share/man/man4/linprocfs.4 +++ b/share/man/man4/linprocfs.4 @@ -9,7 +9,7 @@ .Nd Linux process file system .Sh SYNOPSIS .Bd -literal -linproc /compat/linux/proc linprocfs rw 0 0 +linprocfs /compat/linux/proc linprocfs rw 0 0 .Ed .Sh DESCRIPTION The Linux process file system, or @@ -138,7 +138,7 @@ To mount a file system on .Pa /compat/linux/proc : .Pp -.Dl "mount -t linprocfs linproc /compat/linux/proc" +.Dl "mount -t linprocfs linprocfs /compat/linux/proc" .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , diff --git a/share/man/man4/linsysfs.4 b/share/man/man4/linsysfs.4 index 12729a814085..045e1af89173 100644 --- a/share/man/man4/linsysfs.4 +++ b/share/man/man4/linsysfs.4 @@ -9,7 +9,7 @@ .Nd Linux kernel objects file system .Sh SYNOPSIS .Bd -literal -linsys /compat/linux/sys linsysfs rw 0 0 +linsysfs /compat/linux/sys linsysfs rw 0 0 .Ed .Sh DESCRIPTION The @@ -66,7 +66,7 @@ The PCI device hierarchy node. .Sh EXAMPLES The most common usage follows: .Pp -.Dl "mount -t linsysfs linsys /compat/linux/sys" +.Dl "mount -t linsysfs linsysfs /compat/linux/sys" .Pp where .Pa /compat/linux/sys From nobody Mon Oct 20 17:48:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2wB3kzwz6CqTw; Mon, 20 Oct 2025 17:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr2wB2BzNz3v1T; Mon, 20 Oct 2025 17:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FovMVdmgRvuojY9/dUqfHOe1GRZ2E852qx+Dq7HHaQM=; b=powMxfP6/9vHOf86L7lVzIsiAgUIFETX2NBwBnl4i4hGoIdyCC8ZsSEZQWfB6Pcy+1EvuW jw37hGVrZJpAlBldDmz2m0ZbSZ38hYfpX9DtlDm90aKXlunEAiu/f51e1bCuRzrtEsk8IO 91HGdr6WQ0bvNCyZ4Sh041A8Nc1GuOR5ZG3oxmJhlW81sZHVJ6VxrivN3d0TBrf3S6Txxn pw3ukGnS4fC/pLKyVleVWcgIq6B2rDmamYUCFXhF9ijB77+GiVWOiIjPRTjSm0wy+45/r4 MOr9tkcpCyu9giIjGc5CZz7M6KB7VMzfBSXkkYXSRoR5aL4292mysGd3cmWqBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FovMVdmgRvuojY9/dUqfHOe1GRZ2E852qx+Dq7HHaQM=; b=JEdBOY1VpGF6Z4FgT3qBaHI4TeyvGdheubmLv/G7b5gyTmO2js8VZUMyC3uDDIjXAddX1i 0AHZE1oxYWTLzDOfyXVSZBIpyCVPHgfb+m+ilfatWbT35ycgh37xqCjOB/CMHTormwioIt zKopuyzr45FoaqXYGFif+9+/2wN0WtR+JYbWibGS651u41cM1e6Po5OpDuaQjQaZMp9N9/ K8/0NQpAcaMzjtAXSHhzodZyBW/SOTNKB0XoBGVmJXkUUtgGZsuw/wGHRzKnG/ya+VI5Ye wAr/w1oYV+6apq0N18Yml3vIHvM6LS/7SXNBpi70LEgvxAeYHy2gbinV03stvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760982506; a=rsa-sha256; cv=none; b=uuNeIfjFxI6BAvxNM8HeyMnZAdIglU/7+ej5X+9Zx1F0BK7SI2HUtitq1s7ouh/ADvX35K WW/F2CSgzz2ygkgbWwwvnCVp1dA76GW4gKeUbTrTCI5KRjHdCmiU/4njBmu+qq5vEx2yau NLphHI6uA+ynhUEJmvvJnD1XbGNgsxIVueV58ONnIxCkez4Mg167iU1pylKLgktSTxLk9S DGzZ6j2xqQL3lyqT92cKUmc+6HjgWtPYUkCe/D4kGxWhrlxCuwMimMMAztm3EXDHoNu5PT C/3n2laJmzvS6Htw3mW35SYWR+b1WBwZcSAOGL7VfmhbSukMyso0FrcWX2C73A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr2wB1TvRz7QL; Mon, 20 Oct 2025 17:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KHmQwS013910; Mon, 20 Oct 2025 17:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KHmQre013907; Mon, 20 Oct 2025 17:48:26 GMT (envelope-from git) Date: Mon, 20 Oct 2025 17:48:26 GMT Message-Id: <202510201748.59KHmQre013907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 30b015e2cf7d - releng/15.0 - linprocfs: Add nodes for inotify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 30b015e2cf7d60ecc73c1c73828ef39c8f939865 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=30b015e2cf7d60ecc73c1c73828ef39c8f939865 commit 30b015e2cf7d60ecc73c1c73828ef39c8f939865 Author: Mark Johnston AuthorDate: 2025-10-17 12:55:56 +0000 Commit: Colin Percival CommitDate: 2025-10-20 17:48:16 +0000 linprocfs: Add nodes for inotify These map directly onto sysctls under vfs.inotify of the same name. Approved by: re (cperciva) Reviewed by: olce, des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53142 (cherry picked from commit 28c0ef76841bbb322b6e39668e1c8e997c1f8000) --- sys/compat/linprocfs/linprocfs.c | 77 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 95b212be1306..7ac48786c77b 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -2216,6 +2216,67 @@ linprocfs_dosysvipc_shm(PFS_FILL_ARGS) return (0); } +static int +linprocfs_doinotify(const char *sysctl, PFS_FILL_ARGS) +{ + size_t size; + int error, val; + + if (uio->uio_rw == UIO_READ) { + size = sizeof(val); + error = kernel_sysctlbyname(curthread, + __DECONST(void *, sysctl), &val, &size, NULL, 0, 0, 0); + if (error == 0) + sbuf_printf(sb, "%d\n", val); + } else { + char *endp, *newval; + long vall; + + sbuf_trim(sb); + sbuf_finish(sb); + newval = sbuf_data(sb); + vall = strtol(newval, &endp, 10); + if (vall < 0 || vall > INT_MAX || endp == newval || + *endp != '\0') + return (EINVAL); + val = (int)vall; + error = kernel_sysctlbyname(curthread, + __DECONST(void *, sysctl), NULL, NULL, + &val, sizeof(val), 0, 0); + } + return (error); +} + +/* + * Filler function for proc/sys/fs/inotify/max_queued_events + */ +static int +linprocfs_doinotify_max_queued_events(PFS_FILL_ARGS) +{ + return (linprocfs_doinotify("vfs.inotify.max_queued_events", + PFS_FILL_ARGNAMES)); +} + +/* + * Filler function for proc/sys/fs/inotify/max_user_instances + */ +static int +linprocfs_doinotify_max_user_instances(PFS_FILL_ARGS) +{ + return (linprocfs_doinotify("vfs.inotify.max_user_instances", + PFS_FILL_ARGNAMES)); +} + +/* + * Filler function for proc/sys/fs/inotify/max_user_watches + */ +static int +linprocfs_doinotify_max_user_watches(PFS_FILL_ARGS) +{ + return (linprocfs_doinotify("vfs.inotify.max_user_watches", + PFS_FILL_ARGNAMES)); +} + /* * Filler function for proc/sys/fs/mqueue/msg_default */ @@ -2313,9 +2374,7 @@ linprocfs_domqueue_queues_max(PFS_FILL_ARGS) static int linprocfs_init(PFS_INIT_ARGS) { - struct pfs_node *root; - struct pfs_node *dir; - struct pfs_node *sys; + struct pfs_node *dir, *fs, *root, *sys; root = pi->pi_root; @@ -2466,10 +2525,18 @@ linprocfs_init(PFS_INIT_ARGS) NULL, PFS_RD); /* /proc/sys/fs/... */ - pfs_create_dir(sys, &dir, "fs", NULL, NULL, NULL, 0); + pfs_create_dir(sys, &fs, "fs", NULL, NULL, NULL, 0); + + pfs_create_dir(fs, &dir, "inotify", NULL, NULL, NULL, 0); + pfs_create_file(dir, NULL, "max_queued_events", + &linprocfs_doinotify_max_queued_events, NULL, NULL, NULL, PFS_RDWR); + pfs_create_file(dir, NULL, "max_user_instances", + &linprocfs_doinotify_max_user_instances, NULL, NULL, NULL, PFS_RDWR); + pfs_create_file(dir, NULL, "max_user_watches", + &linprocfs_doinotify_max_user_watches, NULL, NULL, NULL, PFS_RDWR); /* /proc/sys/fs/mqueue/... */ - pfs_create_dir(dir, &dir, "mqueue", NULL, NULL, NULL, 0); + pfs_create_dir(fs, &dir, "mqueue", NULL, NULL, NULL, 0); pfs_create_file(dir, NULL, "msg_default", &linprocfs_domqueue_msg_default, NULL, NULL, NULL, PFS_RD); pfs_create_file(dir, NULL, "msgsize_default", From nobody Mon Oct 20 17:54:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr32q3s9Nz6CrHW; Mon, 20 Oct 2025 17:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr32q0wjVz3xSh; Mon, 20 Oct 2025 17:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wtk6RMHAfqah/faIep1iIgdYE0WFxeD5lyFoq9nxRks=; b=a15sJw24PN0zRuzLHE2EjjFLSPLyiVklJqPvdQ/PqvAeSDv43WSVRRGBBvUEe85RDdcSTP VxGo5k7bny0yJvIinqI+WMRdNvRlGErvjqhpwWCkrN1cszXJHmP4P/qqOlyBcr5QkxA7MX MquvmnTBHYze7D9io/zbnoA19rjlsYUYl11HqBmZgRjhT6GZKvpwwr+zAMMC9Dh70oq8Gm EDRH8mUgUiFReNltOfbovKcTSy29sS0tgbzB9Ckw4M4dyHRhTLR4FBu4TGGBXQW48w5oG3 0g45y+u792woTF780hMXM8yB/MYDsZWz3QUzI9B6ZCL8aJE/XM8tVWfXMKrNVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wtk6RMHAfqah/faIep1iIgdYE0WFxeD5lyFoq9nxRks=; b=St7EjMV31AqTejxcSvHiWN+HI9q8qBZIhoEczWRu70KH3ejMVkDusVkNtYaagbjKsM6Ke3 FqJPDvNs2fNMQqtE6su8HnIzoT4UVsZn+5EO9He/XvuyX5qVaL2CbuAFBmdrP3xAq77hpU hsRo0NhKoWwHaoMnVoKTImki4EziXnJjpRzSQsxfKPkidKlZ/71ssHtpjKNYXrf+9iOdo1 C1Vc+XIww/OFUo/49uVegYcllcenEstyukVLUbwtTOSlUXrbwipFDkyN63sdHxEsIITDBF 6xgNGpKtm2y1WPdK6DXIw2yYMJSdhxQGgYNMom2s/8of39j35mj52/fwpiADzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760982851; a=rsa-sha256; cv=none; b=dKbV4Gk1P++lwjvO44ePOvgdXV2M9rC6HPemsfolAiVGtMs04V5NzCsHE9h9l+xd+n0X6b 7rBfRZEiruQoi1+OpDy6nCXm0XLhqvQQ6CMtOC99W4BLgBFlEARthqW7yjxIKFwmAckpZq +Hrd0dwzPlpNGipU1V8GviAYYJfgkSDUb1vzhzOMyjguOMIgJBhhbx5VilvFKXfkwquUbx svhL0t6DxjRzBNMCcrtbW+MOot8/vOkqsoU+l//nVoO9PO65m2qGPJL3P11Dv0EbPw9VAX nHzunJOqZypuXH7f6+9mFQ39SP/felxO/YRInEsW/6/dHPnMFrL+4cmTlUyoQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr32q0T3Vz7mC; Mon, 20 Oct 2025 17:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KHsAuX030887; Mon, 20 Oct 2025 17:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KHsAeR030884; Mon, 20 Oct 2025 17:54:10 GMT (envelope-from git) Date: Mon, 20 Oct 2025 17:54:10 GMT Message-Id: <202510201754.59KHsAeR030884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d7226d1858c1 - stable/15 - vm_domainset: Ensure round-robin works properly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d7226d1858c188475b12b0c4dff5bc794e42be6d Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7226d1858c188475b12b0c4dff5bc794e42be6d commit d7226d1858c188475b12b0c4dff5bc794e42be6d Author: Olivier Certner AuthorDate: 2025-09-25 14:40:30 +0000 Commit: Mark Johnston CommitDate: 2025-10-20 16:47:37 +0000 vm_domainset: Ensure round-robin works properly All iterators that rely on an object's 'struct domainset_ref' (field 'domain' on 'struct vm_object'), which is the case for page allocations with objects, are used with the corresponding object locked for writing, so cannot lose concurrent iterator index's increases even if those are made without atomic operations. The only offender was thread stack allocation, which has just been fixed in commit 3b9b64457676 ("vm: Fix iterator usage in vm_thread_stack_create()"). However, the interleaved policy would still reset the iterator index when restarting, losing track of the next domain to allocate from when applying round-robin, which all allocation policies do if allocation from the first domain fails. Fix this last round-robin problem by not resetting the shared index at iterator's phase init on DOMAINSET_POLICY_INTERLEAVE. Add an assertion to check that, when passed, an object is write-locked in order to prevent the problem mentioned in the first paragraph from reappearing. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52733 (cherry picked from commit 7b0fe2d405ae09b1247bccc6fa45a6d2755cbe4c) --- sys/vm/vm_domainset.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c index 9fa17da954f7..c25ed0cc2267 100644 --- a/sys/vm/vm_domainset.c +++ b/sys/vm/vm_domainset.c @@ -113,7 +113,6 @@ vm_domainset_iter_interleave(struct vm_domainset_iter *di, int *domain) int d; d = di->di_offset % di->di_domain->ds_cnt; - *di->di_iter = d; *domain = di->di_domain->ds_order[d]; } @@ -260,9 +259,14 @@ vm_domainset_iter_page_init(struct vm_domainset_iter *di, struct vm_object *obj, * are immutable and unsynchronized. Updates can race but pointer * loads are assumed to be atomic. */ - if (obj != NULL && obj->domain.dr_policy != NULL) + if (obj != NULL && obj->domain.dr_policy != NULL) { + /* + * This write lock protects non-atomic increments of the + * iterator index in vm_domainset_iter_rr(). + */ + VM_OBJECT_ASSERT_WLOCKED(obj); dr = &obj->domain; - else + } else dr = &curthread->td_domain; vm_domainset_iter_init(di, dr->dr_policy, &dr->dr_iter, obj, pindex); From nobody Mon Oct 20 18:02:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3Dm1XxZz6Crml; Mon, 20 Oct 2025 18:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3Dm15KGz3yng; Mon, 20 Oct 2025 18:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wykpQYwGumJL0xr4j2C2WTn6R8sJLAQmL6D8oaHQLY4=; b=TW5wHXjvuaso8q5sT1do6cV71/SmpiIOmhyrRs4dkQNsn2bW5MYEThB8aVfffxuMHn4wXY /p6CosQSfv1fmAAIjMnNl1KqhzVYhUkU7qpD5er7p9UsnoIm5dHmR3RHlVsyo1U0Bt8QTZ XL0bGoW/JX6oKKpuRmw1+PO4gy6LHUHuetKOo/1wDlgdL4KCMKwta4M+xS+aDspAmAI9n4 3vkWNaEUWqfyG6YrSV9n1GRp1/AXtSNjDRkCUgNqZMW+3bYgwqq6fsJI03OdesP1wAnXHB wpSX6ivFtdoKq+d2pmh/+7ywTKRSOD/Plw/9eUjmI9cubN2OfVQ8940C3rZNmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wykpQYwGumJL0xr4j2C2WTn6R8sJLAQmL6D8oaHQLY4=; b=h2BCpSKvKUWekh+CcX2Zq48pgAKGe++evoJ04FkyI1St1Bv6OEGfWJFhyq6ug0UDPyxyW2 gN3qC3OzYZZ/h3kobC5zXUKo0yMoV+qjKPBLIDDf3v1YULDhvkQ0CDHfEgQfwZkIYuBrKj M+4w2G1fodoNRmGraCL4ZaEfHKSfT2z7kncwn/CE1cE6Q5FIyDLjLciLN71xU2lrm61sj9 pVgqmuVVGfrYwpyHo8cvrRXsJV9EV8wCMi/XMnaudUq2fELFFhtNKdbVs6Fw+u6S/webbK sR4HBds+OKsOJMd+12fNy8qyEeLiPTcj0r6ipFk6gpfr1dsHOALRvpDPGeBHOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760983368; a=rsa-sha256; cv=none; b=FhJVTNYt9AvURQcE1Gk2F8FC4rv7oNUbzABdpHteR8XwsGG1GRFIN8ozIAq4QpqsO3URP9 Wd47R5OGxVl5qyowVtfnuhFS7hp3tusXqklitscXQ2LdQYV0foBcwIbpM6PXWDSqMDxzhB WH+kT4Tg3eHsQsSn4jJg7QpFB56w0Zj+DTHkKlJweWzbsf8qahQCQHV/RiOZbuHUyf/xRs ra0OsALyQdDHnvbyD7ssc5sqLJnakkXVfk4ULjzUwmtH9IOcHcqx77/9bKYKf9RkI9MMlZ mot3buVfFAjWJOpB1VruGBo8nSWpi5l5gFH7vVp5rIEgbaw3LLWZXwd4ixkjRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3Dm0fsfz8Gx; Mon, 20 Oct 2025 18:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KI2lDZ049980; Mon, 20 Oct 2025 18:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KI2leY049977; Mon, 20 Oct 2025 18:02:47 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:02:47 GMT Message-Id: <202510201802.59KI2leY049977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9554bb1249d8 - releng/15.0 - vm: Fix iterator usage in vm_thread_stack_create() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 9554bb1249d830a731fb941cd052ab24653a6938 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9554bb1249d830a731fb941cd052ab24653a6938 commit 9554bb1249d830a731fb941cd052ab24653a6938 Author: Mark Johnston AuthorDate: 2025-10-16 23:12:54 +0000 Commit: Colin Percival CommitDate: 2025-10-20 18:02:26 +0000 vm: Fix iterator usage in vm_thread_stack_create() After commit 7a79d0669761 we no longer hold the VM object lock when initializing or advancing the domainset iterator in vm_thread_stack_create(). We could lift the lock out of vm_thread_stack_back() but that poses complications since we cannot allocate KVA with a VM object lock held. Instead of overridding the object's iterator, just borrow that of the current thread. Kernel stacks are basically always allocated with a DOMAINSET_POLICY_PREFER policy, so it's not very important to maintain a global iterator for round-robin allocation. As a part of this, fix up flag handling: make sure we handle M_NOWAIT/M_WAITOK from the caller. Delete a comment in vm_thread_new() which refers to a non-existent consideration (stack swapping has been removed). I suspect vm_thread_new() can use M_WAITOK but opted not to make that change here. Approved by: re (cperciva) Reported by: olce Reviewed by: olce, alc, kib Fixes: 7a79d0669761 ("vm: improve kstack_object pindex calculation to avoid pindex holes") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52982 (cherry picked from commit 3b9b64457676561b8de2bec7c94c561bbd807b0c) (cherry picked from commit 511311e4f7a6220234bc5bced1e8e0fae96d02a6) --- sys/vm/vm_glue.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index e0f1807a1b32..18d789c59281 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -441,19 +441,16 @@ vm_thread_kstack_arena_release(void *arena, vmem_addr_t addr, vmem_size_t size) * Create the kernel stack for a new thread. */ static vm_offset_t -vm_thread_stack_create(struct domainset *ds, int pages) +vm_thread_stack_create(struct domainset *ds, int pages, int flags) { vm_page_t ma[KSTACK_MAX_PAGES]; struct vm_domainset_iter di; - int req = VM_ALLOC_NORMAL; - vm_object_t obj; + int req; vm_offset_t ks; int domain, i; - obj = vm_thread_kstack_size_to_obj(pages); - if (vm_ndomains > 1) - obj->domain.dr_policy = ds; - vm_domainset_iter_page_init(&di, obj, 0, &domain, &req); + vm_domainset_iter_policy_init(&di, ds, &domain, &flags); + req = malloc2vm_flags(flags); do { /* * Get a kernel virtual address for this thread's kstack. @@ -480,7 +477,7 @@ vm_thread_stack_create(struct domainset *ds, int pages) vm_page_valid(ma[i]); pmap_qenter(ks, ma, pages); return (ks); - } while (vm_domainset_iter_page(&di, obj, &domain, NULL) == 0); + } while (vm_domainset_iter_policy(&di, &domain) == 0); return (0); } @@ -532,15 +529,9 @@ vm_thread_new(struct thread *td, int pages) ks = 0; if (pages == kstack_pages && kstack_cache != NULL) ks = (vm_offset_t)uma_zalloc(kstack_cache, M_NOWAIT); - - /* - * Ensure that kstack objects can draw pages from any memory - * domain. Otherwise a local memory shortage can block a process - * swap-in. - */ if (ks == 0) ks = vm_thread_stack_create(DOMAINSET_PREF(PCPU_GET(domain)), - pages); + pages, M_NOWAIT); if (ks == 0) return (0); @@ -660,7 +651,8 @@ kstack_import(void *arg, void **store, int cnt, int domain, int flags) ds = DOMAINSET_PREF(domain); for (i = 0; i < cnt; i++) { - store[i] = (void *)vm_thread_stack_create(ds, kstack_pages); + store[i] = (void *)vm_thread_stack_create(ds, kstack_pages, + flags); if (store[i] == NULL) break; } From nobody Mon Oct 20 18:02:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3Dn2BGDz6Cs3C; Mon, 20 Oct 2025 18:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3Dn1jLdz3yvH; Mon, 20 Oct 2025 18:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ksG/u94TCVnGEWdGgC8AlUKxIoFwWj8issZa0ZoKajU=; b=wPgpX0XQF1QZ6s6R/TgNLWjdzt3Wy2weHA5qFGa9xuq6pnN+xDNLUEn0f5zmlxVChrBV9f Ghrm1tgo7q9FY2+e8gtr4If5FayNxwTfdZ/huyK0/yEHWP9Bm0Z95b0erJaJS2ubR9AoJQ BwRMbuHwwfYBWMG+C/U83sypGWNmiB/VkJRJr59Kq+hyC0jkp6P/KNXKhXNZ/up5cb3wq9 W5M86GuhZ1nSncp2OYOuhfUiPMUWzJuKEUdevS8h2zo743Yo2tmrT3V4tB/KxMai9RFQHt 53bEpTxx76BfFqgAJnLSZXtKyaRLsBJQGeHyRyS55+D0BHSW89YxOeMMoqEyFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ksG/u94TCVnGEWdGgC8AlUKxIoFwWj8issZa0ZoKajU=; b=dOoXJ70dbgEAWoQWIFhzhxZ/kuoA02aVS/kDXaFZaBXh9q/3fZGI2eGBcD2dd6NuPXxrp+ zgYGcN7CVBQcecg6NBcBNETjSSuUeRVfLe6cOv5D3FvrZrQc4C/oz91BVB9cxcL3b/yx37 YljQrxU9OEkHJqv+DdZ9asA5P6XVaCsnC8rVSz1k7PrDdCPXjM1xhtuPt6oIsvri3KWyZA kLCYmY6zvdeY08amHbE7/LrsXj+q6kgps7x0Fwfop4705gFiajQjEm3AANOvLb7Aq05vx3 zzTCiTamhXwBqDYGgsYgUrq2XOSA8C/3lPFdYTme0bOmqjf6xXpZP2dszi8q9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760983369; a=rsa-sha256; cv=none; b=UIu8JJyERn1/Hfa6nYDYE5sCO3cJuEmMt83p5302DDt61jZlKco+AIGlh8AlgngWY3Fvrf dUN2soLB1gqTN5WqQrGRHXj03NaBFVU8hvld9vdhMPe85vr2740zbj025Kvihpklwd6s/i rVSMH+lA735ViYgbQYWAt0kLjkwUoPXAhoTW5QA+LX+BdFwKbLcxuHKzXdLBYNwWy9T7ld W6njFNO5zteDsCJgtJAfR0jpqIUc5gPetfACyp0P/2I4nhsFbhB03dUG8rugnaUyc7bpQV DqztIyaPMQV4MI8xobpjqb5tm7e1+trSgKVwur/NVhWhjzoIWMPcD1hELpqjqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3Dn1Jn5z8JY; Mon, 20 Oct 2025 18:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KI2ngQ050014; Mon, 20 Oct 2025 18:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KI2n2S050011; Mon, 20 Oct 2025 18:02:49 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:02:49 GMT Message-Id: <202510201802.59KI2n2S050011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b15ff7214020 - releng/15.0 - vm_domainset: Ensure round-robin works properly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: b15ff72140204b416f067a75ac9fa189c0387f7d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b15ff72140204b416f067a75ac9fa189c0387f7d commit b15ff72140204b416f067a75ac9fa189c0387f7d Author: Olivier Certner AuthorDate: 2025-09-25 14:40:30 +0000 Commit: Colin Percival CommitDate: 2025-10-20 18:02:37 +0000 vm_domainset: Ensure round-robin works properly All iterators that rely on an object's 'struct domainset_ref' (field 'domain' on 'struct vm_object'), which is the case for page allocations with objects, are used with the corresponding object locked for writing, so cannot lose concurrent iterator index's increases even if those are made without atomic operations. The only offender was thread stack allocation, which has just been fixed in commit 3b9b64457676 ("vm: Fix iterator usage in vm_thread_stack_create()"). However, the interleaved policy would still reset the iterator index when restarting, losing track of the next domain to allocate from when applying round-robin, which all allocation policies do if allocation from the first domain fails. Fix this last round-robin problem by not resetting the shared index at iterator's phase init on DOMAINSET_POLICY_INTERLEAVE. Add an assertion to check that, when passed, an object is write-locked in order to prevent the problem mentioned in the first paragraph from reappearing. Approved by: re (cperciva) Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52733 (cherry picked from commit 7b0fe2d405ae09b1247bccc6fa45a6d2755cbe4c) (cherry picked from commit d7226d1858c188475b12b0c4dff5bc794e42be6d) --- sys/vm/vm_domainset.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c index 9fa17da954f7..c25ed0cc2267 100644 --- a/sys/vm/vm_domainset.c +++ b/sys/vm/vm_domainset.c @@ -113,7 +113,6 @@ vm_domainset_iter_interleave(struct vm_domainset_iter *di, int *domain) int d; d = di->di_offset % di->di_domain->ds_cnt; - *di->di_iter = d; *domain = di->di_domain->ds_order[d]; } @@ -260,9 +259,14 @@ vm_domainset_iter_page_init(struct vm_domainset_iter *di, struct vm_object *obj, * are immutable and unsynchronized. Updates can race but pointer * loads are assumed to be atomic. */ - if (obj != NULL && obj->domain.dr_policy != NULL) + if (obj != NULL && obj->domain.dr_policy != NULL) { + /* + * This write lock protects non-atomic increments of the + * iterator index in vm_domainset_iter_rr(). + */ + VM_OBJECT_ASSERT_WLOCKED(obj); dr = &obj->domain; - else + } else dr = &curthread->td_domain; vm_domainset_iter_init(di, dr->dr_policy, &dr->dr_iter, obj, pindex); From nobody Mon Oct 20 18:10:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3Pf2g3Wz6CsbF; Mon, 20 Oct 2025 18:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3Pd1xmDz40pK; Mon, 20 Oct 2025 18:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS9DISTkW2WW7tTvMSncZugxhO7JZjgHbiXROUP4k6I=; b=xfOI97gKI7zXMdUUMiL3Vjmpb94hnlcgWJtrtVh80iav4klmvCeVHBlPRCd9/qWyCv1uxH EEQPSO+c2aMZ1yKJxfUFL5EzXMxg4NsVh+qiPSuO12qLXG6mAOzZOkcF5b2PLYOZflSwuy GwILUN9+772Sginh+kO35onSHMjJAMC23SLvkCeoTDyBDPnZ6MHKKyEI9ww6HaUEEhnikp DjbJ0hC21NBSwrwh8imTA+GreXKewIuTKn23w7ea3iYBeDjQPWysl3IvNi5isjpyr0yHow g+La50vCtRdBat/8eNUktIwWRjLvCTZ6XdedUL3mX/Uuov9kelTj0kOKMkaeow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS9DISTkW2WW7tTvMSncZugxhO7JZjgHbiXROUP4k6I=; b=A7N9wcbpFeMRGFNlx+Nfbshqzz9FaRbZb8S+t39Kz1/zXAvosWD+2Sqw54BWlXYYGJiwTV vIaYriy105Bxse1SteMWW1u4t4VXjs+VKxHuI6lA7R9AvvRvRkuxDIiZLdh3Zo6LqybjVR +oPDzxYHzvH1LwRMcm9C8/nWhjlrnDeX7RtI/Tod4mznxhbA8zoF7koGFooAlvuf1Hv1TN qU5uxpy37jzyW1tVuLmJMJgz/LWPE8X+PV7Hfr560VleutQEHfcox/rDpuTqsTBiwne6Kk AQt83EmwgzyveSlwX75yTCKmss5wTKwpMe8BieRUX0qEa/PxbQrHzZZa3n1yqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760983829; a=rsa-sha256; cv=none; b=hypkw274IjpLBsOvKjmqZVUmzv+tNQQubMlQL4ikgNRPFOU2InI1qCBpDx0H08Kvr2vpp/ wnEN+riQGO7SKYAllFpxpGzQde+ZCf6niMfXpeATJycujTVaZD0awDZB8fl6c/uDr69OTf OTxOY3KGndIkAQ4V/eMpfjr5n7kgwP5mJmp4VyqzNZJyvLBXd8QY24S1qHh6Bp3tJOmpT9 VSE1e/KfRfVGnoZwAEOilbGRWBLaIJoEufNymLXLbzcOA4PP2y4pZ9ROgn/vgQsur4R2GP byXzFZ81jziIHHL4eKFa7ITwsGliPKWl0zLQplpCIOuLtiM34BXd/ynJR+aK+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3Pd1Gjlz85F; Mon, 20 Oct 2025 18:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIASSX061145; Mon, 20 Oct 2025 18:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIASGL061142; Mon, 20 Oct 2025 18:10:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:10:28 GMT Message-Id: <202510201810.59KIASGL061142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: a8e4399fc6a2 - main - Move bbr and rack to use inline per C99 (TCP Sub-system) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8e4399fc6a27b4f8ab828231ede75743ba28a58 Auto-Submitted: auto-generated The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e4399fc6a27b4f8ab828231ede75743ba28a58 commit a8e4399fc6a27b4f8ab828231ede75743ba28a58 Author: Randall Stewart AuthorDate: 2025-10-20 18:09:11 +0000 Commit: Randall Stewart CommitDate: 2025-10-20 18:09:11 +0000 Move bbr and rack to use inline per C99 (TCP Sub-system) This is a small change as suggested by Gleb to move all __inline -> inline aka C99 style. This covers both BBR and Rack and makes no real changes to the code functionality Reviewed by: tuexen Differential Revision: --- sys/netinet/tcp_stacks/bbr.c | 8 ++++---- sys/netinet/tcp_stacks/rack.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 66983edcdd73..10383bc0801e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -477,7 +477,7 @@ bbr_log_rtt_shrinks(struct tcp_bbr *bbr, uint32_t cts, uint32_t applied, uint16_t set); static struct bbr_sendmap * bbr_find_lowest_rsm(struct tcp_bbr *bbr); -static __inline uint32_t +static inline uint32_t bbr_get_rtt(struct tcp_bbr *bbr, int32_t rtt_type); static void bbr_log_to_start(struct tcp_bbr *bbr, uint32_t cts, uint32_t to, int32_t pacing_delay, @@ -1841,7 +1841,7 @@ bbr_counter_destroy(void) } -static __inline void +static inline void bbr_fill_in_logging_data(struct tcp_bbr *bbr, struct tcp_log_bbr *l, uint32_t cts) { memset(l, 0, sizeof(union tcp_log_stackspecific)); @@ -4206,7 +4206,7 @@ bbr_calc_thresh_tlp(struct tcpcb *tp, struct tcp_bbr *bbr, /* * Return one of three RTTs to use (in microseconds). */ -static __inline uint32_t +static inline uint32_t bbr_get_rtt(struct tcp_bbr *bbr, int32_t rtt_type) { uint32_t f_rtt; @@ -4370,7 +4370,7 @@ bbr_timeout_rack(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts) return (0); } -static __inline void +static inline void bbr_clone_rsm(struct tcp_bbr *bbr, struct bbr_sendmap *nrsm, struct bbr_sendmap *rsm, uint32_t start) { int idx; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 0320479e882e..50077abdfd86 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -4730,7 +4730,7 @@ rack_make_timely_judgement(struct tcp_rack *rack, uint32_t rtt, int32_t rtt_diff return (timely_says); } -static __inline int +static inline int rack_in_gp_window(struct tcpcb *tp, struct rack_sendmap *rsm) { if (SEQ_GEQ(rsm->r_start, tp->gput_seq) && @@ -4767,7 +4767,7 @@ rack_in_gp_window(struct tcpcb *tp, struct rack_sendmap *rsm) return (0); } -static __inline void +static inline void rack_mark_in_gp_win(struct tcpcb *tp, struct rack_sendmap *rsm) { @@ -4784,7 +4784,7 @@ rack_mark_in_gp_win(struct tcpcb *tp, struct rack_sendmap *rsm) rsm->r_flags &= ~RACK_IN_GP_WIN; } -static __inline void +static inline void rack_clear_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) { /* A GP measurement is ending, clear all marks on the send map*/ @@ -4802,7 +4802,7 @@ rack_clear_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) } -static __inline void +static inline void rack_tend_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) { struct rack_sendmap *rsm = NULL; @@ -7017,7 +7017,7 @@ rack_setup_offset_for_rsm(struct tcp_rack *rack, struct rack_sendmap *src_rsm, s rsm->orig_t_space = M_TRAILINGROOM(rsm->m); } -static __inline void +static inline void rack_clone_rsm(struct tcp_rack *rack, struct rack_sendmap *nrsm, struct rack_sendmap *rsm, uint32_t start) { From nobody Mon Oct 20 18:22:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3gx2PlQz6CtcP; Mon, 20 Oct 2025 18:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3gx0tlZz42dm; Mon, 20 Oct 2025 18:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760984573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehU1w8kkLG0Ajcf67huzW57snTqx9fS9xtKg77YlNBk=; b=R3k5B8TM0fkdFJ+KZBgFJNyug2Ecr5tn/lQD46j8UB2w/5EN+tNpyds3a2+PyDifkZRWhm GdJ2shC3dDL0ZkPf9ErTnOwBdvSPmvOcyu318HoEiqZnufUcdEhVcqxmzmYf4yCdeLf/AQ q+SRXqIl+BkRYfEyJN7FQucyCwkO8H+6FhrxnCPx7jRrCPkVXn/T2xNnUCzGxzDhkJ1qoU Y4B/26IHqXEK5jsd9bLKy9K+hZ1klB8T7Q+FjiW44X0Ed9+HUb1JaO07lxlGV9dAKfzo9b /eBDt9LFIkJ44GB/SULZgUO6/+17JiGmbZL08e6Vn8JLP0p8Sb6jjX1jt3dpKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760984573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehU1w8kkLG0Ajcf67huzW57snTqx9fS9xtKg77YlNBk=; b=yR2r1H6NjNL+PsLpq6ElkqNNcEr8IaC60vf3TVbJRdtkvzO/Y8xeHfv5nZEFuovbdhEK8+ qL9ZN8RxJ1rpjFcFvL8dQRgRGIwakYAk79ikLTrA5iqU+XGJ8DXbFWybBqO9I/s1UPRawG 6K84ucEUZwJI+akuhv3lDaZsdsp8ni8LxZx/BRJdu64spJAjoVOOr86BvlTMfCzahIC23i hbDCRDHQilFHiuWupGgLPjfBGlJtOXN5OQx1wNgpWQm4dao8tCPCd1kaLyZgh+bunWMv0c Fkl+MBe1ioUAXacIFPZqeI7CPx9UC3B6DyzVSL+nmqj3cRSdg9/WG0uIKQ91Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760984573; a=rsa-sha256; cv=none; b=eVA+LlQdfapVp+GEgI7/sWcm+epYAE3aHA2TvVBMoqnNw+sjKbaFw+x5O5FdwthUK/iOre AKSwjBY0Ea7c9pUZRFEV409jY1BvnAbAAKEBmUqmT4gXz/bIiIi6CbyrcZ2mywfMD9DMQL 1BVRvEmfcLYg+tKkf7W8WDI55mmcmzvhfHQLABkprMlLWtxNq9XkbCzd6t2o2eLSey80c8 kSCGDjkYePzTEu05D6/IJYId5HWG9ip48E0ZZRzWF8f2Qg1jdwBJDN7hcSQ2aae9W1wvTs F4z6jge3ei0kcX2tRhtVYfXcAx0r0kqyd9emQYCmrrbaaHzC7im1x48F4TjJUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3gx0HTsz7XQ; Mon, 20 Oct 2025 18:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIMq1a088222; Mon, 20 Oct 2025 18:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIMqGS088219; Mon, 20 Oct 2025 18:22:52 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:22:52 GMT Message-Id: <202510201822.59KIMqGS088219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 47ea2e9edf78 - stable/15 - regex/exhaust_test: Skip flaky 'regcomp_too_big' testcase on all archs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 47ea2e9edf787044eff1bda533cb74758631250b Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=47ea2e9edf787044eff1bda533cb74758631250b commit 47ea2e9edf787044eff1bda533cb74758631250b Author: Siva Mahadevan AuthorDate: 2025-10-03 13:56:32 +0000 Commit: Ed Maste CommitDate: 2025-10-20 18:22:37 +0000 regex/exhaust_test: Skip flaky 'regcomp_too_big' testcase on all archs PR: 259971 Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation (cherry picked from commit 1ddff51060ad759e35dcc4716b0bdcdb40255862) --- contrib/netbsd-tests/lib/libc/regex/t_exhaust.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c b/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c index dd2e55635653..25bd23c5a025 100644 --- a/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c +++ b/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c @@ -186,10 +186,8 @@ ATF_TC_BODY(regcomp_too_big, tc) int e; struct rlimit limit; -#if defined(__i386__) if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_skip("https://bugs.freebsd.org/237450"); -#endif + atf_tc_skip("https://bugs.freebsd.org/259971"); limit.rlim_cur = limit.rlim_max = 256 * 1024 * 1024; ATF_REQUIRE(setrlimit(RLIMIT_VMEM, &limit) != -1); From nobody Mon Oct 20 18:22:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3gy2M1Qz6Ctfd; Mon, 20 Oct 2025 18:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3gy1rkKz42dn; Mon, 20 Oct 2025 18:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760984574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdKcPa0rRi4uAfdGFW/548jTadskijIlQ5Z7jzBLhwg=; b=dKpA7i2mXQtuB/UvRuQegF1Mk4cvcAnVlqth2KnygnTkV0lX59HX+xxmLpvzmSxbhd5YqG j0LdPpfUmMtIZRqgzwVZ1EYniYrIfn7kgAH5J9MV4paa/yAx+lX1EqlRoWkfPZNdNxxSSS KnC5/6JaQvZgzlnGl62mKWvCJiILO0lAyookXJtPuRxZVj7RqkmUfgSlHhFdJrjmk/Bv7v 0Z2hlyjk0G/CQ87Q3fmvDLFhTo2TwmtqN5ohB5w5LQCq+fxgJr+tFVCAV+LzEKt/8vOTlh bPeXS2vtQUhV6Z2hZbX1Q84cLMWpAkDaAvr0O+UzRUuaqbEmcrwnpgrVvBeZ7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760984574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdKcPa0rRi4uAfdGFW/548jTadskijIlQ5Z7jzBLhwg=; b=bzq44zRatA4OL6T0ddl+ZFhJt0Dg4zqV5NknOfeWfPAuHVT681UJovTGmgCGzyhxvy6mhY 2JXtHkuULEV1lBOOtjblrF9ioZj7yWtbLyyD8VapWrWVIeVjRfhYf9xWeC7AVqWwZGqN6N Wxql2m8ofQLR4Jxzu+xOIoZxYqobKVdJiEQXXr3zTQ4YobocOfh3EdwadC/JKEAy8wiOMN zw+/C0hkyPp1ysbkm7/iBQHh0tA7mA3Mk4ETqHJ1PHrrGN+eb0rQDrsZHaxuYYB/9buSr6 hsMLl10LHsvUOBAn5Gm5qEqd4QhqJWKE+dzgI1hdLx7F3RWZwnOmIhNuVCUz2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760984574; a=rsa-sha256; cv=none; b=ud/QDZWCz6NoNiEIKLY6Hj/lCnw99xj/viEVYx7ZP5yM2tvY2wOG5QA0NcmwpIhbEoY3ob iP/ryMNm78aALi8D4sIjyvIcC3TY5sbCtibmYEfTSWuAQa9hTE372jm0Xtd7CqR3cZRt/u nPR67OnmwSJdWQwYRHQ31B0uvaEmGXL875mHnLbfdTK7d3HQymegNnVG6vIccfAJ1WYg9o 8SwVElx9FGUGOvQXB/CYTVcjuqynF8U4sEKsPW4yn/hwh+Mz6AOqTs/8B9jaKx9NYI5qRT TGkVRNVpRZ5DiEPlHEQxTau1n0Rrap/49dsxn10zmRsWCKE7fqzIwnqzTbtSeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3gy16f8z8L9; Mon, 20 Oct 2025 18:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIMsUa088263; Mon, 20 Oct 2025 18:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIMseM088260; Mon, 20 Oct 2025 18:22:54 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:22:54 GMT Message-Id: <202510201822.59KIMseM088260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: da457e5c856d - stable/15 - regex/exhaust_test: Update require.memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: da457e5c856d26d41e9a30a08d0087937d28a41f Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=da457e5c856d26d41e9a30a08d0087937d28a41f commit da457e5c856d26d41e9a30a08d0087937d28a41f Author: Ed Maste AuthorDate: 2025-10-17 14:43:25 +0000 Commit: Ed Maste CommitDate: 2025-10-20 18:22:37 +0000 regex/exhaust_test: Update require.memory PR: 259971 Obtained from: NetBSD 7753bf0b705a Sponsored by: The FreeBSD Foundation (cherry picked from commit 08345e62a28eb971f65125f45c512a12b39ee2eb) --- contrib/netbsd-tests/lib/libc/regex/t_exhaust.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c b/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c index 25bd23c5a025..2f3d1025536b 100644 --- a/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c +++ b/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_exhaust.c,v 1.9 2019/03/16 21:57:15 christos Exp $ */ +/* $NetBSD: t_exhaust.c,v 1.10 2019/07/09 13:59:25 gson Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__RCSID("$NetBSD: t_exhaust.c,v 1.9 2019/03/16 21:57:15 christos Exp $"); +__RCSID("$NetBSD: t_exhaust.c,v 1.10 2019/07/09 13:59:25 gson Exp $"); #include #include @@ -177,7 +177,7 @@ ATF_TC_HEAD(regcomp_too_big, tc) " crash, but return a proper error code"); // libtre needs it. atf_tc_set_md_var(tc, "timeout", "600"); - atf_tc_set_md_var(tc, "require.memory", "64M"); + atf_tc_set_md_var(tc, "require.memory", "256M"); } ATF_TC_BODY(regcomp_too_big, tc) From nobody Mon Oct 20 18:32:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3th4VwTz6Ctyt; Mon, 20 Oct 2025 18:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3th3splz43dt; Mon, 20 Oct 2025 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iT7ccAFVTpUebj4ovDV5xQ0ZKEcTEFyEeOMAAetYvEA=; b=QtiYz0LqJPQiZHAtEx04u3+D5qMid7XppyY/NKRn8cKH6EUZ5WdzXGR7+m/Er8wBybdSYN D1HSel/Lv9L5gJVixNtyVKTjfjYjaZljgsqrgDfJOqhH800Y5ZJMn2ccfG9aczicxeC/Za +Pvy1R8bEVcXuh/LbjkKb/ypqWmHyZIWVzKM8M5AsyIeuqWMu8esNFfamwQ/A85dqlyG6C JM3eY9Om+/q/nIuFqBJ+Bog9RrRgzJxcZwVt8D+X1m1PwBZqrisuQ2hsT46K/RpDIj1Unz qx3Zkc2vfLfDcbfaiE5S4apUauLvtPanMlZ9ZgaFncLICSgsFfDnk5VkN39kjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iT7ccAFVTpUebj4ovDV5xQ0ZKEcTEFyEeOMAAetYvEA=; b=a6I0lF7w2QSs2sPzxpV2TA5lT606rRYEjjcXyyXjEOEs/bGe534BDUUKGzpls43clZhcLa AwLHKIHF7XEVRFdk492LplLE+ZHshYESeEMpRNEvpTOwKoYIz6DAPjrIwhRsqk+Yu6eCUa nQt7bc608yhSth7HCscWTwe4JFQKdNF0B5O2DaCnkWvQMfltd0V1kpyrpHq//bXVR1Kvtr DDa/eux+bsG9Wl2f3x8QSNs1T2PWD5C32KRFUIOkIYp4rFZeS3jvh7dHSILujOT7jkQVP1 JVsojVuiEQZQZxl9eU8AiAGr7zynd+K5qUiY8akMLf8pJn8z3+cXd8A3bZSgZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985132; a=rsa-sha256; cv=none; b=VKHHHJGcviIRhb5F0ZjsOXVoxT8svqa6kSFYPmbN8jJ42HmpSaBzGHWKb1mg3YnuuJh11s 9AsOMhf7WZ/ZMc7JKNpEA+Hgsp0ci3IX3/eB5SyxKXWDO6FPfR65T1QJ3tSh6/hQrfTCnw j8+tDIRSVq77dumuTLHpsJAJ3bxjkjMtO74AOorfvJa6OzkZjje+7V9c4vOH49UsxxNOsu PmVsj66g4QL1E7tsZn4PvjZ6kFiG+BT4AGYt9zuV9UHoduW0BraUs8po8RZdlMLCddhydD XqBbmz0eV4pz+tRcJlGLnzPrdx6S5Wz99KiAn7O8lS/nwkVJbuCE1GjP4akjAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3th3Qwsz7Xq; Mon, 20 Oct 2025 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIWCaL006627; Mon, 20 Oct 2025 18:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIWCG0006624; Mon, 20 Oct 2025 18:32:12 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:32:12 GMT Message-Id: <202510201832.59KIWCG0006624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e1aeb58cbbc3 - main - inet_net_test: Use int to hold expected return values from inet_net_pton List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1aeb58cbbc3839db93ec38ce491b7b9383d5649 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e1aeb58cbbc3839db93ec38ce491b7b9383d5649 commit e1aeb58cbbc3839db93ec38ce491b7b9383d5649 Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: John Baldwin CommitDate: 2025-10-20 18:31:41 +0000 inet_net_test: Use int to hold expected return values from inet_net_pton GCC warns about the sign mismatch in comparisons: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet4::body() const': lib/libc/tests/net/inet_net_test.cc:86:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare] 86 | ATF_REQUIRE_EQ(bits, addr.bits); | ^~~~~~~~~~~~~~ lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet6::body() const': lib/libc/tests/net/inet_net_test.cc:205:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare] 205 | ATF_REQUIRE_EQ(bits, addr.bits); | ^~~~~~~~~~~~~~ Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") --- lib/libc/tests/net/inet_net_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/inet_net_test.cc index 4ecf5a3de492..c4411373165e 100644 --- a/lib/libc/tests/net/inet_net_test.cc +++ b/lib/libc/tests/net/inet_net_test.cc @@ -50,7 +50,7 @@ ATF_TEST_CASE_BODY(inet_net_inet4) struct test_addr { std::string input; - unsigned bits; + int bits; std::string output; }; @@ -134,7 +134,7 @@ ATF_TEST_CASE_BODY(inet_net_inet6) struct test_addr { std::string input; - unsigned bits; + int bits; std::string output; }; From nobody Mon Oct 20 18:32:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3tk0D58z6Ctwm; Mon, 20 Oct 2025 18:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3tj58PVz43qk; Mon, 20 Oct 2025 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHUHKZxplxy5U5G8AMonBVKLFdUNdP9ndirIA2Lf1Ys=; b=Og4tMEf72ZSY8B191jPnLDhCSciMGKWf4Mb3W0XMjeWA/cpHz90BPL3MplxBrTEHMxmuAp YzLk8aQkOn7BCXcpUqWJImn/502/BmXt/mcNwwytiUdSaldIiol+nqI5b4w/jZykjWJc0r o3CZgmEYGyjByy9zkBK0JP/x5tTCTaog29jQO1fF0THrGumptEipVNYxltKUuS848RyxZ+ UxGkf/iEl+C9lgwbBi592ITpF6xXzU57m28Xdxj11IM6ZU7S9tL0b1Dauw1Ji0mdlmzVlZ G6T1xHQa+NgdHY8OJdYFKIx/HEZl6M2mYVia4D9ytFq/kqoR5gY75cnMmleD7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHUHKZxplxy5U5G8AMonBVKLFdUNdP9ndirIA2Lf1Ys=; b=HJ6/KrNBtvynXzm0XUoz8IXve1ReXyj4oo0wP3SORrEf8tCmVx2QogmbHAfPEnH28vON4v SDDOR1wWeGcn9Ut4cOjlh3ky884/r29N3xNhRgd/NkJMy2qx3GLrr8ALZhxdqg15BAe5Ta noBJHyeM4fQ2iMFmeioNmZ7P03vHsLnKAxboingEhiO/xrdkcF2/Flt7EQcM68j38UyASo EKqjYHdSsD22C4BfD/WCQL3slKZuf+Do9bU8rUw/4pTj9GjOZetDqgKcdkZWuGVoSrBdUf Z2qgGVp4Ml6LLyZ6i3zd/oe/R0Bk0TDzdQwhtfNnNreQz579RrT6UCYS04mEXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985133; a=rsa-sha256; cv=none; b=jw4VZWkk7n/Zi3e34IxHuXcvMl956VYVs3mHW+jbOnNhKgeXEUv0WNlrOvyuAyX/jJBEl/ N84ZF7Wg5km8hTX/fLEErRaqR83TwLmHaoyvsxC5qNg6n4PlSvpipnQ3vaFkGKrYGNlUBY nxoX9g+nwKO6rPfwrva3eHuOElpciFoWH8mc2zHIaWcIok1KJxPVcsP//p3N6wud9PeRLl KhAuYd8HxnPN6rn9tMkMd4itzxuWyDxDyxGNHRSkoG6M/zSdjxDLxgDx8x/K8cpo5vuqqf pKDwR0YQMO//w3NSi3FHi48mldOtL4qx5h7yThrp13cqyDxcfekfuoaoO+jaZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3tj4Mvnz8xH; Mon, 20 Oct 2025 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIWDZk006659; Mon, 20 Oct 2025 18:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIWD3H006656; Mon, 20 Oct 2025 18:32:13 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:32:13 GMT Message-Id: <202510201832.59KIWD3H006656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: aa358ce3ca8e - main - inet_net_test: Compare pointers against nullptr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 commit aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: John Baldwin CommitDate: 2025-10-20 18:31:41 +0000 inet_net_test: Compare pointers against nullptr GCC does not like passing NULL (__null) to std::ostringstream::operator<< inside of ATF_REQUIRE_EQ: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_ntop_invalid::body() const': lib/libc/tests/net/inet_net_test.cc:306:9: error: passing NULL to non-pointer argument 1 of 'std::__1::basic_ostream<_CharT, _Traits>& std::__1::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT = char; _Traits = std::__1::char_traits]' [-Werror=conversion-null] 306 | ATF_REQUIRE_EQ(ret, NULL); | ^~~~~~~~~~~~~~ In file included from /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/sstream:317, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++/macros.hpp:29, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++.hpp:29, from lib/libc/tests/net/inet_net_test.cc:33: /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:338:81: note: declared here 338 | basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long __n) { | ~~~~~^~~ ... Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") --- lib/libc/tests/net/inet_net_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/inet_net_test.cc index c4411373165e..60b60b152eca 100644 --- a/lib/libc/tests/net/inet_net_test.cc +++ b/lib/libc/tests/net/inet_net_test.cc @@ -303,25 +303,25 @@ ATF_TEST_CASE_BODY(inet_net_ntop_invalid) std::ranges::fill(strbuf, 'Z'); auto ret = inet_net_ntop(AF_INET6, &addr6, 128, strbuf.data(), 1); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ATF_REQUIRE_EQ(strbuf[1], 'Z'); std::ranges::fill(strbuf, 'Z'); ret = inet_net_ntop(AF_INET, &addr4, 32, strbuf.data(), 1); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ATF_REQUIRE_EQ(strbuf[1], 'Z'); /* Check that invalid prefix lengths return an error */ ret = inet_net_ntop(AF_INET6, &addr6, 129, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET6, &addr6, -1, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET, &addr4, 33, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET, &addr4, -1, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); } ATF_INIT_TEST_CASES(tcs) From nobody Mon Oct 20 18:34:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3xB0ZRnz6Ctwy; Mon, 20 Oct 2025 18:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3x96wGLz44hT; Mon, 20 Oct 2025 18:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh25teKZPTxBCudyx7fG6hdRSiPX57hx1f5gIC8dW1k=; b=v2+UWiXbSE6hZoKQQteTRu4jU4wwGYVGzWGKVKvDU8BeeP+urqnR8nGDm33a5mVrww9Qi4 8hUUV+zyN9d7fmFVhekHTiNkXDPPasBoHQg77FaOic/EW/4s1L3tG2ZRku2GBBAWhYcc8k Kq0xUkIxv8Mo0mKIMedPz2wuEn/nY1GQaSDcVr4uJDyaC5bdVejz9nEW7HMzzb7a2DTEzF 8Kd5FfGHmvgvwz60+A8+X5zjowX5kqaD2WOOZ6Agwk09nDcLfzzu1KiM+6Ndma3vh/U3S9 ZADb2fHlPh9Z+sKGiQCbF1LjMOh5Wf0rn81YBU/isoGe6Huy83uqtCHrsz5tRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh25teKZPTxBCudyx7fG6hdRSiPX57hx1f5gIC8dW1k=; b=UMxZeofbRkQXfkSi8VtqapfND86jEpS/bv573qlo8WVyG6MX/H0lmNlcNIJURT+6z5A9kF 6bqJa3bnpZkfKlOF1YRmWFEhAxiHZvrBHz3wwmko2Y9i5HBJ2xh5++iD79wY2XT87EwHXn 5VEGGd5j0pC+o+5FCJN8gorjyhC+xux+jGd8PJyy8IMXIpGXDHl97NEDaNb/VtOcJGPYGz Lldqogf7QCePJJpPy5k1YoPufjLxqIvk4vJKbVJLQVxCM70y8YSsPY8rxBQ9PsGBJ1n9qr cGbc2K2CE9XKmw7clmBNC5VB0F4bnijZuAcPi/8yCXRXU5oIVC3GsgN8t9/AGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985262; a=rsa-sha256; cv=none; b=hp6ac5aZ6/F3kPWTxPPBLWf5pOEQB2Fhdzj+2C6PGcZqqfgGmhOWY/r+IoA79gQM/p5OG6 akfHOSB77E2YIdNWoYQgGavKEoRoX6UBCc1eDGKjuhoXWAs4Q6xeEfvFkq6xx07ioDIVFk rVl+WBHxyDo5WrNVM6r/WJcK+9tQbR8yXJUBXdC02LuXHdLmI49lcBLESqD2jzGEjaC4U2 jZFtBgZgGLm0gguvC7L2ul6G6aKKq0emrrKqahXCPacYKtwKhsCul3viQ5HPROjghblwv1 onONO9xmMPPTQ+iGenqFpcMCdbyT/WVIM0CCZYTXhzTy6gc9OM2lnQ2sOMFkYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3x96WkDz8Wc; Mon, 20 Oct 2025 18:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIYLd2007465; Mon, 20 Oct 2025 18:34:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIYLF2007462; Mon, 20 Oct 2025 18:34:21 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:34:21 GMT Message-Id: <202510201834.59KIYLF2007462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3bd015a1a918 - stable/15 - pci: add quirk to disable Function-Level Reset (FLR) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3bd015a1a918d060dbef556ddfa6e236f5212330 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd015a1a918d060dbef556ddfa6e236f5212330 commit 3bd015a1a918d060dbef556ddfa6e236f5212330 Author: Bjoern A. Zeeb AuthorDate: 2025-09-25 12:49:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-20 18:33:08 +0000 pci: add quirk to disable Function-Level Reset (FLR) MediaTek mt76 WiFi cards are advertising FLR support but after issuing a FLR the chipset is gone. Add a quirk so we can disable FLR. The current reset code will automatically fall back to a power reset. This makes the card show up under bhyve where before it would just not be discovered at all. That should make wifibox work for it and will help development for a LinuxKPI based mt76 driver as found in framework laptops as no dedicated machine and constant reboots are needed anymore. We will likely need to add more PCI vendor/device IDs once we can test the other device IDs. After a lot of help from: jhb Really implemented by: jhb (I just typed and tested) GH issue: github.com/pgj/freebsd-wifibox/issues/73 Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D52728 (cherry picked from commit 4c0e53aced2251eb5ac7eca44e13a6b947be8582) --- sys/dev/pci/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 9e43a4c1909f..cde98cb62cef 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -240,6 +240,7 @@ struct pci_quirk { #define PCI_QUIRK_DISABLE_MSIX 5 /* MSI-X doesn't work */ #define PCI_QUIRK_MSI_INTX_BUG 6 /* PCIM_CMD_INTxDIS disables MSI */ #define PCI_QUIRK_REALLOC_BAR 7 /* Can't allocate memory at the default address */ +#define PCI_QUIRK_DISABLE_FLR 8 /* Function-Level Reset (FLR) not working. */ int arg1; int arg2; }; @@ -319,6 +320,13 @@ static const struct pci_quirk pci_quirks[] = { * expected place. */ { 0x98741002, PCI_QUIRK_REALLOC_BAR, 0, 0 }, + + /* + * With some MediaTek mt76 WiFi FLR does not work despite advertised. + */ + { 0x061614c3, PCI_QUIRK_DISABLE_FLR, 0, 0 }, /* mt76 7922 */ + + /* end of table */ { 0 } }; @@ -6740,6 +6748,8 @@ pcie_flr(device_t dev, u_int max_delay, bool force) if (!(pci_read_config(dev, cap + PCIER_DEVICE_CAP, 4) & PCIEM_CAP_FLR)) return (false); + if (pci_has_quirk(pci_get_devid(dev), PCI_QUIRK_DISABLE_FLR)) + return (false); /* * Disable busmastering to prevent generation of new From nobody Mon Oct 20 18:34:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3xC2ZCKz6Cv7Z; Mon, 20 Oct 2025 18:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3xC0sNBz44hV; Mon, 20 Oct 2025 18:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CjODkynp29ttJ2rWNkWp7l4u0XjmIjIk/VAHQB5tSsg=; b=L6zHZM+NUYRtkGlAqa+HQt174cj12FQOS5Q5mstvze41p67FUqLwW5ELajonqn+OHbvtD8 j9HokmFT5xeOiLWFmYTKe/jPlKX+QuNwaRo28wyCm42Kuf2ZV9KrramzYisGg+iwxkh0MZ MabKvmrbLUic4/l03IUHqaH9UFYgDKfw7TM4JD6ws6MP4HeUBA3c8nKprMgVj0PD5xbvzk mjY8Js0AlEqDbXPpD98H1qmr4vKBDKgzLd36ntrWWH5G+/7PtcmA2gGuSIa5LrbAOpetST KElM+U6JETHJ/8C6kJZKNTh77yhRJUHsBGSlv9hdH+cKrHSW1KylYy92pPo+BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CjODkynp29ttJ2rWNkWp7l4u0XjmIjIk/VAHQB5tSsg=; b=triaVSHWKIHbYFUhnsGdf+rHSYoMo1iG7DK/nysItzgMGP/2l1mUJ0OD6bBVmhXRdoZFox ely3qAvfiXVivqtm4u3Lcc4IalfOkMNHIcV/EkTtaq2LOfEdebZR1D0fMbVlrsetNwb1ft QDydHXwyr/fvw+0qB1scGGlC2de+KmDUv5FGQ7YpGj2WY7hb1ppOH/AvKdJIVT7wHzQZv6 AFuIaiOrC89GJQvwqWA6UMSGLbnLRvjnCNp2R0bYOWO6DEvZHhMMpmnM5CVYcU0sgNo4LM SQ0//eBrFRvSdGGMezYkELiPB4F2GEIHHquPy5bHAYVCaCrxsG5rDdd1bEQrOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985263; a=rsa-sha256; cv=none; b=cTw5Y42nJy+LvSokX9W7v8Z8BVgBUc78XESMrXXfSm26DJU3peDsSnclbxnOyApcfXUTt7 md+P+T7OXICEm96eNzl4r0Rs5moXBMpSEVIlehe1m1TLEpnNdPDliNJ6tjO69OGnwkH7Vl KIWx9L5uBU2MjngUnUhTF3J2SY0h2xtJw3LSZT2L0yPYN7M1FtTtzJYlskCGsOhKdsWBJ6 qnX7ojKdPumDzymi+RdbjNWWzuPtA06I1E8audLAu8ukOA11WXzQ7dUooZ2PMFk1GDFG7s BN+D1CnQ7xQzW6s7CEPO35z0qnIOwSqHf1i0WWNG1v5YutV8F/0S73a7ci86ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3xC0MP8z8lv; Mon, 20 Oct 2025 18:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIYMBQ007501; Mon, 20 Oct 2025 18:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIYMHp007498; Mon, 20 Oct 2025 18:34:22 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:34:22 GMT Message-Id: <202510201834.59KIYMHp007498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e0487486279b - stable/15 - fwget: pci: mediatek: correct package name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e0487486279bc0690f65401622deebdbdea6a882 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e0487486279bc0690f65401622deebdbdea6a882 commit e0487486279bc0690f65401622deebdbdea6a882 Author: Bjoern A. Zeeb AuthorDate: 2025-10-13 13:15:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-20 18:33:08 +0000 fwget: pci: mediatek: correct package name The port is called wifi-firmware-mt76-kmod not "mediatek" in the moddle. Reported by: Lars Tunkrans (drsnx60 gmail.com) Reviewed by: emaste, jrm, imp Differential Revision: https://reviews.freebsd.org/D53067 (cherry picked from commit 10d88a7aa670a3cc2bf763e64bd292b4caa3a811) --- usr.sbin/fwget/pci/pci_network_mediatek | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/usr.sbin/fwget/pci/pci_network_mediatek b/usr.sbin/fwget/pci/pci_network_mediatek index 653c87c410eb..e1e15dcfa2e5 100644 --- a/usr.sbin/fwget/pci/pci_network_mediatek +++ b/usr.sbin/fwget/pci/pci_network_mediatek @@ -38,24 +38,24 @@ pci_network_mediatek_mt76() # { sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh } ### >>> - 0x0608) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x0616) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x0717) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7611) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; - 0x7615) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; - 0x7663) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; - 0x7906) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x790a) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x7915) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x7916) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x7920) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7922) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7925) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7961) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7990) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; - 0x7991) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; - 0x7992) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; - 0x799a) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; + 0x0608) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x0616) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x0717) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7611) addpkg "wifi-firmware-mt76-kmod-mt7615"; return 1 ;; + 0x7615) addpkg "wifi-firmware-mt76-kmod-mt7615"; return 1 ;; + 0x7663) addpkg "wifi-firmware-mt76-kmod-mt7615"; return 1 ;; + 0x7906) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x790a) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x7915) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x7916) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x7920) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7922) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7925) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7961) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7990) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; + 0x7991) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; + 0x7992) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; + 0x799a) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; ### <<< esac From nobody Mon Oct 20 18:34:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3xD4nP8z6CvRq; Mon, 20 Oct 2025 18:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3xD1pZlz44cg; Mon, 20 Oct 2025 18:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0ArPV6cBUAoF2SufrQhfYysuOBduxHayXSG9ohmCgs=; b=tkaPH+Ws4C2Y2H9AARUK2l4r1UIyuho3WikWYoVgp/6LB/MqYSrDGy81W5wnm3+EsxYsZp S6+9iGcNvK73Z5Wv8Pjh78DwHQ2AK2aWImqGVjACULg3KH45NDlwqdopQ8i1+5626pHZ5w 7MP+jIEbgfKAb7pF1sGuV533+7RJ2dTQb4+LHiJt9VRDafJzr3TfPLEA5HZo4UVrOhjNw6 YheIuOQIW0y9uYoHdEoolc6/pGxFZ9BkhiboEqMyUjM8RfaBl8dywvl03i/2dGPPb9s58D uSok/UKr4dFx0f5dQHffc5eX4IgSD8WTCdw4Vvn8sqICQlvdyIUJm/6cQcNKEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0ArPV6cBUAoF2SufrQhfYysuOBduxHayXSG9ohmCgs=; b=nahkI9cshTqsm03E2akoEnhwBiGh/8cKoNLd1pVFpP6y7p65wViq5aFwgCVG5YcbY4SUG/ C9WyyG/HSkBVOTzCMRRSvcOFfoZCkRkOeKqUruxSw6MNFJmRwiLnlL7u1X1p8eGj+fYtas z4G/M081KGuip8bF2WXQb75lC15PYUFLjR6YGgJfNjIhtVdCMHqhFyoNLIONuc/wBCqKFc 9wniuqV6ZyhsVlqGiFI3B+L6+V3xDzQN+582h5UMbliHkrb3QIoRvLIKCYj9XdDp6UWH+s lK5P7gW3KJcqdpTgwpG2Dt/yYHvfK6BKaUYobRB5xIxAorQSYK+3Z88hWnLt/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985264; a=rsa-sha256; cv=none; b=p5spZKc2eatnJZ4QHsMTsATDbl8euW0ppXmZvCjmCYHzhHYHroWMkuESW6RFCgcYSIm/XA yb7JT+fbwtzeiNu3DxCASwU0TX1i36eVMP+LtJahkwNv7UvBpiYQzJjFWiKEDn0cjAD34r sy7sIK0oOPf3rirxshTz3//1n0gV8ieL+duV4I5Oyn/PyjRH6K16/RBM1u9yXn71o6nuJA YhV+3raInTuNflrHQoOq68FdBBN60U7VjsGXRBtoOFrWZnCiHEKFw6/wtQdydFr+UhIEr+ MX90nQtFPZM4d+18H0CYjDjgh7KYYAAyhcjGGl/B5wprxrYG8oflA9pVyZCp6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3xD1J0qz90l; Mon, 20 Oct 2025 18:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIYOc3007537; Mon, 20 Oct 2025 18:34:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIYOok007534; Mon, 20 Oct 2025 18:34:24 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:34:24 GMT Message-Id: <202510201834.59KIYOok007534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 10c71151ade7 - stable/15 - dc(4): fix argument to if_foreach_llmaddr() for 21143. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10c71151ade7b5f021b49b7e117059730a2ddb56 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=10c71151ade7b5f021b49b7e117059730a2ddb56 commit 10c71151ade7b5f021b49b7e117059730a2ddb56 Author: Chris Johns AuthorDate: 2025-10-17 12:38:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-20 18:33:08 +0000 dc(4): fix argument to if_foreach_llmaddr() for 21143. As found on RTEMS the argument to if_foreach_llmaddr() was wrong causing crashes. Fixes: 51e80820552e0 PR: 290314 (cherry picked from commit 33afdf0e356d84ffe5c62c886f84cf12ba147d3e) --- sys/dev/dc/if_dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index bed74c3b6181..5c1d7ff30976 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -999,7 +999,7 @@ dc_setfilt_21143(struct dc_softc *sc) else DC_CLRBIT(sc, DC_NETCFG, DC_NETCFG_RX_ALLMULTI); - if_foreach_llmaddr(ifp, dc_hash_maddr_21143, sp); + if_foreach_llmaddr(ifp, dc_hash_maddr_21143, sc); if (if_getflags(ifp) & IFF_BROADCAST) { h = dc_mchash_le(sc, if_getbroadcastaddr(ifp)); From nobody Mon Oct 20 18:34:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3xF5sGmz6Cv0Q; Mon, 20 Oct 2025 18:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3xF2ytDz44d9; Mon, 20 Oct 2025 18:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EUOJz0fyj/miS6JjL2dmC22WNJ9tg8xMhlSHIz5ifEg=; b=sR1h6G1eytcnTri7i6grecCuBQBhTRkOOj47XS+DKoy2cF0b1axh9KpP/cEPNQWO1A9mjd 7LQpO34uIx6U8thsb4l7q3/yonXu4BnLGTqLsN1EW8kJf3gfZATZg9sP2lqE0IL4MTEomz 7PpsqJVvEq+N6hX85ZIqntTG4ys/EnOU8y8YFBqerWVE6xQQRKDzN02hQkYnK+8DGgtH0T AOwjo2MlYROPHzw6+WcA3oShMwxizOe54D9jjOLkdKmnbw+QD7O3pKc7hHssVVLqaFWE9b pJWHmErdoXSduf23J4KmxUnN+XAZxiLr2jD/KjMxqfwAAIF4CkV0C57tqLfb9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EUOJz0fyj/miS6JjL2dmC22WNJ9tg8xMhlSHIz5ifEg=; b=JNfpL5vtQaOr1pDZciIK2vV6/cSkomJoTqWAdk3TVeaQaMgbtVEiyTwP4XGf2NKwUt5UwF lSUq46WRIEkI/HfYS25aKuwRpL0Zz0HnGiS+POpejxZXOdlFVIFb8bzcnJeMbAbuvApXRd NNf+qMrJcv3UbxqQX3PSikg8xVDyBNcmdaLcMP4pOa234hJEgKpBPJvZIAxJtWbqM9zf4b Ae/xU7bJx6OBIh6JuQ1XQZD8wD1cLN2k9N8r+3XyKF4vMql6/YfX2ikeVAVmCRAVJ+Fxz4 Lg4dCBWntDbp1zZo6ylV70Jgi827s84kjCn6J/9L1B2TMyFtrfiQ61JfoYw6Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985265; a=rsa-sha256; cv=none; b=Y6iWvD24T22QmAERMW3YynZd5NNBR9ke92U0Yu/mGt9pH4+2C/WJrQi26ay0pSEc/z2rSd eJlZqSvXzXaok3IFL5xQGstI3jkHaTAaoJvV54rMKpGPQdl6AjEpjiOg/O7yRmTS0ufuhA QLit5jbP82daK5ks4pRqbmsSAOPn2ZjodTpUO0yuzGQd6bJ8wCP2Zq04R0TXyMtRvlX+py rdO9vcLcn4PHHUmPBbPXt0VKX8a/ptAQUhVpg/mqWBlJPbnSObHHORNn7BZnztjDM5OzGZ jTEJZAAPUNgQVi6MyUvX7mZAPiaYl+hmWnpAeGBwnLU/Pp9XmCbzC0nvB8WQbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3xF2G3Yz8xM; Mon, 20 Oct 2025 18:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIYPB7007573; Mon, 20 Oct 2025 18:34:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIYPnb007570; Mon, 20 Oct 2025 18:34:25 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:34:25 GMT Message-Id: <202510201834.59KIYPnb007570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2c345e94ae00 - stable/15 - igc(4): also build module on aarch64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2c345e94ae0048ecec577ab52bc81510365038d0 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2c345e94ae0048ecec577ab52bc81510365038d0 commit 2c345e94ae0048ecec577ab52bc81510365038d0 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 12:56:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-20 18:33:09 +0000 igc(4): also build module on aarch64 igc(4) seems to work fine on arm64 for as much as I could test with a 2.5Gbit/s interface on a mPCIe card. Enable the module build so it is available. (cherry picked from commit 51fbeadac4ccce6aafe51be9377d4114321295e5) --- sys/modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5315d518afd8..2acf991f1b77 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -576,6 +576,7 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve +_igc= igc _iwlwifi= iwlwifi _rtw88= rtw88 _rtw89= rtw89 @@ -743,7 +744,6 @@ _et= et _ftgpio= ftgpio _ftwd= ftwd _exca= exca -_igc= igc _io= io _itwd= itwd _ix= ix From nobody Mon Oct 20 18:34:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3xH1hRKz6CvPN; Mon, 20 Oct 2025 18:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3xG3pwDz44ql; Mon, 20 Oct 2025 18:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9P+Hy1FAU/g7E6qdkhaESY7yIZ2AR+92Mn3OUP1sRJc=; b=g7bgQ6rqqUZV3pLXeBkFihiOEmwOvYCo1U944pts3IQC3sU4aJB6llYW7JL4VpvhZtBTFX TqWf0g6SOUgCBTKmyLVZ5147XAIrim3nYbcfLkTMqTwxxc6IN28LoVZ4+ADVh6U6Qs4Z4m UvHZilhLcdN05bKw+bFW+/MDTRfUxGqQSzodhtV566hWoAs6IVqaNJAFkCnMaTcxSgOmUN IrxjTljjWRuaMRxx39NYX0kpi//BHAGylTSQKk4GknbWXcI0hPehDWYmIsGB44gGS23YCy bJoAEGDxX+QL2eePeeB9atE/3UTfO+FRy8zHIui9hRhwh4mn57cQ3xEkJbEJBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9P+Hy1FAU/g7E6qdkhaESY7yIZ2AR+92Mn3OUP1sRJc=; b=PV8y0hytWRNj99+Uh3AgED0nvC399ljBmMOpm4XFd+1XBeuW2IP2yJVgOkMDHrQ6/PNMKI ItzFZf/luTqWQgC9F9Z17AzjOzNAKQ3yALTVCbqJXjCJEGAq+JEPC0xrXxQiYiSCRWGL99 xw6i+ljHv4EggV9lzZIAXdVHJDu4WnRO799hu6mJsQKNoxk8/Wf39VO/dMIAW6MLPgu02f Phnb2udKpv7GNnEk0T0SpmP/3Cw9KZfFFtEn+kkJfOWj0tFBKEFPqe/pMwq9sPscQMIzz/ VIYEsJIVjWFJwvrNeYxwzqPDwKhmCX+Ks6SSAexFmOJ66xVQCSBGmxETR311Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985266; a=rsa-sha256; cv=none; b=S/be9REUCwnYx7pZRPsiiAA8Ut1XSHcUjHH72WdRGax77zPnkWfu3ZS+DamP6INIm+MEhB CXXoQWJ4Qoc03O008qzQ9JTMdyqRWdF5fFYbJvPYZwMEDN3iZSQ9/1ztJPvoNz3wpFt/6v +iQkoO5Q9HpcgLHcVAvv00lr62kyvVy8VzXg0X/4em202neMwZX4XAY4fLdY2R3LFuxRPc tO4C4mmndBWIfuFgiTnyPwMV2CF79CJ6+gjQs6qqGaMJFaY2pFmqfO60rUM5uuyECVyk0+ whAuR12Jq4I+0P4djaUT4oLNp9TZM52bOXNivP+UOUW6/V6FhmkLX8aqziXxow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3xG2vjsz8xN; Mon, 20 Oct 2025 18:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIYQsF007615; Mon, 20 Oct 2025 18:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIYQt6007612; Mon, 20 Oct 2025 18:34:26 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:34:26 GMT Message-Id: <202510201834.59KIYQt6007612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bd62c8d63eae - stable/15 - bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd62c8d63eae78225264d8f4c2190f09cb9e1611 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd62c8d63eae78225264d8f4c2190f09cb9e1611 commit bd62c8d63eae78225264d8f4c2190f09cb9e1611 Author: Bjoern A. Zeeb AuthorDate: 2025-09-01 18:27:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-20 18:33:09 +0000 bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table Remove the single 8822CU entry in all three places. It seems the only entry referencing a USB device. The same device is listed with the 8822CE devices. Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D52324 (cherry picked from commit 0ee6e36ea9b2dd959b0fb9f04ab98a01f93729fc) --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c | 3 --- usr.sbin/bluetooth/rtlbtfw/main.c | 3 --- usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf | 10 ---------- 3 files changed, 16 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c index 0181a67ac604..f35712cc8f69 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c @@ -81,9 +81,6 @@ const STRUCT_USB_HOST_ID ubt_rtl_devs[] = { USB_VPI(0x0bda, 0xb00c, 0) }, { USB_VPI(0x0bda, 0xc822, 0) }, - /* Realtek 8822CU Bluetooth devices */ - { USB_VPI(0x13d3, 0x3549, 0) }, - /* Realtek 8851BE Bluetooth devices */ { USB_VPI(0x13d3, 0x3600, 0) }, diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index e87a98036265..280045a6aa25 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -64,9 +64,6 @@ static struct rtlbt_devid rtlbt_list[] = { { .vendor_id = 0x0bda, .product_id = 0xb00c }, { .vendor_id = 0x0bda, .product_id = 0xc822 }, - /* Realtek 8822CU Bluetooth devices */ - { .vendor_id = 0x13d3, .product_id = 0x3549 }, - /* Realtek 8851BE Bluetooth devices */ { .vendor_id = 0x13d3, .product_id = 0x3600 }, diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf index 61ae53db8f39..2ef56d2af93a 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf @@ -36,16 +36,6 @@ notify 100 { action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware"; }; -# Realtek 8822CU Bluetooth devices -notify 100 { - match "system" "USB"; - match "subsystem" "DEVICE"; - match "type" "ATTACH"; - match "vendor" "0x13d3"; - match "product" "0x3549"; - action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware"; -}; - # Realtek 8851BE Bluetooth devices notify 100 { match "system" "USB"; From nobody Mon Oct 20 18:36:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3zF6sTtz6CvWT; Mon, 20 Oct 2025 18:36:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3zF6J5Mz45qh; Mon, 20 Oct 2025 18:36:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985369; 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: in-reply-to:in-reply-to:references:references; bh=haNunGXZzSflF9+yDPMpefczDjq/Mo2GKBQk6PNJ/zY=; b=kcQeUjRQDHiwHkvDyJoSCxY9CHb1VSABzokZsihN0OfkkG898QupPAH0jAkICW2b5sMqYk +6RAKg0figowWzE/QRs33HHqaD7nmCGNOGV1AUxubrDCxZW5lk+Nf43hb6a726hYTQoD34 r5Z/gnudUsduftNFXIcHnf7IAOIsHpEXXaJnMCo/iexyNyGAn4sqeCdF2MSeWT55FhAar4 0NnhjA5V3eM1NppQK9Dqpi7/lg2XhwNXsS0SqrxDP9Tpsi7H75pQ3trstgqVwo8yfTJw4v OOfOGsxoepkQPnObfiT+gQzNxx5RTD9iN9PI4hKp6vE/tjVxYgm0autld1Isxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985369; 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: in-reply-to:in-reply-to:references:references; bh=haNunGXZzSflF9+yDPMpefczDjq/Mo2GKBQk6PNJ/zY=; b=KbUaS/NoaJ6NcNnBQ24OZLXJKzR64xWtfiJxE07yYa97Z7ogVm4U8C67mLvUL5Hb/LfeFp Fc6yYSLjUbcMW+OM7AhMLxVYFn0mgLCsZSJnoJyFjbIxoPBR+wEL3WYkPEpW4TR44zHuFT rNyRbzje8VhRaWKJHW2z5A8uyB1LGEYFW1RjAAh1Akwowhl5c8BlUezYha9HfDNpxtPZNN RUQJg1SE23mRxh2E0XzIy+rLiNo3Wkdy3B702wUcOz2cfzAfkiSsp/mLONrNIf11rEByZ1 5FeMRA2AmfxxbdSCkkQY/94zCLr1iYYMKi95Q4bVebwqIlUt1EmXwIRB9CCQCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985369; a=rsa-sha256; cv=none; b=VxWab6N8V6TCYpRPy1fL7OcjAdonx84fgU6vgoBW060yADcR8ieewmDK0SL2MJQi7r+ctf 4AZx6rKfBy/eTtm/Ip7r1nZWLVqSyYVxZx6utaM8Tfclxe7JBoXcukN3OnTFQeNfWsP/bi Jgd4/t6kPZphSNWS1cXTK1PSm9AdqbLyaN5rlwwUw2zzbjcsC2L8HipkGRUgUD6RXjxHAc lm0C0H9qMwcugIEXXz9UIIFAj5UoShrfDNdDrP1PpWIQ+Or1lofC8Urx5grC5rYc0fTAl3 pZ3YeqcaSMgreL5b5cRGxQHey/FZpyKJf9cMF3awaKNZZc8KKmPebsmpTbAMHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c] (unknown [IPv6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cr3zF46nbz1BlP; Mon, 20 Oct 2025 18:36:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7af6661d-bcb1-440a-9497-92e2d0c214f8@FreeBSD.org> Date: Mon, 20 Oct 2025 14:36:08 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 195b00ec45e5 - main - quot: Clean up Content-Language: en-US To: Ryan Libby , =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171155.59HBtMCp004658@gitrepo.freebsd.org> <86h5vt4ja9.fsf@ltc.des.dev> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/20/25 13:15, Ryan Libby wrote: > On Mon, Oct 20, 2025 at 9:42 AM Dag-Erling Smørgrav wrote: >> >> Ryan Libby writes: >>> Dag-Erling Smørgrav writes: >>>> In function 'usrrehash', >>>> inlined from 'user' at /workspace/src/usr.sbin/quot/quot.c:244:3: >>>> /workspace/src/usr.sbin/quot/quot.c:210:22: error: argument 1 range [18446744071562067968, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=] >>>> 210 | if ((users = calloc(nusers, sizeof(*users))) == NULL) >>>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>>> In file included from /workspace/src/usr.sbin/quot/quot.c:51: >>>> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h: In function 'user': >>>> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h:92:10: >>>> note: in a call to allocation function 'calloc' declared here >>>> 92 | void *calloc(size_t, size_t) __malloc_like __result_use_check >>>> | ^~~~~~ >>> >>> Probably it is from >>> -WARNS?= 2 >>> >>> I think gcc is saying that it thinks nusers may be negative. >> >> It's saying nusers may be large enough that the result of multiplying it >> by sizeof(*users) exceeds an arbitrary threshold, which is technically >> true but completely unhelpful. This gcc option should not be used. >> >> DES >> -- >> Dag-Erling Smørgrav - des@FreeBSD.org > > The message is poor but the limit is not so arbitrary, it is > PTRDIFF_MAX. It's saying that (size_t)nusers may be huge, because it > infers that nusers, being signed, may be negative -- though in reality > it will not be negative. It says the range that will result in huge > values, (size_t)INT_MIN through (size_t)-1. > > Sure, you could disable the warning, kern.mk does that and one other > user make file does too. Or you could convince gcc with a type > constraint, or somehow else. In any case, we should fix the gcc build. Also, the GCC option is not intentionally used, it is just enabled by -Wall. I think disabling it the way we do for krb5 is ok. The only debate I guess is if we should just disable it in userland globally instead of only for quot(8). -- John Baldwin From nobody Mon Oct 20 19:17:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr4vX2LZvz6CyHZ; Mon, 20 Oct 2025 19:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr4vW5c00z487J; Mon, 20 Oct 2025 19:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760987879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpCa7JHbkgx1HyBsiqEp8xlzjz5o0s3Y3pvf+XqU5R4=; b=FTlp3//RO94E6pEGhwuCR3KNdXZNaSs7jatFYTojf9hw7vF0HH379cGO28rzEIPUoOsRud eHGjp4Nv4PC3JddBbyxqbyL4f+2R1JS1QHdFjITfeLMlmqFvXD+xUpqya8aDN2BQkdgj2y cIfVQ62Lu60elpaokt/SIA1ywz2ZSkpvO+cRjzH5Mursv4ZG0jzGVn1dSzA92c28pz+VZp qz8YaapMgPubGG96ReamM6LPNnA6/N/94WqFcn4xXOL9iFyUuNqGG7g1c3i1iGPpoZR01L o8hHhdJWtwOsvRO48lZcGbP6rIxNPzKRpHKPykdX92Lk4EHFWEUCLWQ822bZxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760987879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpCa7JHbkgx1HyBsiqEp8xlzjz5o0s3Y3pvf+XqU5R4=; b=Fmb7PMRi8mkwCxFE2442s8B4g9wbmUe9yf9VKqm4nnbyyn6Lez+R9ZS/StzjFRVt1T7hgq ewylZRxkD4UJ31zyFA1Sth73qfIVl4a1CWCEsTkgxnSjC26w6UO+Gu89Gm4bDe5EWN2fLI WxA4wsjoJ+mJmJA6ugpEqbaMJCPTU9Uj7PmJ9YqWzmsQypogA29N0RUt4w+k1FMbSHcGXl ig8pLwuegw4kJSFPB/fSfpRcmuOTfOr5SqX+LGRIGqqkmWO8SJWSFoH7s+Z2+xQhNfs2xn KwCaaS0/c79ZFULj9OCS9kXXCuiPpok98npUm+vkfNj4KK3Sn/SFO5FAS+7ROw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760987879; a=rsa-sha256; cv=none; b=ELDObQwRT/DFbOqyUIiNVIZxVT0dD4lUY5/UoCui0iQeL5SaFhEctojQG9yZUhqfeQEa+9 TB34+DeCbffyjd1O754I1E/v0TI5ie1lTf+VQMveUIwP5R5s+YZVX5X0OfFfEzMICSPU2d YVkHH8K5CnnbY8+usdEf1r1dpZcsfk6AAnjsonoT1kI1ImejLbMuTnkw3dXkBHfwNRbwI8 VwB8SwUezSqianvHcsmnmHpC5WZ0fcuiEkKw+hbmQaYsy/iolGOxyQzFPx0Jh25omEWApF qojF6SvokwCbprB0FqiyglZBmSS4q5bI7tpUyt6Wg19BgX3/upPYDYDgcaflqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr4vW4r1Sz9nd; Mon, 20 Oct 2025 19:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KJHxCq084204; Mon, 20 Oct 2025 19:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KJHxup084201; Mon, 20 Oct 2025 19:17:59 GMT (envelope-from git) Date: Mon, 20 Oct 2025 19:17:59 GMT Message-Id: <202510201917.59KJHxup084201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: b596b4496568 - main - zfs: zfs_getpages: Don't zero freshly allocated pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b596b4496568c21e1e8f9c21be913cfc5b71bd9b Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b596b4496568c21e1e8f9c21be913cfc5b71bd9b commit b596b4496568c21e1e8f9c21be913cfc5b71bd9b Author: Jean-Sébastien Pédron AuthorDate: 2025-10-16 08:16:18 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-10-20 19:16:43 +0000 zfs: zfs_getpages: Don't zero freshly allocated pages Initially, `zfs_getpages()` is provided with an array of busy pages by the vnode pager. It then tries to acquire the range lock, but if there is a concurrent `zfs_write()` running and fails to acquire that range lock, it "unbusies" the pages to avoid a deadlock with `zfs_write()`. After that, it grabs the pages again and retries to acquire the range lock, and so on. Once it got the range lock, it filters out valid pages, then copy DMU data to the remaining invalid pages. The problem is that freshly allocated zero'd pages it grabbed itself are marked as valid. Therefore they are skipped by the second part of the function and DMU data is never copied to these pages. This causes mapped pages to contain zeros instead of the expected file content. This was discovered while working on RabbitMQ on FreeBSD. I could reproduce the problem easily with the following commands: git clone https://github.com/rabbitmq/rabbitmq-server.git cd rabbitmq-server/deps/rabbit gmake distclean-ct RABBITMQ_METADATA_STORE=mnesia \ ct-amqp_client t=cluster_size_3:leader_transfer_stream_send The testsuite fails because there is a sendfile(2) that can happen concurrently to a write(2) on the same file. This leads to sendfile(2) or read(2) (after the sendfile) sending/returning data with zeros, which causes a function to crash. The patch consists of not setting the `VM_ALLOC_ZERO` flag when `zfs_getpages()` grabs pages again. Then, the last page is zero'd if it is invalid, in case it would be partially filled with the end of the file content. Other pages are either valid (and will be skipped) or they will be entirely overwritten by the file content. This patch was submitted to OpenZFS as openzfs/zfs#17851 which was approved. Reviewed by: avg, mav Obtained from: OpenZFS OpenZFS commit: 8a3533a366e6df2ea770ad7d80b7b68a94a81023 MFC after: 3 days Differential revision: https://reviews.freebsd.org/D53219 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index e5344497f1be..f34a2fd37a77 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -4223,8 +4223,20 @@ zfs_getpages(struct vnode *vp, vm_page_t *ma, int count, int *rbehind, zfs_vmobject_wlock(object); (void) vm_page_grab_pages(object, OFF_TO_IDX(start), - VM_ALLOC_NORMAL | VM_ALLOC_WAITOK | VM_ALLOC_ZERO, + VM_ALLOC_NORMAL | VM_ALLOC_WAITOK, ma, count); + if (!vm_page_all_valid(ma[count - 1])) { + /* + * Later in this function, we copy DMU data to + * invalid pages only. The last page may not be + * entirely filled though, if the file does not + * end on a page boundary. Therefore, we zero + * that last page here to make sure it does not + * contain garbage after the end of file. + */ + ASSERT(vm_page_none_valid(ma[count - 1])); + vm_page_zero_invalid(ma[count - 1], FALSE); + } zfs_vmobject_wunlock(object); } if (blksz == zp->z_blksz) From nobody Mon Oct 20 21:00:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr79x5JMgz6D7WV; Mon, 20 Oct 2025 21:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr79x4mjxz3TYl; Mon, 20 Oct 2025 21:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwQlQDQaCvgckeeWVhz2FRfJUC6iG+3uYlMtLqwQlFs=; b=EEJbo5ddN6gUXwKt/UOSag+KQWTZLE77AZjviBR+so20Y7ALiZmiln8sWt4yeLTfSyex4k oWzqz6YBHQYymv6TtfMME4WMY8EFln8urucZuiNJuUJhJt5S+NDR6sKWrOD84UWgSSF7qp oJjRBZ5fKdgFw7JuCMCtINFFl4sURUa4QaMY8l+wQ5y44yULNYYfRahymS7Fq/Dt7+CYGu YK5/IZeFp0pmqMjXBtabDNjlGJ1gSEN76/zHk++bgFK1jpAWfIzDuXSMGN4WfmOURWq+7G XXuOx/e26cO6xFvQvthwwafAozUAg2zQ39nkpBJSTg4hnVEw8wtlFJW+oUVEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwQlQDQaCvgckeeWVhz2FRfJUC6iG+3uYlMtLqwQlFs=; b=qalFeNp2d0ZcsIcPFzeq1l2UmGOHV5Vu20tfiIEegubrCirxOnZr8S6UBgPrHU1Jrma4+M 8CAUiTB3rWriJn+roasoHMOzliq+Iqa3DvDPb6HsjJCYmeGHBobpUilQ8ezTFzyPA9YDy/ KK3f7LST8HwZ4PW5c/HufwhoIif4JOQ+VdoWvbklQKMkcgQnyZ7WME/Sosb8w+LFYtyCBE Ur7HTvFWPtCG6Gt1aPxfhk9o4R1WxXHJcK6htsJ4bVBnE2xSRYeMZ4cvX8t5HnBqpQ7f9J cKt4BE45oMeuX+Rv8pKX6Vtdg+B8hOAQ5KohYwLYqKG7pd01uLr2qXxLO9doMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994037; a=rsa-sha256; cv=none; b=Ag+4TxP9G/M69spQVzX2YPxh9An0eFLZli9HDYODIICY5cl8/u3suEfD7rgxICA4wBrtWX f0lixV/gV/pmTYPb/dVSPh1ZK1JFfYqTNQ0pY3KKu7R5wHvNmMja/DH2Nl5DqGqle238BY 48x5GBd8SHkcu5roORADJQQ60g/DN9EScOldfnb31VHL1TW1+bXLnRsJrvH4A6mIFR3/iZ RrBGbFqiGKRugKSj9vU2uhwopRK/sSAAdKxgixZ56kq0UVJ/UF8BQkIvkKk1Owm1eUoiuP S9Vx5eRmo78rsKwslBBYxsivjDYHGXo/dR3oH1ik6ZWtgl9Bap09uYizeeU7tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr79x3xJMzDTs; Mon, 20 Oct 2025 21:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KL0bSx082806; Mon, 20 Oct 2025 21:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KL0bET082803; Mon, 20 Oct 2025 21:00:37 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:00:37 GMT Message-Id: <202510202100.59KL0bET082803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2b5c62494df9 - main - release: Add pkg .conf to METALOG on dvd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2b5c62494df95cdb844b5f6f852412f2178f66dd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5c62494df95cdb844b5f6f852412f2178f66dd commit 2b5c62494df95cdb844b5f6f852412f2178f66dd Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-20 21:00:26 +0000 release: Add pkg .conf to METALOG on dvd We're correctly recording all of the packages in the dvd METALOG file, but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then users won't be able to install them very easily. Reviewed by: markj Reported by: Lars Tunkrans MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53199 --- release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile b/release/Makefile index 13532097d56c..a777ded3c429 100644 --- a/release/Makefile +++ b/release/Makefile @@ -430,6 +430,8 @@ pkg-stage: dvd mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/ + echo "./packages/repos type=dir uname=root gname=wheel mode=0755" >> dvd/METALOG + echo "./packages/repos/FreeBSD_install_cdrom.conf type=file uname=root gname=wheel mode=0644" >> dvd/METALOG .endif touch ${.TARGET} From nobody Mon Oct 20 21:08:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7Lk2vLWz6D7xm; Mon, 20 Oct 2025 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7Lk2JSSz3VCN; Mon, 20 Oct 2025 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRfO8uaBTuyyoitHe/CxsFvi4cPoD3YG2Z08Ye/rsOY=; b=xnnaO18qjeURMx6jV6JlLv7w43I5T0pTio+bfQKFbtQzyEMIp6x7j83zwdbuU84GmCpcCM Y1SHv407TPYySktRxt1IPXx+uChYia42/LSmF/LMJegJ/45lQQqJs4XLk1UcMUGA7poCRe 4Sna7/h+5PNT21XeNptnwy3PwFXlDbo7aUVEFM3NCTWrD2istN+GUcncwzcItn2w+dDAhd OHL6KmKobZ9nYyZVtWz0OWZac08Yue9Jjb7veiN/gnvVt8jlF+HhhDtHOwfHg7n0L1KlP1 q/YccYX6gEuKsHVmJIDPsPsx0Al3YMDEt2uFNVnNwjVQQqvk8ERdu1lnN1uk0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRfO8uaBTuyyoitHe/CxsFvi4cPoD3YG2Z08Ye/rsOY=; b=I6A6yF5Oh6qJAym9UlfyITEz+5+4GOCiPaUGAzbe/XWEKvzyOS6VncbnxMEMM3xsAHiWiZ fwYw2HTHc19di2stlvMV3kI7qGhn4lXBWD0aKDRj76TqM+wLYC2bK6UwsHZOX41/6FWUg6 5A2jhZop0WvpcSDLAjhoUrZQEqViEsi+BCZdbULFlMkm6e3AaaWLskkrjNBDnvLjls2FwP pEYBZIQ8Gw+sCiuLVvM9ulYTgj7hLmxCsZawwMd1J1X3SsN6izvz2Olhb0Fo8LVbZZyyMX Jwuih3Oxz5oqEkn9o83NGZq2N10hUOX8f4DzhdVy0BohUJT3QGUNmdB6sW+XRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994494; a=rsa-sha256; cv=none; b=mcYI7HHT7K3ZpB5uTOPODsM2L57m7Nsyws7CW7D5e5fF5yPDNkSLH7FkSoN4WTlhG7hbhh yIwgqAZoQ9ojHQa9vKIPD11OmWGs7eyMyV4G8CyQOKPDwyL4P7zDtOKDEIdIYVH/Kppk5I 4/2qClh64mtfGhndDCex2gF9ryLCDj/JjI8f1bNUrmRHfZtTS4aOzOc3sY2GK7xmgDcPio yAhULQJTz1ar8Q+mdkGA4EeNjajZpJI63bte5NWz/D8T9EoKk7whLF/b4s83gLyLRkC95k jtCq5iGKAMAxN45eR6JAZgV+9HifCtKSwhZELhwcHzt0CclzmkBer7DKL1EAkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7Lk1pQzzTVv; Mon, 20 Oct 2025 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KL8Ena092060; Mon, 20 Oct 2025 21:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KL8EmS092056; Mon, 20 Oct 2025 21:08:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:08:14 GMT Message-Id: <202510202108.59KL8EmS092056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 35170408a7b8 - main - AMD IOMMU: fix per-device IOMMU bypass when IR is enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35170408a7b86a879d7e2ffb5ddb70fe75951d89 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=35170408a7b86a879d7e2ffb5ddb70fe75951d89 commit 35170408a7b86a879d7e2ffb5ddb70fe75951d89 Author: Jason A. Harmening AuthorDate: 2025-10-20 01:53:08 +0000 Commit: Jason A. Harmening CommitDate: 2025-10-20 21:06:47 +0000 AMD IOMMU: fix per-device IOMMU bypass when IR is enabled When interrupt remapping (IR) is enabled, the device table entry (DTE) for a given device will likely be initialized by amdiommu_ir_find() during MSI configuration. This function directly calls amdiommu_get_ctx_for_dev() with id_mapped=false, which means that any attempt to disable DMA remapping for the device (e.g. by setting hw.busdma.pciD.B.S.F='bounce' in the loader tunables) will effectively be ignored as the paging mode field in the DTE will not be set to 0 as required for identity mapping. This will ultimately produce an unusable device, because busdma will later observe the bounce configuration through iommu_instantiate_ctx() and will employ the non-translated 'bounce' busdma methods for the device, while the DTE remains configured to enable translation. Fix this by tweaking iommu_instantiate_ctx() to always return the relevant per-device context object even if translation is disabled, and adopt it in amdiommu_ir_find() instead of directly calling amdiommu_get_ctx_for_dev(). Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53209 --- sys/dev/iommu/busdma_iommu.c | 7 +++++-- sys/x86/iommu/amd_intrmap.c | 9 ++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 668ccf056463..82f73d469585 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -295,7 +295,6 @@ iommu_instantiate_ctx(struct iommu_unit *unit, device_t dev, bool rmrr) } else { iommu_free_ctx_locked(unit, ctx); } - ctx = NULL; } return (ctx); } @@ -303,6 +302,7 @@ iommu_instantiate_ctx(struct iommu_unit *unit, device_t dev, bool rmrr) struct iommu_ctx * iommu_get_dev_ctx(device_t dev) { + struct iommu_ctx *ctx; struct iommu_unit *unit; unit = iommu_find(dev, bootverbose); @@ -313,7 +313,10 @@ iommu_get_dev_ctx(device_t dev) return (NULL); iommu_unit_pre_instantiate_ctx(unit); - return (iommu_instantiate_ctx(unit, dev, false)); + ctx = iommu_instantiate_ctx(unit, dev, false); + if (ctx != NULL && (ctx->flags & IOMMU_CTX_DISABLED) != 0) + ctx = NULL; + return (ctx); } bus_dma_tag_t diff --git a/sys/x86/iommu/amd_intrmap.c b/sys/x86/iommu/amd_intrmap.c index f8900fe0561f..cce4f57ca323 100644 --- a/sys/x86/iommu/amd_intrmap.c +++ b/sys/x86/iommu/amd_intrmap.c @@ -223,9 +223,9 @@ static struct amdiommu_ctx * amdiommu_ir_find(device_t src, uint16_t *ridp, bool *is_iommu) { devclass_t src_class; - device_t requester; struct amdiommu_unit *unit; struct amdiommu_ctx *ctx; + struct iommu_ctx *ioctx; uint32_t edte; uint16_t rid; uint8_t dte; @@ -255,10 +255,9 @@ amdiommu_ir_find(device_t src, uint16_t *ridp, bool *is_iommu) error = amdiommu_find_unit(src, &unit, &rid, &dte, &edte, bootverbose); if (error == 0) { - error = iommu_get_requester(src, &requester, &rid); - MPASS(error == 0); - ctx = amdiommu_get_ctx_for_dev(unit, src, - rid, 0, false /* XXXKIB */, false, dte, edte); + ioctx = iommu_instantiate_ctx(AMD2IOMMU(unit), src, false); + if (ioctx != NULL) + ctx = IOCTX2CTX(ioctx); } } if (ridp != NULL) From nobody Mon Oct 20 21:10:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7PY0llWz6D81B; Mon, 20 Oct 2025 21:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7PX75Dzz3Vhd; Mon, 20 Oct 2025 21:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTxd3qYvwvkQfb30JO1S1rG//Hk5cnZRCZrX93b+MhM=; b=j9bi4jhd3IlZux/HyJxh+Y1/CtXCXpzGShXWl/PncoG4NrETiOgb93jflhDDFN/mjY87I4 OfrXPuYFcdeiCf5f22L/PsLAzx4P1RG5t2OOwsQxgg1qvyLy9UwX5ZIQLnLA/Q0kJlbN9A L73Ab+dsb5QR/6RJ8GEgD6YH8HBXX32mqAD01MRQ4efTEoSH0Uu9qPlB5Y6JaS6bw3Pq86 l+5t9cBPYvTvDVyVruLB3/uL0E0RndT2frLItlkbIC5xqO/3amhOnMtN8yT7aMpTnqcXrx n7DF7hGsizdlmVfYWiEYM/8oxQsZrDCUOfFPGdi9mA8xsQH+TZmZcHo6J+zWqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTxd3qYvwvkQfb30JO1S1rG//Hk5cnZRCZrX93b+MhM=; b=W5V560syuRx2jz65kYjp97KjhhD3h0r7dySvYlFJTgEzQ41bbGGV2h9LLU7ZUdArDbfeIn MjUNLznfUAa9slpbhQN/nWUNj8GCv1EEKyuglWf/JFNF+88WlbyDDcYd1vEYRwwhvKlCfS eNMastR+ayHf+fOtA0c3OrCfFZ3+BvFy9SjR9PPf8nDgg2XjrSixSeFtWjsaNteZM+S4k/ A4xZirSsZ6meuRHBWIineeKI2MMwbkUy9AeXVk9ge8OJBp8kLI0/L3lJxJMJVyyPsyEZLv POs19D3+D7NivuvBQrnmPam0JQO/458Pom4livd2LRue2B05nUqea4fDhjtQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994641; a=rsa-sha256; cv=none; b=hWxiFaB/y1cqTD/2s29M/98NwVCkyymrfppu9aRjvaF4g5L5wfkIPbAXlrKZ6uREHKR78h kpeoeYZRituc7/K9YjwqMp6A6GESyhjZL4gxYiuxmLTucqus3FPR2DGM6jFrCtcHBKRWtB CMC4XVlvmcqpW6pd5HX2Tse+ccMnfJC5hy28VurvBIN1FjLpzaYiXMWTxAa/27gDcuS7Ad 9f/aiQrODp/obx3/hVFhz0q0pz/PtHzjpepxlU2Hby0Rmx0YICodUx0g8jAYcvu+ZTW1af i/buoKJunu7pzaYCT+L9c6qJDzQvh6/CJga4QVPFA98xH74JrdZh4UAGXJPT7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7PX6MXszTkR; Mon, 20 Oct 2025 21:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KLAecU001661; Mon, 20 Oct 2025 21:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLAeFZ001658; Mon, 20 Oct 2025 21:10:40 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:10:40 GMT Message-Id: <202510202110.59KLAeFZ001658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 5f6f2c3fa25b - main - UDP: let udp_pcblist() support UDP and UDP-Lite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5f6f2c3fa25b3f37936b564b433251c33b27a8b3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5f6f2c3fa25b3f37936b564b433251c33b27a8b3 commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3 Author: Michael Tuexen AuthorDate: 2025-10-20 21:07:38 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:10:34 +0000 UDP: let udp_pcblist() support UDP and UDP-Lite Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use this to determine the inpcbinfo. This allows the same function to be used in an upcoming commit to provide the list of pcbs for UDP-Lite just by providing IPPROTO_UDPLITE in the arg2 parameter. Reviewed by: rrs MFC after: 3 days Pull Request: https://reviews.freebsd.org/D53218 --- sys/netinet/udp_usrreq.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cea8a916679b..0a89d91dfc37 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,7 +787,8 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, + struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); + struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -799,7 +800,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = V_udbinfo.ipi_count; + n = pcbinfo->ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -810,8 +811,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = V_udbinfo.ipi_count; - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_count = pcbinfo->ipi_count; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -838,9 +839,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = V_udbinfo.ipi_count; + xig.xig_count = pcbinfo->ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -848,7 +849,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); From nobody Mon Oct 20 21:19:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7c940DJz6D8kb; Mon, 20 Oct 2025 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7c93Mtwz3Wgd; Mon, 20 Oct 2025 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wAk2MD0Z7IfmviNiItbBFPfeRn3CzEHKzeE++knDv74=; b=EiOmgrODXxrYRtzCAwUM6UkwLX2e1moTolI1bYFOeQAMdic3nN0xh94Mp/x9WAvqL5YclS 0RlifA6f6ud4XJL2kjgdird3X8bK6+rbsDG+Jz/kRm/c/xEXFmX5psucsj7G0NOXTaKRHf jcTn29VaSDtnC8MICA5CS5F2a74vEphZWMh1Fab7c68+uxt3qLgrKsBxXHw27Ja+qRnkqY Bal1ttC+ZvV/Kk1d56uFU+6DFHYemD7AAjPiI5lHy22zQE83oKyOL1Yk6UlzNhktO3uQcO e/odLH8vi0J2+t4gFUwcqtfVxkVzsLGPzDS2pAMFOhARVI63B0TShaAOQwro4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wAk2MD0Z7IfmviNiItbBFPfeRn3CzEHKzeE++knDv74=; b=EBMBSAW30Me5Xm2ASqP9AhiU7+nsMEPB5G3d83etxe49yiyQ9GjYhzI+fySuVzxgUpz8Hp Dtti0CqfU3dSmthCuoFQixqT7n0J2CmEI1fskswTsUNa7tZyNidr9NI/WVe8+sT12wbOXq YFb5Nb7tWmKDBnCEg3cEhuH+l42WxW74ygmiRdTQZYW6oLR6tlcnukgEWGwu+nKeGZy3VX 3y6VkhHD+CosgnkyrRqj0/IDiwSrRk0K1bQRxDDgXnPAiECbLAvfmQkxkAJGFyDFuyq9jm +Z1+zHQdk9DxuLqP8Vmc6q867znM+MqS7F4v8t7D+xBKizjHwFb8H93aKH8zbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760995193; a=rsa-sha256; cv=none; b=dU7YZkudAQ7TSswvjsKdCzwGqIpuUwcRlM/8cHIzEGKrgq91hq8O7rpqT1tLYIn7KT5u51 logwDXNwl5YB1Mi4bP6Gk7KNW16/FJDhSIgU1YDoysmAsa+C2k6L6BxmeELyuy3zsBGn5A 8D7Vg6wI5kmS/TMQiqKPl7x/VdyGZRtSUWp6947uDv+9HOcddKtA6jkNDK3sUQd08nJ5JL 0FpAYM8ufIk92bxwxVIqSc8VDV7Jom4oUGNSMynIrVO5blIhDNcJmDPvV8OX5juGp0+7m9 bTHMP8seiCBZU5Ra7xEo/danHazkQxme+LQboWAFS5XRhSQH3ryXYr7XJz2IAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7c92hJPzTsq; Mon, 20 Oct 2025 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KLJrir012274; Mon, 20 Oct 2025 21:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLJr7w012271; Mon, 20 Oct 2025 21:19:53 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:19:53 GMT Message-Id: <202510202119.59KLJr7w012271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 7294d2601f3a - main - Revert "UDP: let udp_pcblist() support UDP and UDP-Lite" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7294d2601f3a605dac3e86e232b43f29a0f5298d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7294d2601f3a605dac3e86e232b43f29a0f5298d commit 7294d2601f3a605dac3e86e232b43f29a0f5298d Author: Michael Tuexen AuthorDate: 2025-10-20 21:19:29 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:19:29 +0000 Revert "UDP: let udp_pcblist() support UDP and UDP-Lite" This reverts commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3. Missing link to review. --- sys/netinet/udp_usrreq.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0a89d91dfc37..cea8a916679b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,8 +787,7 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); - struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, + struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -800,7 +799,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = pcbinfo->ipi_count; + n = V_udbinfo.ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -811,8 +810,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = pcbinfo->ipi_count; - xig.xig_gen = pcbinfo->ipi_gencnt; + xig.xig_count = V_udbinfo.ipi_count; + xig.xig_gen = V_udbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -839,9 +838,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = pcbinfo->ipi_gencnt; + xig.xig_gen = V_udbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = pcbinfo->ipi_count; + xig.xig_count = V_udbinfo.ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -849,7 +848,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); From nobody Mon Oct 20 21:23:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7hL5WH6z6D9LZ; Mon, 20 Oct 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7hL4yGbz3Xcg; Mon, 20 Oct 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMrFTEtIOXYgJraDr1iP561YjReHQixgdWyUDL0Itpc=; b=oCQvoGgNdqOJ31UXqQp32hodWJTZuWUiASVbx4eEhq2hwUNIGd1o9zND+F9cvZ5d1A/2Nf 25oC0HkiHEDaaDl3IRgkJirABV8PiAX32v5up8aTMbCkohyDflSpKRIc167BlhHwJzL1AR P7VyiHzyBgA4TUFJlvnB9db2X2apy6VhqOeGVv6WGy20tqbNjXlHElKBSXm4DkXfwjRWa2 aFmPsJtndVthglQBW2Cg1LxK3K3J4REK8/fB2S5CCFTenv9PLBlJYiV9mQLW5jJsdYMFWv ntuvwIaMnonJWSVIAyR7jj2s88Xb++GlWLeSCWc40jF7mt+kUU0TGvGJhgH3bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMrFTEtIOXYgJraDr1iP561YjReHQixgdWyUDL0Itpc=; b=uoBBDPXmETBpXeJ7udoUIq/D/E6jRBT/eUh31Zyin5rdCXaKYN5x2UlzXnEFsV1kHaRVrm ad21S+Nax3AqMMnLT+metANj/Q8f63A7/ge9gOppO/Llr+qkslS3/JrtSXKzPJl8fdOSX1 6Zm1zZidm0HQGOs6JFBX0iR+e3kUg+jrKOielntyW4U+2Wo434suEkCuRnQhYcKfxJJawd Xy8Ese3yQjGhrXgOE89z+U0T56RM8XYwaIe5OkXkEecw1VAVyrYtbzW65mTuHgx4b4o0+o 5/8dKJLoZYkLGWeGXYSvJJelVJ0T3jq6kWlB52oPFEwN2RJ0/Ouqni7f19Oosw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760995410; a=rsa-sha256; cv=none; b=EhQdhWUCBaMsxuTyVjF7RiAoCBnM217PtBZg1FPjPqiK+3hpQsCM4GbMfsNE5ZvrPbe4lk pnKtM8deZxmaF3qhK2lyHyf1SL7jSMz/cS0ibYL+SS/b6ns8IKNTmUEZLL2tkecseiipmu FUaOMCNhxOMtncqSHKmXN430rmKyaaONxG0DqzBn1mE+anSjc/E2MRNGTc+XtsAIaSODRI YyxqjR+i7sFiJRRRJf20LSF/0sb3JWJlJlH8Y5zzSahHFtCSvP1g6YEpqL0TDrbrhx2nZv lCYj2rlYyk1lByCz6jcZZ505y8Qo/G469cOFEkbd31ohZuC25dhJoGOJKBdWpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7hL42DSzVXP; Mon, 20 Oct 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KLNUFt028620; Mon, 20 Oct 2025 21:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLNUrG028617; Mon, 20 Oct 2025 21:23:30 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:23:30 GMT Message-Id: <202510202123.59KLNUrG028617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: be3c59ff5082 - main - UDP: let udp_pcblist() support UDP and UDP-Lite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: be3c59ff508204dbab9e3616dc82ed7620f05d0c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=be3c59ff508204dbab9e3616dc82ed7620f05d0c commit be3c59ff508204dbab9e3616dc82ed7620f05d0c Author: Michael Tuexen AuthorDate: 2025-10-20 21:21:47 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:21:47 +0000 UDP: let udp_pcblist() support UDP and UDP-Lite Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use this to determine the inpcbinfo. This allows the same function to be used in an upcoming commit to provide the list of pcbs for UDP-Lite just by providing IPPROTO_UDPLITE in the arg2 parameter. Reviewed by: rrs MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53218 --- sys/netinet/udp_usrreq.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cea8a916679b..0a89d91dfc37 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,7 +787,8 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, + struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); + struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -799,7 +800,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = V_udbinfo.ipi_count; + n = pcbinfo->ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -810,8 +811,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = V_udbinfo.ipi_count; - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_count = pcbinfo->ipi_count; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -838,9 +839,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = V_udbinfo.ipi_count; + xig.xig_count = pcbinfo->ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -848,7 +849,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); From nobody Mon Oct 20 21:42:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr867696bz6DBJG; Mon, 20 Oct 2025 21:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr8675fQlz3YkL; Mon, 20 Oct 2025 21:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760996543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7+Nx6/4JfKr6wXWqlywmtCVxqm1AkFpnT8FaUJl53s=; b=Pe9sAw0hcgkJqTkVqvAL7gwhJs2k66xk3jVfH9wWnLc0bTFHMkHqTScnUDW3vUm5d2JOOG mZUg4lazha8TgvpEblZ6lZEsSPXj5pFRN323KbPqH0Cogkb8F4yl+GvdJrZE0Ilm+Iwf6J sizNgUECTH7woQzYrC5QDcR+NR9uzEbmiN/IKUo+hcsq+5PwtrV3sXeHUTneJBbuExWKLm Zey5NZSZ7RgTml5GggJQ5JJiHDYbTd9GrzzwUoNbvHLV+pl+o/zSjO/SHn1xosyGJyHyh3 jY6K0PhfTOYwlYAENZkhnGXBNbBKluyZuwSKykCiIOA+aLI4vZbNPKrp+OO/Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760996543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7+Nx6/4JfKr6wXWqlywmtCVxqm1AkFpnT8FaUJl53s=; b=gzLdZRIXK9mnWskC0KJctCoRIj21OjGGEO4h/vlf0czKaN/lJ94wIBB3137kB55Us5m47b 8e3gdQmmsMZXK28Z9fa5UgV0n+M/nxGw/U7L7biBPemuHAxMDipXTrPMkecF6q/JhaOg9E eW/rMvuXWscrjOB0MKvLPI6kBV+/F6E8puW4m+ibXYneMGHozOt98lTTFQg3zo0E+nXCR7 +N8WO5RgJaX932IN2XFZ01xflwZeepguwLHMbH2eY2X3fTfD85BUyw3CTayabs1kIUH3rF 4KHjMUO65LF5wVYaOjSndSXY7HbwTbPE+sQ/Z0+1hU6ELknNRnQdeJMts0l7Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760996543; a=rsa-sha256; cv=none; b=YGKB/Iro/9JncvEjbKbb+bM/7T/SF4D+ondlBg3ptIz/caY/tKLqADT2nFVqmeHnwPg6qp wjmbbL0lCZ9IW03P5zDA+lQhYBBid2UJY/PordVZEH0tAEAuDu/Dbv8lWCzc9O58AKAoUE j25YKZMOygYXHaNKv9SoqFwY5fWpP+sPQblDeKnOEUZmD1Aqtf+hmBEigzzmV1Cy5HrAEI mA1nY62SCtySdzTefaj7FY909fnQzuWmf0cmV/TZtgo13Rx6B1JqBGu+Kmv8MnCWq3dH4V XEpVff6thB9h331Bluoaf4XQOLdRZAXVMJ0+NtIuhMgDPvJ9XzZypD/fvq0Lug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr8675ClwzWn3; Mon, 20 Oct 2025 21:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KLgNdF065637; Mon, 20 Oct 2025 21:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLgNoW065634; Mon, 20 Oct 2025 21:42:23 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:42:23 GMT Message-Id: <202510202142.59KLgNoW065634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fa347930f89d - main - quot: Make nusers unsigned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fa347930f89d4f9d1956573c3bd4b5987127bc12 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fa347930f89d4f9d1956573c3bd4b5987127bc12 commit fa347930f89d4f9d1956573c3bd4b5987127bc12 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-20 21:41:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 21:42:13 +0000 quot: Make nusers unsigned Fixes: 195b00ec45e5 ("quot: Clean up") Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D53224 --- usr.sbin/quot/quot.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 879580f649b9..5dda36ac8499 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -178,20 +178,20 @@ static struct user { daddr_t spc60; daddr_t spc90; } *users; -static int nusers; +static unsigned int nusers; static void inituser(void) { - int i; struct user *usr; + unsigned int i; if (nusers == 0) { nusers = 8; if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); } else { - for (usr = users, i = nusers; --i >= 0; usr++) { + for (usr = users, i = nusers; i-- > 0; usr++) { usr->space = usr->spc30 = usr->spc60 = usr->spc90 = 0; usr->count = 0; } @@ -201,15 +201,15 @@ inituser(void) static void usrrehash(void) { - int i; struct user *usr, *usrn; struct user *svusr; + unsigned int i; svusr = users; nusers *= 2; if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); - for (usr = svusr, i = nusers / 2; --i >= 0; usr++) { + for (usr = svusr, i = nusers / 2; i-- > 0; usr++) { for (usrn = users + usr->uid % nusers; usrn->name; usrn--) { if (usrn <= users) usrn += nusers; @@ -223,10 +223,10 @@ user(uid_t uid) { struct user *usr; struct passwd *pwd; - int i; + unsigned int i; while (1) { - for (usr = users + uid % nusers, i = nusers; --i >= 0; usr--) { + for (usr = users + uid % nusers, i = nusers; i-- > 0; usr--) { if (usr->name == NULL) { usr->uid = uid; if (noname || (pwd = getpwuid(uid)) == NULL) @@ -280,7 +280,7 @@ uses(uid_t uid, daddr_t blks, time_t act) usr->spc30 += blks; } -#define FSZCNT 512 +#define FSZCNT 512U static struct fsizes { struct fsizes *fsz_next; daddr_t fsz_first, fsz_last; @@ -292,10 +292,10 @@ static void initfsizes(void) { struct fsizes *fp; - int i; + unsigned int i; for (fp = fsizes; fp; fp = fp->fsz_next) { - for (i = FSZCNT; --i >= 0;) { + for (i = FSZCNT; i-- > 0;) { fp->fsz_count[i] = 0; fp->fsz_sz[i] = 0; } @@ -309,13 +309,12 @@ dofsizes(int fd, struct fs *super) union dinode *dp; daddr_t sz, ksz; struct fsizes *fp, **fsp; - int i; + unsigned int i; maxino = super->fs_ncg * super->fs_ipg - 1; for (inode = 0; inode < maxino; inode++) { if ((dp = get_inode(fd, super, inode)) != NULL && - !isfree(super, dp) - ) { + !isfree(super, dp)) { sz = DIP(super, dp, di_blocks); ksz = SIZE(sz); for (fsp = &fsizes; (fp = *fsp); fsp = &fp->fsz_next) { @@ -329,7 +328,7 @@ dofsizes(int fd, struct fs *super) *fsp = fp; fp->fsz_first = rounddown(ksz, FSZCNT); fp->fsz_last = fp->fsz_first + FSZCNT; - for (i = FSZCNT; --i >= 0;) { + for (i = FSZCNT; i-- > 0;) { fp->fsz_count[i] = 0; fp->fsz_sz[i] = 0; } From nobody Mon Oct 20 21:43:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr87g0R02z6DBmr; Mon, 20 Oct 2025 21:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr87f6hmDz3Z5m; Mon, 20 Oct 2025 21:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760996623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Grhon+mfUR232YCSzeO25hdqeAkhNuIVWt5jBwqHsqg=; b=qxy1d66wzHpF5nv59F7D9G6EXmLQGThawbLBjGyKMHTZpEgi3nmblcV+1l+rMqpfHs4/eE qlMBfZg8i5fYZwqLzVQXNnZOC073vqplEkHX+Tz2YBjpkxnZjOLIEKe5EXwdBG4KTKNv2/ vKYsjDv1LC240ljo/gqzKFMar9vSxDFw/aob7NioXzidvkHHcQx+8ouWsX2CID/GXkjJAs iS2UbfDdYmqFeahg9X0Xe/VodzjjoMQtUaBS+sp1jpOK9uL7QvQm0tbL24rATETTEe4Byc kr2ld/BjY8iawteGsrtVDo2qyx6s4zz583gvk5JyAgp7eRMqhdLp1F2RzxuOFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760996623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Grhon+mfUR232YCSzeO25hdqeAkhNuIVWt5jBwqHsqg=; b=oHo37BJl94oKcHbFegEvddNa/1c8qIH1ponJTfxR/KStNdDPuKG9zzSaKChTZFaaYZQ8PC gocUVROUmHwOV1JRKDuVxHlcf50gHPeZ8SqzZjYaHwhzTLYBEjChfAVdLZOrSmxzv0DxLt ZNQEkkp+UcqdDww45awx9m+L/ujV+/o+XRoF23wW41IFaPImvxx+Jg29rYENmQd5dGA+B7 ZxeTTDdBYbc8hRIV7JHF2SePjPfWW4ZsJryQiUAAG6OZTd1qwIxFZxzghq7EkOPBI1bPg0 QQmkKw/pUNfI+GvxdpHT8V++WpGb7OvFwFE1o4ERFbLU+aEieW860dt38FfCoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760996623; a=rsa-sha256; cv=none; b=ZmAp/P2Nw3Qk9+/o7Ep/DCNyW2xyofJfv0pOzkOoeACYecQmyCUpbRbBSYDsHa+CTlE5n8 EVOGAL8zV1rPgj+/ns5odSlKGfE+nE9kFKwfnZ4NfCsxyzladtd7MlkUwRUVXIwg3RJFMP XVyxhjRxrq8kYD/E184GhAMaFKud8D2IDj76W9KHCC6dsgIeLn/Km5uwZMo9VApccEejdt ekus17I8GAaZAoyxMdoRNHKIrkr0kVcfzfu8cPQOM0kx1zKcgbr0uccD/SOpURFTeLV+Dx qdkoULwDiAwkq1yCs4WS033UMiqUcjm7qvSO78CLVuN1d8kgPvZuFxWLwoUxTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr87f6FQYzWqf; Mon, 20 Oct 2025 21:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KLhgPf066157; Mon, 20 Oct 2025 21:43:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLhgnQ066155; Mon, 20 Oct 2025 21:43:42 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:43:42 GMT Message-Id: <202510202143.59KLhgnQ066155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2427ae41b7cf - stable/15 - quot: Make nusers unsigned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2427ae41b7cf11e75f9a80d6c274a09eeb9ae979 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2427ae41b7cf11e75f9a80d6c274a09eeb9ae979 commit 2427ae41b7cf11e75f9a80d6c274a09eeb9ae979 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-20 21:41:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 21:43:20 +0000 quot: Make nusers unsigned Fixes: 195b00ec45e5 ("quot: Clean up") Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D53224 (cherry picked from commit fa347930f89d4f9d1956573c3bd4b5987127bc12) --- usr.sbin/quot/quot.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 879580f649b9..5dda36ac8499 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -178,20 +178,20 @@ static struct user { daddr_t spc60; daddr_t spc90; } *users; -static int nusers; +static unsigned int nusers; static void inituser(void) { - int i; struct user *usr; + unsigned int i; if (nusers == 0) { nusers = 8; if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); } else { - for (usr = users, i = nusers; --i >= 0; usr++) { + for (usr = users, i = nusers; i-- > 0; usr++) { usr->space = usr->spc30 = usr->spc60 = usr->spc90 = 0; usr->count = 0; } @@ -201,15 +201,15 @@ inituser(void) static void usrrehash(void) { - int i; struct user *usr, *usrn; struct user *svusr; + unsigned int i; svusr = users; nusers *= 2; if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); - for (usr = svusr, i = nusers / 2; --i >= 0; usr++) { + for (usr = svusr, i = nusers / 2; i-- > 0; usr++) { for (usrn = users + usr->uid % nusers; usrn->name; usrn--) { if (usrn <= users) usrn += nusers; @@ -223,10 +223,10 @@ user(uid_t uid) { struct user *usr; struct passwd *pwd; - int i; + unsigned int i; while (1) { - for (usr = users + uid % nusers, i = nusers; --i >= 0; usr--) { + for (usr = users + uid % nusers, i = nusers; i-- > 0; usr--) { if (usr->name == NULL) { usr->uid = uid; if (noname || (pwd = getpwuid(uid)) == NULL) @@ -280,7 +280,7 @@ uses(uid_t uid, daddr_t blks, time_t act) usr->spc30 += blks; } -#define FSZCNT 512 +#define FSZCNT 512U static struct fsizes { struct fsizes *fsz_next; daddr_t fsz_first, fsz_last; @@ -292,10 +292,10 @@ static void initfsizes(void) { struct fsizes *fp; - int i; + unsigned int i; for (fp = fsizes; fp; fp = fp->fsz_next) { - for (i = FSZCNT; --i >= 0;) { + for (i = FSZCNT; i-- > 0;) { fp->fsz_count[i] = 0; fp->fsz_sz[i] = 0; } @@ -309,13 +309,12 @@ dofsizes(int fd, struct fs *super) union dinode *dp; daddr_t sz, ksz; struct fsizes *fp, **fsp; - int i; + unsigned int i; maxino = super->fs_ncg * super->fs_ipg - 1; for (inode = 0; inode < maxino; inode++) { if ((dp = get_inode(fd, super, inode)) != NULL && - !isfree(super, dp) - ) { + !isfree(super, dp)) { sz = DIP(super, dp, di_blocks); ksz = SIZE(sz); for (fsp = &fsizes; (fp = *fsp); fsp = &fp->fsz_next) { @@ -329,7 +328,7 @@ dofsizes(int fd, struct fs *super) *fsp = fp; fp->fsz_first = rounddown(ksz, FSZCNT); fp->fsz_last = fp->fsz_first + FSZCNT; - for (i = FSZCNT; --i >= 0;) { + for (i = FSZCNT; i-- > 0;) { fp->fsz_count[i] = 0; fp->fsz_sz[i] = 0; } From nobody Mon Oct 20 23:42:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmQ2VdBz6DLYT; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmQ1xM1z3qJ4; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kaJEYTd/+PpzP0d73Q+KePySCSA/Ie6+TQFB0GFXl5M=; b=jt9/hYg9iL4ewhVxHWTWuHzZDHEjoXD607JkUs3pCeD07GBb/5c1o39p92XcO7lkobaGdo hdgmag5M8egKWFsP6jZWrB84Ry2NcFEeDBZVo0QzlaJwLrUXO9s6VnwAg42zTk7viL3wHh Pmwsmggy4zYtB6omDwIS00p8LKzzjIbCpYYZd/fQgj5YZ9ev4K0GOKNTSrUFFCabX7IOFQ v5KpkTqoYaOv0BODkGivd2SNXrO/HX5YJEkoMw/Je7bQ8QEb0JenGHO4DPLnDfv3oGCXWo kP9unYDUm9KqlKbUcs7zf1Qs/CNgJ1i/3dRa2sKjh/B6xAgkckdikJkssvJrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kaJEYTd/+PpzP0d73Q+KePySCSA/Ie6+TQFB0GFXl5M=; b=DQh4hOVNKxsOL6i3zqZmNxb2ri/znrZ9Ql/e4PIPH4weCNBIIyYTwygr443RlXKpF1b5gu 3DvUo5ONyhqRHyOEyZ0zEdTbYAiK/inYPpYsnFj8lmJIoWlGRZWIl1l0XIcCkmXF4n/bW1 VEaxZ2qztTHgHHMKdGPWl3SPLs5NROYxp4Ei7v5iMcAMSeXXm+SHk3j2cuk8Iy4eme07F9 uTv6H/+wseW0LZA/eciYM2IkubzMaY9Q4JCXmDFQdEhwsLbHWE1L20C/kLLaDifVOQMQbi 4LDqjnLDzUJ5RlLkK+EGG0bR6xibNsRy+w6YDfytLyP+nVgRmC9BaAbkMSej+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003734; a=rsa-sha256; cv=none; b=xoxM4oW1Hzmz2+F9yO17VhRkVI8tOlMtqOnDuuaA5/adFOgzpb3I10h3HlbcQIU6D33LNM wvpv2YoXN/wkWa9+glPh4Y9oz276b48EeQD3/0vTZBiQae/qSSPLMhHxP88XLzetdOnMtr X3qu1aJstivB4cfW1fw882GUIhqxN6HBzQgn5881z0HjjjC3xMUZV+XlXbgfprcby1AfSF hN1QjQ6v/ssTEJOQfn3Dr1WgVlbjczRzzImqPOXKyYWP9E07FQ42cToIKG57pbSiNEY2iT 9ZK32ykQ7WFBSQToEYXeLh/4iofiKotlz1Ya+UVG9xpFUi/9C43bajp3VFL4DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmQ1XS1zbk2; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgElF090314; Mon, 20 Oct 2025 23:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgEPY090311; Mon, 20 Oct 2025 23:42:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:14 GMT Message-Id: <202510202342.59KNgEPY090311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: cf202819af23 - main - dtb: sort by vendor on riscv List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf202819af2337c0b652ac9290964c2ef7a1ae3c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cf202819af2337c0b652ac9290964c2ef7a1ae3c commit cf202819af2337c0b652ac9290964c2ef7a1ae3c Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:45 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 dtb: sort by vendor on riscv Just like arm64, our DTS comes from Linux and is correctly sorted into subdirectories by vendor. Enable the logic to preserve these directories in the installation, for example: /boot/dtb/sifive/hifive-unmatched-a00.dtb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53116 --- sys/conf/dtb.build.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk index 7eb0db5e8b80..f0cd8f8d515c 100644 --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -15,9 +15,10 @@ SYSDIR= ${S} .endif .for _dts in ${DTS} -# DTB for aarch64 needs to preserve the immediate parent of the .dts, because -# these DTS are vendored and should be installed into their vendored directory. -.if ${MACHINE_CPUARCH} == "aarch64" +# DTBs for aarch64 and riscv need to preserve the immediate parent of the .dts, +# because these DTS are vendored and should be installed into their vendored +# directories. +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" DTB+= ${_dts:R:S/$/.dtb/} .else DTB+= ${_dts:T:R:S/$/.dtb/} @@ -54,7 +55,7 @@ _dtbinstall: # entries in the NO_ROOT case. test -d ${DESTDIR}${DTBDIR} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP} ${DESTDIR}${DTBDIR} .for _dtb in ${DTB} -.if ${MACHINE_CPUARCH} == "aarch64" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" # :H:T here to grab the vendor component of the DTB path in a way that # allows out-of-tree DTS builds, too. We make the assumption that # out-of-tree DTS will have a similar directory structure to in-tree, From nobody Mon Oct 20 23:42:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmR6Yfsz6DLfS; Mon, 20 Oct 2025 23:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmR3G4wz3q03; Mon, 20 Oct 2025 23:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1x2T1BNwPYJNUcNZXRkbWcyDJf+j5/ilF+tG2aMT74=; b=UqcNrUgxQh++tVGhSiqmUqlCOj6xpu1wVFPHCWzXftFGCJyTlXMQz32y7bfhmyT6//m7N4 xXPNRpu5i3Rh2L3199QRyX5udmZHW6KQGL2T94+Tmelb1YhZOliLe4p+XqaXUsDOLhPlsc mL2veqWA5fVUgYTg6GzLx3OUXRlQAdeIvCiVEB6uapsYHgkTcxlpKnWA02ZKk7tTBD+rnM MjM5BySPqfdhJRzLXBG7sgNgURAOX/VOJfm32cq8uSen20KKBZgLpyiIDccChxRBdKnv4B P/W4a/d0aKtIFPrDUisIc+28nymmm42tXudVxI6s6S2PFgWddd/BXo9NipVbNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1x2T1BNwPYJNUcNZXRkbWcyDJf+j5/ilF+tG2aMT74=; b=NCsaa9H4XP2vXr5uYkr5JGvdO0lxk4CnOLcL+ETqETOMXfWZ6jRD+Pa1A4oLp40vw+56ZL MZEckIAy6CgetbdHuDdSa+4AU5st+HdjB0FfOqRo12OULzd+jAkX5pnCPIaCCT4O5W/Z+Z UW9ga6HnSs/Eew2bfVNR9YGUgRbUHiUoIHyWKxxgagWMhW0Y1XuOzqZeQvWm9Nv0eXCNKS aczYIgyFLgC3l0FCOJkus01/LV08DXvrkwADFC+zfD1sXeExZfnR5cNbIuHAA3qimi4YGZ VFRI9baTLgaPlDLZ3wgcruUXQl9Yro0JVm3hv48Izx0QaydncaihbZmc2UOUIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003735; a=rsa-sha256; cv=none; b=VAzx2QR1zLtmraH6peNVfLmuwXxsqmZjxrF9aVrjEKCJgSz3RT6nABGcou/OuRP6Qa6ECI YMV/+tvI80roqYyxvUVDqzpsOtmMNx0AO+4ymDm4U645wT1WVLz1yiVOXIyffR53BpsobT RBCtCbX65VRnQq5Bou7k5+Q+fKv4NIsu7XZL7VOa4kCtSRaVSuoxwdNI2iWmHKrThM1nSD d+8BaIAgY3m5WF+utJCLsjwXESpHv10vFpbzvFO8G8AvDhwjldvKuIfSCTk9Ew+N49D2OK pX8vtqql1YlYtj1pmcxGhtfa8CV+gn3FQRXMF2+czu1r5vijyvwKLc9uV2jOkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmR2dWFzbk3; Mon, 20 Oct 2025 23:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgFPs090348; Mon, 20 Oct 2025 23:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgFh3090345; Mon, 20 Oct 2025 23:42:15 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:15 GMT Message-Id: <202510202342.59KNgFh3090345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 96b137c044d8 - main - riscv: build starfive JH7110 DTBs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96b137c044d8f7266757e95ff134119f3ac51be5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=96b137c044d8f7266757e95ff134119f3ac51be5 commit 96b137c044d8f7266757e95ff134119f3ac51be5 Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:58 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 riscv: build starfive JH7110 DTBs These are known to work if loaded manually by loader(8) (for VF2 at least). If nothing else, it is useful to provide a DTB closely tied to the kernel version. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53117 --- sys/modules/dtb/starfive/Makefile | 7 +++++++ sys/riscv/conf/std.starfive | 3 +++ 2 files changed, 10 insertions(+) diff --git a/sys/modules/dtb/starfive/Makefile b/sys/modules/dtb/starfive/Makefile new file mode 100644 index 000000000000..2da30f0985c7 --- /dev/null +++ b/sys/modules/dtb/starfive/Makefile @@ -0,0 +1,7 @@ +DTS= \ + starfive/jh7110-pine64-star64.dts \ + starfive/jh7110-milkv-mars.dts \ + starfive/jh7110-starfive-visionfive-2-v1.3b.dts \ + starfive/jh7110-starfive-visionfive-2-v1.2a.dts + +.include diff --git a/sys/riscv/conf/std.starfive b/sys/riscv/conf/std.starfive index 9bdb1af9e79c..6a0e56cc84bd 100644 --- a/sys/riscv/conf/std.starfive +++ b/sys/riscv/conf/std.starfive @@ -10,4 +10,7 @@ device eqos device dwmmc device dwmmc_starfive +# DTBs +makeoptions MODULES_EXTRA+="dtb/starfive" + files "../starfive/files.starfive" From nobody Mon Oct 20 23:42:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmS6XpVz6DLNR; Mon, 20 Oct 2025 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmS3h2bz3q2T; Mon, 20 Oct 2025 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aA1kPLom9nYMoIeZkVo4X0aIh4oixN+muJOEcoclFbU=; b=qE7lxVnr7/Z0vr0MD6LNRWRGr24uTC2+PWtRasvjTm4UoTjqsbJ/p3+ckO/6IO3W9yVUpk xCe4u2a18B4Kl2bb697SqdJnWc6HEqmlpf29g4LEwXvHdIFwZo+tjqBcMMHQm37UX7kcj7 Tn3Qp9/SxKFrG6CtsUxE2ZFda1e2TFNrOhMy46oQXvp6FUHGKtyWCPWYvr8qMe/LKqJPa9 +3c/WKHH0Wb0NlHOvYwSOmjKCsaLwb+cpLsz3wOLerW8CqgOAOaJEaqtAD1K0wNG38Pqiy 2KsUFOJ8Ti0ZUn69iVWBCvA3ppCg+86yl6bhhduQoMVjXCq4XKId47xqO14ikg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aA1kPLom9nYMoIeZkVo4X0aIh4oixN+muJOEcoclFbU=; b=aNMUSSMVCs9u/8/uLbUPhVvxJ2h9Bo+UK2D9KYcRMGVO21NW0lkivjZvpbn/Y5EwLgiphT 8veIHfh6ospL/ib+kst0TlRtpDJjLHfyX0bpFjuE4t8CjQ3tHA+8IVxoVvJPl4xIEjU+0g JvA55KSylbGBGrTAt9uUhw4bFL220BtW546RliMLRna8/ypOlmHDojjpfKDBVrkA7cFXGK UFs4aARSui2ruJjhl78jl3u5jqgyq6l7DNaXWm9Gr2HIKQkTMD7VOMTvWAiZfHAbWCHpHO /Z0T9sdw70wbbszgtzbwhlceBk3/CfYHlas23VUqDuiEmFIo5Uv5gDyqHJE1iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003736; a=rsa-sha256; cv=none; b=go+stxKl/iIUgePszhq+o7uhvsYTpF9Th8JM0LJZ9n0t4q9cXeNrgH+FbhOSQKJW+/hG4v 8qYM8NeDzeu3fnEee9s8xlpEGMK+BNsQGjgiNdW8hMKNsTBCRdoRvKQ4I5XUXqgxGlOCfQ qA60/R8+KMs+xVCuym6WEscFMuncO7R61QrK+PZ2+z2OAKEhWw/SRD8C/8RUy5PgcXZm0l tFkoukapG11qbsE+zqtsDFywBpvO4bb7mUTYBLs6NhsoYcHkUtFm8W9IjC6TEqoXgpvQYd 3GSBwCfdF+wJz89qr1MbHUEZHbWn6Wc/fbufu3xpy+mTaVOthAVqT4T2QTAgYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmS3J48zb7W; Mon, 20 Oct 2025 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgG2o090381; Mon, 20 Oct 2025 23:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgGaQ090378; Mon, 20 Oct 2025 23:42:16 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:16 GMT Message-Id: <202510202342.59KNgGaQ090378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3ed48eb085f7 - main - riscv: build allwinner DTBs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ed48eb085f7c4ae5c019ee882e694b432d43911 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed48eb085f7c4ae5c019ee882e694b432d43911 commit 3ed48eb085f7c4ae5c019ee882e694b432d43911 Author: Mitchell Horne AuthorDate: 2025-10-20 14:25:08 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 riscv: build allwinner DTBs These are known to work if loaded manually by loader(8) (for the Nezha board at least). If nothing else, it is useful to provide a DTB closely tied to the kernel version. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53118 --- sys/modules/dtb/allwinner/Makefile | 7 ++++++- sys/riscv/conf/std.allwinner | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 242ee5d974ad..2666e786a9df 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -65,7 +65,12 @@ DTSO= sun50i-a64-mmc0-disable.dtso \ sun50i-a64-timer.dtso \ sun50i-h5-opp.dtso \ sun50i-h5-nanopi-neo2-opp.dtso - +.elif ${MACHINE_CPUARCH} == "riscv" +DTS= \ + allwinner/sun20i-d1-dongshan-nezha-stu.dts \ + allwinner/sun20i-d1-lichee-rv.dts \ + allwinner/sun20i-d1-mangopi-mq-pro.dts \ + allwinner/sun20i-d1-nezha.dts .endif .include diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner index 34fe195b01ba..ecd789f39963 100644 --- a/sys/riscv/conf/std.allwinner +++ b/sys/riscv/conf/std.allwinner @@ -17,4 +17,7 @@ device awg # Allwinner EMAC Gigabit Ethernet device musb # Mentor Graphics USB OTG controller +# DTBs +makeoptions MODULES_EXTRA+="dtb/allwinner" + files "../allwinner/files.allwinner" From nobody Mon Oct 20 23:42:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmT6dBjz6DLNS; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmT4fxWz3qLc; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qn8W4+KKylEHaBfnCz23WWqtdMIqz6+rBuUgoHaHBE=; b=Ej6WE1S15pUG9UpAxDB4xl1R7wVFmi6fmOqdZ5BMpHQlwtI8hqubgRCppc769vqg0ltKjT did9QQziZFHzy7NlQd0FfRprutYInfxd1j+5/R12rMW8djOtkLqXYrM4pFehczSzXh9HE4 FyimkZc4Aoz3MESK43HfJ8MGwgmLLQpbwZgoKOegDuco5y3eNTI/D/0qrSaBTUWaN1gMKV UcpZ4YyjvToittEoXiS98v7+001BJyhDriAAWF3zbWD2dlxc65w7qhcHLHMwaOBAP0eEVj G6V8nGP8xQ6ixs4eI9F3sBgiNyl/zJqI2l3TWMayGy6K9uUbt79o67rBbnwCSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qn8W4+KKylEHaBfnCz23WWqtdMIqz6+rBuUgoHaHBE=; b=G4HovtsBoptWbySB79W+2qOf3zAfw3cpbTWfJSLgkBngQzrMch/RSGDK9EMwsTW+YHc7lH zvnr0DVTma+1IkZMPggq5tC7XOVEg8p2Z1M5TV4Op2Q8L+fz95ggzwv7QazbkFXt0QDmD9 Kuzi+ImoJ6h/a0h8fIcn+FpuBhA0YS5p2hM/u4RtWIBLPHZ6AVxJJrnlag0q7odvc3YKbu 1iASZH5nM05Wg5m25RvAYV56n666A9m/oPxMK2sgF0u7dR/B8693qgFLSEImQrNCdlQawV XJ55T4J4zr9uW8HqcWZzT0IVefS9bWOjGmOhGyBSxl80CPLZupJBe+3Ye/0qfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003737; a=rsa-sha256; cv=none; b=qjYPNxLvFa9Si0bXe2dLeI9nJI/tGVyvqU6h6W2Um/zh8B0dHfWiLIpn0eqivo5bj1FGJF loePWHl3RbkkSf20fJvdvvqNH7k1v4NxwXRyjXbv5+2GRyfipg6gkZ6lB+XdmUIFSTwUu9 t4MneLZ3bmBkmMDwIdOVG/5cWXagvStjfTce5CnTQ2g4Z6oKVbtXBYKw6iyXzfyXFfEMUf JFTY5lA6PViB3YzghQOA0G/DPpoc2q3JtmZSER2hz0LmlK9iPL+2ldD+PUmfKcOLW1/Y6x 2Mcqk0u6QI0JJFMa//YXQNQlxFu6yVE/tlH9aHMc3soMpzlCQRMUpbeZXNsWHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmT45CPzb1Y; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgHWq091170; Mon, 20 Oct 2025 23:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgHDl091154; Mon, 20 Oct 2025 23:42:17 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:17 GMT Message-Id: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5522519731b74e7b56c710ec5ea4d34065f3ed32 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5522519731b74e7b56c710ec5ea4d34065f3ed32 commit 5522519731b74e7b56c710ec5ea4d34065f3ed32 Author: Mitchell Horne AuthorDate: 2024-09-18 17:19:16 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 modules: enable allwinner kmods on riscv While here, standardize the place they are enabled in the Makefile. For armv7 the module subdirectory was added explicitly in the config file, but this is not idiomatic. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/arm/conf/GENERIC | 1 - sys/arm/conf/NOTES | 1 - sys/modules/Makefile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 7394f3842d43..9607b16756ea 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -272,5 +272,4 @@ makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" # SOC-specific modules -makeoptions MODULES_EXTRA+="allwinner" makeoptions MODULES_EXTRA+="imx" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 920d721dc3ba..0a5d34c3849a 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -94,7 +94,6 @@ nodevice bnxt # Build SOC-specific modules... -makeoptions MODULES_EXTRA+="allwinner" makeoptions MODULES_EXTRA+="imx" # Build dtb files... diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 63a0b3260e6d..9ec7c33465f3 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -680,6 +680,7 @@ _irdma= irdma .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" .if !empty(OPT_FDT) +_allwinner= allwinner _if_cgem= if_cgem .endif .endif @@ -713,7 +714,6 @@ _hyperv= hyperv _vf_i2c= vf_i2c .if !empty(OPT_FDT) -_allwinner= allwinner _dwwdt= dwwdt _enetc= enetc _felix= felix From nobody Mon Oct 20 23:42:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmW1cwwz6DLTl; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmV5dBSz3qPb; Mon, 20 Oct 2025 23:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxdD8gDDz9eQRKX43Isgg/I3XMpLvJAtd/LDN/s3M8M=; b=l+JuJPp4bc8SCagucB9mTdgaGp+CDuK8HTPgHBJi7AdPcmRi9Ay9w0Z8lkmiW+mPy7+1KF gV53VBXZF0avwz3W46DDELj20GQqfYB1KKIUIpRlRdV5tA+JnA6VTtLalXZ/yq/YXJGdYa r0UC8tufgtUrz81bPZFdIHcTz+07miiwY7SMZH526DvOppPn7NxcSTcUhlMXaKsDU/xlA/ kbMCvwd5fXN1HG+OPrziEMPrc/lv24MQj37CIHd76/2jeOPgJiCc2wgHKO3iNdbWyGpsrT fLYkCVUNBBnN+C+//LjT0aAaGhw2butJx1Gb+/Py1zPquSYYa2MOrguBnGUQgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxdD8gDDz9eQRKX43Isgg/I3XMpLvJAtd/LDN/s3M8M=; b=PleWO61r05CnyGvgOGQiF0Mq88xlk24BWmYuAJjKoIozcq9AGyb5fKqIJLPP7gZYshLU+D f6lM8ZcKO9Tqf7Nnu0twqMqWuEnkqsNv50sgIMMgKbAaGiMUm8TtqEBcscmjx9q3LAel0O pKxa3uBi3EPfqBt0oJ0Gc4bRDSS8qJ5OOX5Se21x3UgD73j8fdunCSspAgvxyesKH+9UQj 6Wd3hkLZYqsjQPWcS/9cIuAdWWl8iaPczACNW2nm1CsXlHqdG4Iv3iIr2UlZZgQ6FmWycH iE5DaMBGpjRZkyMTpu9sjRwddPKpRjPp5Iv8txg1ANtP193f1/VH0521vMcqyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003738; a=rsa-sha256; cv=none; b=XU9HAPQsdUX+XW/m2gZE1qBVW3wtP+dfkClcGIFPpTus8xag7sKz4TtO63il/oVlltiK+A hF8RUVMHF+hLexPXFp+d1bZR8JdKoGzEiq/cmMdOUcEKqUqsoKDx1Ugr9BILBJV3Przpss 6V1j0A9rZPC6o6PBM4R72rr/8lTlBoxSu27H741ddTu3JFj2F+1YtawnwM6T+NBmAsH3/w +Z41aKIXYlwyB940LmtPPbOE2LHR2U04wTXFhnaQ3bwxCY46xgDvVyva6FeDJz/9Gx4wSP mPp2I18tW+RDNomfV8OvPtc1mTwK4PRRKVZ7WkYp0RICxUiWrkqXwnjwY89dVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmV55Pbzbk6; Mon, 20 Oct 2025 23:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgIp1091749; Mon, 20 Oct 2025 23:42:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgIeW091746; Mon, 20 Oct 2025 23:42:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:18 GMT Message-Id: <202510202342.59KNgIeW091746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 5aefe9f16f24 - main - arm: tweak imx module build logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5aefe9f16f240696142894bdeabcebbb057c7053 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5aefe9f16f240696142894bdeabcebbb057c7053 commit 5aefe9f16f240696142894bdeabcebbb057c7053 Author: Mitchell Horne AuthorDate: 2025-10-20 23:06:26 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 arm: tweak imx module build logic Add the subdirectory in the Makefile, not the config. No functional change intended. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/arm/conf/GENERIC | 3 --- sys/arm/conf/NOTES | 4 ---- sys/modules/Makefile | 5 +++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 9607b16756ea..22bb75993834 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -270,6 +270,3 @@ makeoptions MODULES_EXTRA+="dtb/nvidia" makeoptions MODULES_EXTRA+="dtb/rockchip" makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" - -# SOC-specific modules -makeoptions MODULES_EXTRA+="imx" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 0a5d34c3849a..2bd41d911124 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -92,10 +92,6 @@ nodevice mps nodevice bnxt -# Build SOC-specific modules... - -makeoptions MODULES_EXTRA+="imx" - # Build dtb files... makeoptions MODULES_EXTRA+="dtb/allwinner" diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9ec7c33465f3..02ed6a0480e6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -173,6 +173,7 @@ SUBDIR= \ iflib \ ${_igc} \ imgact_binmisc \ + ${_imx} \ ${_intelspi} \ ${_io} \ ${_ioat} \ @@ -721,6 +722,10 @@ _rockchip= rockchip .endif .endif +.if ${MACHINE_CPUARCH} == "arm" +_imx= imx +.endif + .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" .if !empty(OPT_FDT) From nobody Mon Oct 20 23:42:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmX5S2Hz6DLYX; Mon, 20 Oct 2025 23:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmW6XTsz3qPr; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EgNUUyUwCX96azvNk4a6HYXxR8q6v531MCtWGmStW0=; b=W6Cy3gg9rMqTpGA+b4456lToGUPfExGGXTxf0CoPvQbIjMiUnz/VDo7IMAFyDH/nE3tNMZ djmkueC1qZ8padskmw9hX+H8ceY3EuD2d4K9ePpIot/pFchbiCiBPnzDj9TgZvh7wRCjYA EYYUoJHFSVoDZBgCZE4Wvr7q+G3KxEetiTkUdgAS6ch4y7pic46zt8WnaSL7G2lzQJ4ZSy qkySxCWq7p2vwiV8/KwC7SUcvqAl6y0K5r13qv+mzPfkS3IX0tpz2B4v4IE9ARjaGOrkRp ca6meu7HbcL5lVzThQePefikerY1bNsx8lutg28ah9jWnbI2anpZkNfL0gBiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EgNUUyUwCX96azvNk4a6HYXxR8q6v531MCtWGmStW0=; b=D5gy5sI3IJimJ5W2XzF00mgx5eMga2diE3kw+/gj4n8QTo9xjm4IGXvQ5N+O8syFgbfXXN K+1g6Ce4Zig0aAJ4wyr20TodGdfne/mxDkEYWHiM8CsTo70CTdGxiCyiHrQfE6bNmBymMg 4BVvU1I48yp8ZfyeQP8d/Xxleow2salkrj45uh9Atm5JLEn99TSMZ89VC9RX449nsdSOi4 GqYL85CaTffpKjEb21HCut3+299uMV1+/bw18l5VSOl6Tl0vHEkzxUr/HPsbI6ezVGh35A Bl32USPxr4/gt2ilVn+T3dPqfsH/p32KvvkqAlOoowp+yMxdAMMbhfW+4aMM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003739; a=rsa-sha256; cv=none; b=J9XDUg2yVBg3G3VICqx1DKfNh5qtPlTw6a6QkPtA1mc50J/2dY6ff0wqbnfjP7qXQs/itj VQi2/I7jklz/SbdUYURF3eh9b6d/3B0OVH6ghifl3wDk5htUleXaXGuA+pfC9JeMX1kYF6 4ZTWmWp1lQtBWxWSYB5EsuZRkpMPaDlPBRbK0TlsngUtHO4jXVZnc9MEjju1mkDUFT1gld 1/Z19W7Q3iQe/nnE92bispiWpjUbL2zqxCaCnmgIZPdZOhrwk+56+OCzCEs0E9AwkXrv/H qpXTPmDjwpXzvOm9MeIYZDWTcmV9uXKYw6TSLJSQKzaSdr2ZJ3LG09e05c/+tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmW608Fzb47; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgJEO091788; Mon, 20 Oct 2025 23:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgJof091785; Mon, 20 Oct 2025 23:42:19 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:19 GMT Message-Id: <202510202342.59KNgJof091785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: ddc1d4b0722b - main - modules: fix some riscv module logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddc1d4b0722bd63934f503c43a5ee35d871355ee Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ddc1d4b0722bd63934f503c43a5ee35d871355ee commit ddc1d4b0722bd63934f503c43a5ee35d871355ee Author: Mitchell Horne AuthorDate: 2025-10-20 23:11:53 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 modules: fix some riscv module logic The change which enabled the sdhci_fdt module build on riscv inadvertently enabled the neta module as well. This driver is not needed on this platform. Move each entry to a respective identical conditional blocks. MFC after: 3 days Sponsored by: The FreeBSD Foundation Fixes: e9dd9f95f82f ("riscv: Add the sdhci_fdt driver to the build") --- sys/modules/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 02ed6a0480e6..3086be864307 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -683,6 +683,7 @@ _irdma= irdma .if !empty(OPT_FDT) _allwinner= allwinner _if_cgem= if_cgem +_sdhci_fdt= sdhci_fdt .endif .endif @@ -726,14 +727,6 @@ _rockchip= rockchip _imx= imx .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ - ${MACHINE_CPUARCH} == "riscv" -.if !empty(OPT_FDT) -_sdhci_fdt= sdhci_fdt -.endif -_neta= neta -.endif - .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _agp= agp .if ${MACHINE_CPUARCH} == "i386" || !empty(COMPAT_FREEBSD32_ENABLED) @@ -928,7 +921,8 @@ _nvram+= powermac_nvram .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" _bcm283x_clkman= bcm283x_clkman -_bcm283x_pwm= bcm283x_pwm +_bcm283x_pwm= bcm283x_pwm +_neta= neta .endif .if ${MACHINE_CPUARCH} == "amd64" From nobody Mon Oct 20 23:42:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmZ01RRz6DLsw; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmY0q47z3qZq; Mon, 20 Oct 2025 23:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xH7yKJXT2bvo8dpcVWPxDH7FyKKllvd0ZszaFJcTC94=; b=xUVxk9TvdLToeMvY4QSB5hu4d0GUdhCVm1tQrtOEOa4kilYK0f6PgF2yCZXQfArGUIwtKP yiy3Wx7+fLaBQfRWQiiUhmSwT18uoGW2TDnLKL4egSG2I5HAtQABPlWct4ZDhAemfrHi10 WGOi4L/m3/GmqzzYirvmK3fdnljcBGV5iWsvw0Sq7fHtAHdU+elKdOVFF6cshQRezgRU08 H5tW8hhdecRoO2BFgn71c9yxS3WmH83BlWml6SbXQS36FfuoODPvdVJWs9nw9oSCXAFv/2 jLwJcyXJcvcXFnTEOH8AQHieysZidYq2QDJXrBLlesuzI0s9lr92ni7nJNpRuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xH7yKJXT2bvo8dpcVWPxDH7FyKKllvd0ZszaFJcTC94=; b=qE5ELehj4SQMPS402ZX03ANHTxbamYCa8vnrTvNKl1qrMDxsE+GIlZtvjuh/CueYw9+auC Vh45LMCp2cmTvy/3iS/1fwCQ8THLkUgjCd7dXDQM3+maUolCgB4BwBYHjace4OW64ulHt4 i6F5umn6CPXcRu6dgtu7fAcuJnWARJf23DNJHdFa6VzE7lFZpuScKBUH71z3Wb5OIlgL65 7JFFb24W0G4cdLn8FfY5cznh+dKgreoS+jpRvEl8BHPikw97kVCybHstSWHvhww2LfrDIM Es1SidHcqknjP7+dJHizmvVYvuE4WfEDPSbAyXYV02U73nOmmGlK5UxHZ9rhHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003741; a=rsa-sha256; cv=none; b=msqJX0v39uKTZJzTDOIeBjRSSFOBxG+F6RAwQkO4K9UlseYyhDN8WERUErV3mGq/pq2eRK Pb5Z09d+9RvFhAU8jnoxc9/aZhQUJgPa0bXroEH44lCZKvjfOwUtwdqCmzt4pjqpachKFe 9vCmcRNrLyIH/cex4ebikDzyZqoCWMRnoXoRoPzbnp0bvNrYjTmD/JhL27IOSXlkKZbQ61 6kMW4HZ2eIAy3jCNLSEKvbPjEsXmOKhn/vQJ7AW3mNcB0OiG0GkESEbICTU8f2haNQCbxI RfHQ8Vb26IY4j5d9FRgDkdTNgkEFtPXBMSdu766oKMjctkyVnu9XgKFJI6hBCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmX6zC8zb48; Mon, 20 Oct 2025 23:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgK39091822; Mon, 20 Oct 2025 23:42:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgKOl091819; Mon, 20 Oct 2025 23:42:20 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:20 GMT Message-Id: <202510202342.59KNgKOl091819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 15c79c6fa608 - main - man4: move allwinner pages and logic to a standard place List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15c79c6fa60809a9dc627e5051704cf2a556c6db Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=15c79c6fa60809a9dc627e5051704cf2a556c6db commit 15c79c6fa60809a9dc627e5051704cf2a556c6db Author: Mitchell Horne AuthorDate: 2025-07-11 20:24:42 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 man4: move allwinner pages and logic to a standard place They are shared by arm, arm64, and now riscv. Note that they are always installed by default, where MAN_ARCH=all. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52585 --- share/man/man4/Makefile | 12 ++++++++++++ share/man/man4/{man4.arm => }/aw_gpio.4 | 2 +- share/man/man4/{man4.arm => }/aw_mmc.4 | 2 +- share/man/man4/{man4.arm => }/aw_rtc.4 | 2 +- share/man/man4/{man4.arm => }/aw_sid.4 | 2 +- share/man/man4/{man4.arm => }/aw_spi.4 | 2 +- share/man/man4/{man4.arm => }/aw_syscon.4 | 2 +- share/man/man4/man4.aarch64/Makefile | 6 ------ share/man/man4/man4.arm/Makefile | 6 ------ 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 6e076722c786..e94e832a3f94 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -69,6 +69,12 @@ MAN= aac.4 \ audit.4 \ auditpipe.4 \ aue.4 \ + ${_aw_gpio.4} \ + ${_aw_mmc.4} \ + ${_aw_rtc.4} \ + ${_aw_sid.4} \ + ${_aw_spi.4} \ + ${_aw_syscon.4} \ axe.4 \ axge.4 \ axp.4 \ @@ -962,6 +968,12 @@ _vmx.4= vmx.4 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "riscv" +_aw_gpio.4= aw_gpio.4 +_aw_mmc.4= aw_mmc.4 +_aw_rtc.4= aw_rtc.4 +_aw_sid.4= aw_sid.4 +_aw_spi.4= aw_spi.4 +_aw_syscon.4= aw_syscon.4 _cgem.4= cgem.4 MLINKS+=cgem.4 if_cgem.4 .endif diff --git a/share/man/man4/man4.arm/aw_gpio.4 b/share/man/man4/aw_gpio.4 similarity index 99% rename from share/man/man4/man4.arm/aw_gpio.4 rename to share/man/man4/aw_gpio.4 index ef9fc1fe2733..5cbc7562d9bd 100644 --- a/share/man/man4/man4.arm/aw_gpio.4 +++ b/share/man/man4/aw_gpio.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd October 8, 2024 -.Dt AW_GPIO 4 arm +.Dt AW_GPIO 4 .Os .Sh NAME .Nm aw_gpio diff --git a/share/man/man4/man4.arm/aw_mmc.4 b/share/man/man4/aw_mmc.4 similarity index 99% rename from share/man/man4/man4.arm/aw_mmc.4 rename to share/man/man4/aw_mmc.4 index e3f961fa5067..eb7fc9ce020a 100644 --- a/share/man/man4/man4.arm/aw_mmc.4 +++ b/share/man/man4/aw_mmc.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd Dec 25, 2017 -.Dt AW_MMC 4 arm +.Dt AW_MMC 4 .Os .Sh NAME .Nm aw_mmc diff --git a/share/man/man4/man4.arm/aw_rtc.4 b/share/man/man4/aw_rtc.4 similarity index 99% rename from share/man/man4/man4.arm/aw_rtc.4 rename to share/man/man4/aw_rtc.4 index 87212d85116c..1296cd41da68 100644 --- a/share/man/man4/man4.arm/aw_rtc.4 +++ b/share/man/man4/aw_rtc.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd December 10, 2024 -.Dt AW_RTC 4 arm +.Dt AW_RTC 4 .Os .Sh NAME .Nm aw_rtc diff --git a/share/man/man4/man4.arm/aw_sid.4 b/share/man/man4/aw_sid.4 similarity index 99% rename from share/man/man4/man4.arm/aw_sid.4 rename to share/man/man4/aw_sid.4 index 8b3691259f22..5cd2f3d5e072 100644 --- a/share/man/man4/man4.arm/aw_sid.4 +++ b/share/man/man4/aw_sid.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd October 8, 2024 -.Dt AW_SID 4 arm +.Dt AW_SID 4 .Os .Sh NAME .Nm aw_sid diff --git a/share/man/man4/man4.arm/aw_spi.4 b/share/man/man4/aw_spi.4 similarity index 99% rename from share/man/man4/man4.arm/aw_spi.4 rename to share/man/man4/aw_spi.4 index d0566a45b54b..f8985e1c16bb 100644 --- a/share/man/man4/man4.arm/aw_spi.4 +++ b/share/man/man4/aw_spi.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd May 17, 2018 -.Dt AW_SPI 4 arm +.Dt AW_SPI 4 .Os .Sh NAME .Nm aw_spi diff --git a/share/man/man4/man4.arm/aw_syscon.4 b/share/man/man4/aw_syscon.4 similarity index 99% rename from share/man/man4/man4.arm/aw_syscon.4 rename to share/man/man4/aw_syscon.4 index 97f01196a8a6..e32f329e489a 100644 --- a/share/man/man4/man4.arm/aw_syscon.4 +++ b/share/man/man4/aw_syscon.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd November 11, 2024 -.Dt AW_SYSCON 4 arm +.Dt AW_SYSCON 4 .Os .Sh NAME .Nm aw_syscon diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile index 0e85aab8b770..f35558d69a33 100644 --- a/share/man/man4/man4.aarch64/Makefile +++ b/share/man/man4/man4.aarch64/Makefile @@ -14,12 +14,6 @@ MAN= \ # for all architectures, otherwise arm takes care of installing them. .if !empty(MAN_ARCH) && ${MAN_ARCH} != "all" MAN+= \ - aw_gpio.4 \ - aw_mmc.4 \ - aw_rtc.4 \ - aw_sid.4 \ - aw_spi.4 \ - aw_syscon.4 \ bcm283x_pwm.4 \ .endif diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile index 6b046a1002a2..2be255ad913f 100644 --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -1,11 +1,5 @@ MAN= \ ar40xx.4 \ - aw_gpio.4 \ - aw_mmc.4 \ - aw_rtc.4 \ - aw_sid.4 \ - aw_spi.4 \ - aw_syscon.4 \ bcm283x_pwm.4 \ devcfg.4 \ imx6_ahci.4 \ From nobody Mon Oct 20 23:42:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmZ3MsVz6DLt0; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmZ151Wz3qH0; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGYDvGmrOY7Rv3mjDrXx+zed9lzfUztIIbG4EvYhxBE=; b=ptITgIqDO6hZUCHPaWfQlfXYAQ/0CisbL2QpWaLPul3zkgoZ0FmTNZGtItfZpZ7+rXzpjB UIjTlWqXnScHO3/khD1BAkUeBF5OaBiQv9PcN52QHHAi7Bbcv3TB/wnXSTDH0v8Fief1a9 PHPRq0HrPjYlPBENsDo7KLown6TxOZOXPj/rK/CdqbNAIeWK84INBnqzXp8OPR+/S2xZiw qh4egRKNzShRLzHb8CQKFCRcw/FA5Hi9ljnDj38EcuFxfzi+qoUIdoCIu2tNPXmnxyR8lp lujE5qIQNGM148H3AyWFyIKTn4kwBVxo7bfPmovhqdEAhqDMiLmtw3KsGaeXmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGYDvGmrOY7Rv3mjDrXx+zed9lzfUztIIbG4EvYhxBE=; b=abQavHtDgBfx1Geqgs/re51A/uiAWBj0fhL5DbO4V0EMY765ang/laeCOs6kqh/M9Ty2C5 VqmS7UcsRNDdO7MNr3TY7wEuhmvmB9FIttCM6Vbuf3dwcHRg1Y5Yw4OCVMFCNY/hOPIKBE O8PPhC225/fmseQWGOul+09SScXNADjPsGczSKUQp8clbaHOWrlvYs2h7hDPCC/SCxvQJU kGMnK3Xqgv0I+X0RC/Q/NmO3CXywekVoQeAhYOb/e6C6c2O0nb0qLqOx2oimJ+o5zUOFk+ TUz0X5f6mkR5R23uKN7nVwtYKcwYpsdFgDeabbdHEvdZoOWrPUbhzJykc+M/5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003742; a=rsa-sha256; cv=none; b=ucIwKedm4IgjKsFN3zat32EzlvcOPB3xg5WRkrzUmEXbfHwMaP3XbUXRoGhfUG6G7CbOYk R6UdemSyX6k3yF8H6SU5+pyXylHs08aeoylWyGDW2Hb1YjJlMXTRFJDPZeVQQUlSRlNVZV EH4buXYNKadiD0i5kfPUHI988OxyEgn4POSR/YJkCGg3NsThhXiNuJ9KBntZa6978O+wsy GTHLVDwQD8++oC3C9y1fEbhwxJUPDH/17xeVgWpC1gerqu+Pv28b7IPi8ofyc7xtCVLgXS K7Lyxzyh0VXK75/V/n747Q5biqkhYKb7zleHkEJJpspMJLHpj2WUhY8b/RNqiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmZ0dVzzbS0; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgLWI091855; Mon, 20 Oct 2025 23:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgLjG091852; Mon, 20 Oct 2025 23:42:21 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:21 GMT Message-Id: <202510202342.59KNgLjG091852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 67bc0e34594d - main - aw_mmc.4: add D1 compatible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67bc0e34594d69acd14e5d08e426fdd26f5b7e5a Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=67bc0e34594d69acd14e5d08e426fdd26f5b7e5a commit 67bc0e34594d69acd14e5d08e426fdd26f5b7e5a Author: Mitchell Horne AuthorDate: 2025-07-11 20:58:39 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:14 +0000 aw_mmc.4: add D1 compatible MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52586 --- share/man/man4/aw_mmc.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/aw_mmc.4 b/share/man/man4/aw_mmc.4 index eb7fc9ce020a..072835cce7c0 100644 --- a/share/man/man4/aw_mmc.4 +++ b/share/man/man4/aw_mmc.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Dec 25, 2017 +.Dd October 20, 2025 .Dt AW_MMC 4 .Os .Sh NAME @@ -48,6 +48,8 @@ allwinner,sun5i-a13-mmc allwinner,sun7i-a20-mmc .It allwinner,sun50i-a64-mmc +.It +allwinner,sun20i-d1-mmc .El .Sh SYSCTL VARIABLES The following read-only variables are available via From nobody Mon Oct 20 23:43:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBpB287fz6DLNx; Mon, 20 Oct 2025 23:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBpB1d2nz3sjN; Mon, 20 Oct 2025 23:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isCEJMDwPFKAxeKBWmpR4/AKr72YD/WYuiI7iYGi/9A=; b=yDMrkJ6/x+nMdpvzJguMN0oAXMjUscoRGlkHjlIdv72bj1Us85wectO67y2ix6KK63f43k oUhG3TOQiD6HmeS7VDYyypNawjTjic6I9yE+eMKTa9gybfaqiXc1hJrmeCiUSm2z2u0w+8 vC0b+Zcr3Jup2JxrNpP5STGi4pQgOQvX/Syo3PvWXQ+A15wbsuPBEEGo72ofXAaEyKlNK6 p7OHeljnmVVmvio1t91Z7ce6968hwEvriunUAd/E9xC5Y6dpgI2tKmjeeY0hDmse0Gyi5F 1cGf23C9g6e4ynRW5UHsE0aCxsTOHRqg4ffoycyK1GcqTlGj03hOV4fjZEckbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isCEJMDwPFKAxeKBWmpR4/AKr72YD/WYuiI7iYGi/9A=; b=GUNIA4p/gdWJwL8VTvxJ/4ptw9pmFjhrTC0kmHJ0FKbobmvubOG0d4zBpuXC+8JJFlGRQ+ lCGhy6AnWVQEFpCWznAzy6ocMvK8LB5z2E04VcTbcpDQFh0KteSUcwXRjRKFfijNJgLVeY bbZqRnD0Tn82QNeRi9BEWfixmmEKey7wYijDCBopuGx5vgzRonBVylPXL1AZVCuxuBhbOc a/HwwDgzRQ0hCf8I90QnjUEYgEkqMTvT1tB1tM3juUPRcpgCaUDwL3sBJr0uYFT5mfK4d+ 2fawYKIvrPcDajDsUtOkkoSR6QgWS2MvqmAJ/6PglCayxSzl1bCZ7VSXAxZBgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003826; a=rsa-sha256; cv=none; b=yxow//TOGzO681o4xOh8DuOXx5N46bS0gw+J2mOOjCZznhMUm2ebXQXaEc8e9PynDkLH3N n0b4rzu5SC898QtC1JcOpjoprU5kqAy+dAXAdsuqmWtPgv1BhEzX6yOwEODTf2TFh00a6o opPA9BMDjHOuPMrkN00nEOnESj5c+Koayw+Fwl7amDyC/socuNyYVEeqt0/Rz7zCEJEgET G1gFqUxTuX+/JYNkGioUP2ySYcxt/g05F33FFWAizudej5d5NHUqm2AR5swjew2Sh7iHrO VHfQ++Lf6ona//UHfLTljFGoftQbBtpUTiIWCnemu1M6M9fSX1d9k6xqIPZujA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBpB1B7wzb7c; Mon, 20 Oct 2025 23:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNhkAD092402; Mon, 20 Oct 2025 23:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNhkZh092399; Mon, 20 Oct 2025 23:43:46 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:43:46 GMT Message-Id: <202510202343.59KNhkZh092399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f34e152e025e - main - ti_clkctrl.c: fix paths in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f34e152e025e47b53b4a90464c49d09cadb3bbfc Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f34e152e025e47b53b4a90464c49d09cadb3bbfc commit f34e152e025e47b53b4a90464c49d09cadb3bbfc Author: Mitchell Horne AuthorDate: 2025-05-16 15:47:51 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:43:28 +0000 ti_clkctrl.c: fix paths in comment Now under sys/contrib/device-tree. --- sys/arm/ti/clk/ti_clkctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/ti/clk/ti_clkctrl.c b/sys/arm/ti/clk/ti_clkctrl.c index 72fa8548d4f8..06e558d140f2 100644 --- a/sys/arm/ti/clk/ti_clkctrl.c +++ b/sys/arm/ti/clk/ti_clkctrl.c @@ -284,9 +284,9 @@ create_clkctrl(struct ti_clkctrl_softc *sc, cell_t *reg, uint32_t index, uint32_ /* * Check out XX_CLKCTRL-INDEX(offset)-macro dance in - * sys/gnu/dts/dts/include/dt-bindings/clock/am3.h - * sys/gnu/dts/dts/include/dt-bindings/clock/am4.h - * sys/gnu/dts/dts/include/dt-bindings/clock/dra7.h + * sys/contrib/device-tree/include/dt-bindings/clock/am3.h + * sys/contrib/device-tree/include/dt-bindings/clock/am4.h + * sys/contrib/device-tree/include/dt-bindings/clock/dra7.h * reg[0] are in practice the same as the offset described in the dts. */ /* special_gdbclk_reg are 0 or 1 */ From nobody Tue Oct 21 00:10:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crCNy1Vbsz6DNv6; Tue, 21 Oct 2025 00:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crCNy0s9Dz3wZR; Tue, 21 Oct 2025 00:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761005426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoGiXVhi2PNvAtblmrp/Dz3SRMGrOugK4U0QH1qZ0oE=; b=eyEnYRXNIfeaw1EoU3Ahk/w+aZGlh5XPpdG4bimtVwk2GMQ9ywu9IGSjfqjNJ0KAsu5hT8 YiJxcnf9JHzDr+N8rPKJFBms3Au6Pa3SDYvP+cdC5TZamqRhuuDyb740g2Il+Jb4mhop+E 6wqL4rCuYQKMnJCPP828wttwhbtuALeh0FCWpCwx46ziCawM8Kfw5Cj8oNva6n4V93L/hB EMBrKMXywNLGyVgYQK3mV3lI7EQXIqq5OgqAAnd/KeSRMqF/L3MPDBpNiV6ol5/eYJmu1i M2i2ojyK6ej5ltT5sLuClJRjNs0NQ2toBumk6cAaZqGCe4qMLTAPYse9Buhiqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761005426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoGiXVhi2PNvAtblmrp/Dz3SRMGrOugK4U0QH1qZ0oE=; b=QdwWOMczR5yPPbb95JC4zL5XlY2JmKKBF3z1sLdmWbvlZ2aBuKCDVcNsjro3JVZYQsh5CH u7X0ad6o0745jOhXyHfZVLN007pMtoM95GmZUWD9ABNelWsaxfeHq1yVOg1FMSDu4KpoSu 1wXuUOFRzhdn2fjr4TZ0KrZTo0QyZKCbIVt63afJpeEuZRvvtO7TtxgZiBthUVy8r2efOG yyFPgDxqsz8DxtE1sYkNWuN/IMW33MRMd8wUOpTRn7egwSXR7TtgdnkuSnwnfH1ZTkBSR4 x9N/HgoPar08XyG2lYSGN6kXLPCcHTEw5bSQCcxURNiGczJjxzH23IhcHEDlVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761005426; a=rsa-sha256; cv=none; b=OeSvllCiPDfRrTjvKOtii4dmCgqgf2xBzEHhTToTNC74UImYMcH64/LZ2GDWHNVZX10Ba8 udEKfpjro+QvnG2w3CaiPQMBQOTVyuiJ8UOuSxkNWhG6rSiepeJlfAqB2l03EZOU7tey6h NYnlA6co2svlw0Szqp1c1Wub8vkWmsLp4zNfgTXHLagM658+BnYPI2Qq0jyDpB1Wk5pZ6b kj2c5dyovB6015mB75zBpA7cMf+UxQfwnTg6aBfEaD/Rsvgc0mh/ncXD6mYiUvTp3lEmi/ UYYdbfBgWIldj+zPvTfXmcXGbQsWOLFJz4VKppfK7RRphaZv4pQ9Lqp8wG9gpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crCNy0S41zc1n; Tue, 21 Oct 2025 00:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L0APnc041387; Tue, 21 Oct 2025 00:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L0APTK041384; Tue, 21 Oct 2025 00:10:25 GMT (envelope-from git) Date: Tue, 21 Oct 2025 00:10:25 GMT Message-Id: <202510210010.59L0APTK041384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 5f7d5709e0c2 - main - jail: fix an error condition that was returned without setting errno. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f7d5709e0c242d5a5fa5516d6079433ee06c347 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7d5709e0c242d5a5fa5516d6079433ee06c347 commit 5f7d5709e0c242d5a5fa5516d6079433ee06c347 Author: Jamie Gritton AuthorDate: 2025-10-21 00:09:39 +0000 Commit: Jamie Gritton CommitDate: 2025-10-21 00:09:39 +0000 jail: fix an error condition that was returned without setting errno. MFC after: 3 days --- sys/kern/kern_jail.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 00732d55cd46..267b60ffb5bc 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1088,6 +1088,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) else { if (!(flags & (JAIL_USE_DESC | JAIL_AT_DESC | JAIL_GET_DESC | JAIL_OWN_DESC))) { + error = EINVAL; vfs_opterror(opts, "unexpected desc"); goto done_errmsg; } @@ -2518,6 +2519,7 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) } else if (error == 0) { if (!(flags & (JAIL_USE_DESC | JAIL_AT_DESC | JAIL_GET_DESC | JAIL_OWN_DESC))) { + error = EINVAL; vfs_opterror(opts, "unexpected desc"); goto done; } From nobody Tue Oct 21 04:20:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crJxf3Mxnz6DmBT for ; Tue, 21 Oct 2025 04:20:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (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 4crJxd1YCRz3Qsm for ; Tue, 21 Oct 2025 04:20:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-33226dc4fc9so4708376a91.1 for ; Mon, 20 Oct 2025 21:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1761020430; x=1761625230; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=xBqpHbGLK+cwVpL/17YSug7JJJDysBFnlQTXKHN0gQo=; b=tpRo9Br2HpV7iDxzfCPytZAUpLH+J1135DC0ToeTvXsq8hnC5ATRlYrhZQZdQSClUu IUMRRnzq3tV/JHiuH9sDiwU8xUmxUPh85H6llBA9P93FDMErNAk9EXiW1F354UlSlORp eoKTCHwOQvanytvjDyY4cV/uMwpoa9lrU6DVrb2ZMw9EyZanMLkRV4ljKu5Ez//9cL5Z hOLLM7h5TGpaa7Y6/hIUd8igEMAU7k+67V2d4Ap1iijMzrinX99L07k5VOnhq2KTc7oa qzgtBBhAzvDAq99GvYgiMhCGobVpMkrY4kC8Brjq7M5TGz0G/3zlAzpaZqPLAh/RgV/q CT8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761020430; x=1761625230; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xBqpHbGLK+cwVpL/17YSug7JJJDysBFnlQTXKHN0gQo=; b=ntn/2rx6AieKRvbpXanR8PywWS0swXWHHbt6N+TcS3KXrB83ur2hueZiZ19BjwSIBq ggHrfh+5qJE1pJHKg1MokFHMhT90GCR1XcPvlwtGo1an4nGXOnEgXXxWlBSkkateCu2t RtaPBI1vM2sxUL01eYafIuRDB1exnlMA4CyHsp5MGt/+pd37aqoh+4pK7mzPAPsbgJYo PV+iuOXgG1eCJWxuQ9eFyBJyOyWju2HkSEBHts9B9JDuFLY/C6ue6rr93Nd++dlNIO0W lJL2dHIDaue73sHq1o3SR2eztAMgCcjP0DAaqkXh1D8aZq3HXUE8r3xZRLKoKjhNIvLe 8mYA== X-Forwarded-Encrypted: i=1; AJvYcCXP3VJSUQFRPKdtEsszrmdGHYPiioediUsLoAGC88NB+EAW7+QN9x7X0bbsn6tb5mRQz621bN67b1Q7N17CjN+nfpdd@freebsd.org X-Gm-Message-State: AOJu0YwBDL6N5YXBnChxucbhQH7vqxRVbBbJovbKDB7blQqi1ZqXFGmD cbwoQAcqR8j5XcotNQHqRhYo4+tvok1r/48NmZsB+JjILLlJ8aPqg0hKlZg7uNOMZjQ8y3FhlVf 1DkhEhSHYG1wtvzj6s0feXKhWHgl0HbTKSFojcFbRFg== X-Gm-Gg: ASbGnctnNDuL2DclASOFYAaQhwKaBPpl266K9MMbTyF3Gb3fEzSc059jc93OTpsDCJ6 zGQYU21OZeTlq9nzDwICZIo7w8k3SUawTNWAYmOFepLzBUP/ayqAsTuNnIKNe+x3PSgdK3lHCJl ISx+xr0j2Izv/v9PM3EPXRkPtohHtebgMHDuUKeTftfthTZbFtKNnQyVYlb5BF9dsCop1/sVRIW 7k9exDAv4EggB0lzEW5oW9t1vgqW59/FT8BLnqwLVpirDwB/nZO3FM28l8/BEuO6AuVNxrxKUMY JgiPoD0= X-Google-Smtp-Source: AGHT+IGH1+5PA9vxf2AXU0/4+gOqTgE3Df5FkEs/BS40E8e5mfwQHPJ7GKkk3HLhBd/gedG5mN34zJLglBzOqWcGAvQ= X-Received: by 2002:a17:90a:d60f:b0:32b:dfdb:b27f with SMTP id 98e67ed59e1d1-33bcf8e4539mr21012779a91.17.1761020430341; Mon, 20 Oct 2025 21:20:30 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Tue, 21 Oct 2025 00:20:19 -0400 X-Gm-Features: AS18NWCt3kPyOh3NFMy3RNzlGyHOAGfZd__KpX45HK-vdhCHzM-DuniPy7RLx7o Message-ID: Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase To: John Baldwin Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003168f90641a38512" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4crJxd1YCRz3Qsm --0000000000003168f90641a38512 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 20, 2025 at 1:44=E2=80=AFPM John Baldwin wrot= e: > On 10/20/25 10:59, Warner Losh wrote: > > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wro= te: > > > >> John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.or= g > >: > >>> On 10/17/25 15:14, Lexi Winter wrote: > >>>> Makefile: Don't allow install{world,kernel} with pkgbase > >>> > >>> Can we document how users who want to build from source can do so fro= m > a > >> new installation > >>> that uses pkgbase? I guess it is something like: > >>> > >>> - pkg install sources if not already (or git clone the right > branch/tag) > >>> - etcupdate bootstrap > >>> - (clearly can't just use pkg delete with = a > >> glob, so need > >>> something else) > >> > >> this should eventually be in the Handbook. > > > > > > Install* should eventually just do the right thing like ports: stage th= e > > packages, make the packages and the install from the packages. 16 time > > frame, though. > > Hmm, 'make installkernel' needs to still create kernel.old for those > of us doing development (or really, just running main. The tb(4) driver > turned my laptop into a brick recently and I needed kernel.old so I could > recover). AFAIK, pkgbase doesn't have any provision for doing that. Als= o, > `make installkernel INSTKERNNAME=3Dtest; nextboot -k test` is a key part = of > my workflow for testing kernels. I'm fine with using packages to ship > updates to users running stock sources, but please do not make it harder > to do development. > Yes. Though I'd hope we'd get slightly better BE integration. Then it doesn't matter... unless you're running UFS root... so something needs to happen. But it's not clear to me if the stagekernel stuff should do that, or if *ANY* update from pkg to /boot/kernel (or the booted kernel) shouldn't do the /boot/kernel -> /boot/kernel.old rename, sysctl tweaks so ps can still fine the kernel if it needs it. > When hacking on userspace components I often need to be able to do > just 'make install' of a single binary or library onto an installed > system knowing that a future installworld or `make install` will revert > to "stock" binaries later. Please don't break that. It's like when > I work on changes to GDB or LLVM, I use the native build system to build > the modified version, I don't try to hack up a port to build a package > with the extra changes I have either in a working tree or committed on a > feature branch. > Oh yes. I was thinking that only install{world,kernel} would change to depend on the staging + packaging and then accomplish this by doing a pkg update. The per-directory stuff I didn't think should change (though I honestly wish we'd have the 'stating' just be a metafile creation with a contents=3D tag in the METALOG instead of so much copying. Warner --0000000000003168f90641a38512 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Oct 20,= 2025 at 1:44=E2=80=AFPM John Baldwin <jhb@freebsd.org> wrote:
On 10/20/25 10:59, Warner Losh wrote:
> On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter <ivy@freebsd.org> wrote:
>
>> John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@Fre= eBSD.org>:
>>> On 10/17/25 15:14, Lexi Winter wrote:
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Makefile: Don't allow instal= l{world,kernel} with pkgbase
>>>
>>> Can we document how users who want to build from source can do= so from a
>> new installation
>>> that uses pkgbase?=C2=A0 I guess it is something like:
>>>
>>> - pkg install sources if not already (or git clone the right b= ranch/tag)
>>> - etcupdate bootstrap
>>> - <destroy the pkgbase repo> (clearly can't just use= pkg delete with a
>> glob, so need
>>>=C2=A0 =C2=A0 something else)
>>
>> this should eventually be in the Handbook.
>
>
> Install* should eventually just do the right thing like ports: stage t= he
> packages, make the packages and the install from the packages.=C2=A0 1= 6 time
> frame, though.

Hmm, 'make installkernel' needs to still create kernel.old for thos= e
of us doing development (or really, just running main.=C2=A0 The tb(4) driv= er
turned my laptop into a brick recently and I needed kernel.old so I could recover).=C2=A0 AFAIK, pkgbase doesn't have any provision for doing tha= t.=C2=A0 Also,
`make installkernel INSTKERNNAME=3Dtest; nextboot -k test` is a key part of=
my workflow for testing kernels.=C2=A0 I'm fine with using packages to = ship
updates to users running stock sources, but please do not make it harder to do development.

Yes. Though I'd = hope we'd get slightly better BE integration. Then it doesn't matte= r... unless you're running UFS root... so something needs to happen. Bu= t it's not clear to me if the stagekernel=C2=A0stuff should do that, or= if *ANY* update from pkg to /boot/kernel (or the booted kernel) shouldn= 9;t do the /boot/kernel -> /boot/kernel.old rename, sysctl tweaks so ps = can still fine the kernel if it needs it.
=C2=A0
When hacking on userspace components I often need to be able to do
just 'make install' of a single binary or library onto an installed=
system knowing that a future installworld or `make install` will revert
to "stock" binaries later.=C2=A0 Please don't break that.=C2= =A0 It's like when
I work on changes to GDB or LLVM, I use the native build system to build the modified version, I don't try to hack up a port to build a package<= br> with the extra changes I have either in a working tree or committed on a feature branch.

Oh yes. I was thinking = that only install{world,kernel} would change to depend on the staging + pac= kaging and then=C2=A0 accomplish this by doing a pkg update. The per-direct= ory stuff I didn't think should change (though I honestly wish we'd= have the 'stating' just be a metafile creation with a contents=3D = tag in the METALOG instead of so much copying.

War= ner
--0000000000003168f90641a38512-- From nobody Tue Oct 21 05:47:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crLt95H4rz6Dt62; Tue, 21 Oct 2025 05:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crLt93qHkz3ZfR; Tue, 21 Oct 2025 05:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761025665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zno43af1KJwN+fmypQRbBWG02kZ6R9LjQJ1Ik09Y5J8=; b=IfrAPYc6fYF+pmOtS/hmsNBbnEPq2wq9IRWtbCaOAHT0jp8vmxmD6gFUEFOBUy0fxS9pzz P8GH9FZk7zXjLxVRvGNLnAUVBl176ZkVrkwAYUjZNzNwU9fn5imHer92IAYonpk4nBUkUl xmap2ylYalnppjbHmuNI2/dCarj2iDsoNanWy2x5lotRNwMEQvyi99cA2b6h/x/NSys0IO hzc1DChtkx6SrV08Izj+RzoSN2jzQpRz/3fp///KvX7oqY6UONBARGpqd1fmtcVEMX5Z1C pypmtOodaC9olig5i37oQ27DvKKu7VI1Aq5I9TWs5sJmQ/Et8cs1Hdjjq5l6dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761025665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zno43af1KJwN+fmypQRbBWG02kZ6R9LjQJ1Ik09Y5J8=; b=MYkFzytO1nI0bwWgX5YIW83M64gPMHUcpAN71h+chF31xcx6aESI/MiAiAwp1JBeKLLwyA rZf/bk0kI9UO9Bucr7NmQIg3DX1z7VHiuFDy3hG0hua+KzmJolpaJIfaanbsgburkklakZ 91kZBHaoVj+LZVvh0WV7tyhESKJIW/rSMQMXsUmxRrDjp+vZOelmNAK+GHatNRklJGWVML xJDqLUkAHyynPhXyCGfZXhjBVBD6g81I6w2OBI9e7RWJ7Bw3kWAr8G9nvL6FYGX0Hp++C8 vkZ0E4oZNySCA62BIJ04JdekBVum5YzuNiqj0PrqeSIZSx1ifJNZ+lusZgohGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761025665; a=rsa-sha256; cv=none; b=pon3ckwSoimiKZNDFeTr2Pep1wLgff2Fg96+dG71CRtySR0RVHgg6k76n7gmJpGMxHSxJG 1C5TO9zF6UpCd/Gg0T+nQ+qWgYJQIILvlrvoGZpSVGsATCXN5E3rvdaU57yQ6vGf55LVQF tr77cEzSzlqngOumiceceOppCgOgkYtYxT1yaBwL894H1N8fx33KT5k8hqtdIpGQwQGoTl guy8GDZeZQ0I2SrMUggWX76b+T3t1Tx/ZW225jlPfumTBPx189tSzbF0Tnv8BYxbrQRkdE Wr7ePiHIKcFyfQ4wvMbwyZiBw3XybFM5xJ6UCvnSmHuDUaSUyWD2Ftqj01jmnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crLt93Jfwzn7G; Tue, 21 Oct 2025 05:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L5ljcs072100; Tue, 21 Oct 2025 05:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L5lja1072097; Tue, 21 Oct 2025 05:47:45 GMT (envelope-from git) Date: Tue, 21 Oct 2025 05:47:45 GMT Message-Id: <202510210547.59L5lja1072097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 07d7f0e07b84 - releng/15.0 - fwget: pci: mediatek: correct package name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 07d7f0e07b84abd501deebdfa9184762d6526374 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=07d7f0e07b84abd501deebdfa9184762d6526374 commit 07d7f0e07b84abd501deebdfa9184762d6526374 Author: Bjoern A. Zeeb AuthorDate: 2025-10-13 13:15:58 +0000 Commit: Colin Percival CommitDate: 2025-10-21 05:45:01 +0000 fwget: pci: mediatek: correct package name The port is called wifi-firmware-mt76-kmod not "mediatek" in the moddle. Approved by: re (cperciva) Reported by: Lars Tunkrans (drsnx60 gmail.com) Reviewed by: emaste, jrm, imp Differential Revision: https://reviews.freebsd.org/D53067 (cherry picked from commit 10d88a7aa670a3cc2bf763e64bd292b4caa3a811) (cherry picked from commit e0487486279bc0690f65401622deebdbdea6a882) --- usr.sbin/fwget/pci/pci_network_mediatek | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/usr.sbin/fwget/pci/pci_network_mediatek b/usr.sbin/fwget/pci/pci_network_mediatek index 653c87c410eb..e1e15dcfa2e5 100644 --- a/usr.sbin/fwget/pci/pci_network_mediatek +++ b/usr.sbin/fwget/pci/pci_network_mediatek @@ -38,24 +38,24 @@ pci_network_mediatek_mt76() # { sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh } ### >>> - 0x0608) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x0616) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x0717) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7611) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; - 0x7615) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; - 0x7663) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; - 0x7906) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x790a) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x7915) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x7916) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; - 0x7920) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7922) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7925) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7961) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; - 0x7990) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; - 0x7991) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; - 0x7992) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; - 0x799a) addpkg "wifi-firmware-mediatek-kmod-mt7996"; return 1 ;; + 0x0608) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x0616) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x0717) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7611) addpkg "wifi-firmware-mt76-kmod-mt7615"; return 1 ;; + 0x7615) addpkg "wifi-firmware-mt76-kmod-mt7615"; return 1 ;; + 0x7663) addpkg "wifi-firmware-mt76-kmod-mt7615"; return 1 ;; + 0x7906) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x790a) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x7915) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x7916) addpkg "wifi-firmware-mt76-kmod-mt7915"; return 1 ;; + 0x7920) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7922) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7925) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7961) addpkg "wifi-firmware-mt76-kmod-mt792x"; return 1 ;; + 0x7990) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; + 0x7991) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; + 0x7992) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; + 0x799a) addpkg "wifi-firmware-mt76-kmod-mt7996"; return 1 ;; ### <<< esac From nobody Tue Oct 21 05:47:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crLtD01PLz6Dt63; Tue, 21 Oct 2025 05:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crLtC5Lshz3Zqv; Tue, 21 Oct 2025 05:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761025667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcMJ9kmFZu4J7k54V/4erqPMklYOLXGWwRGz8Nl61BM=; b=XFZAsRqU9vh6a636aFKR0LEZa4pH4PnXto2EMdaXhorm2UiiO6BU9vt3GfxQhkT1TR4N6o 6fx2fuWx8C42xaWI3BnH83p+ngcww+Fj5XSZhFcyWBwPHY8Eo676YD9qDhKAsKJ/b9rudk hJTkC02A2NJ2RRqy3nqplS0kng+yQNKqrt4wFmPXyzDOjUBEf0DLMkg17Co/zx/EvRbPm4 KSv+gxehuvIXDeXo/yQGwDNHz6zzYrpBNiV//QF/Q/PHIEGkfn2uXxmYy/8BgcMl2lz1Js aT/PAG3ylIocOERIs/vNOKlJYayiguAibElf1RyP5qor7/6QT+6WyjWvfDaAdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761025667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcMJ9kmFZu4J7k54V/4erqPMklYOLXGWwRGz8Nl61BM=; b=DnvO/HT9aFMXHadyEmGr+gZcmci9pFXcmg3lLnJf+0wMimYzcN4F0Fju79dNcpJ/gg1ujL 4tbS6UnNQ2rmbqEnX7fLVKnJcnNqzy9YuH+ojcNZF4M8X6pneHYlLPW9zusDLzo6ckLQyB n/CjxGPJUzqoRHDGtrG19DUnoFIUTpoleuFLswrcqkar7tYIPcyVbHZF2jIikNS12SZIK8 QnATBJzgfRWa0gxhrQrupvPJBrdkY3ux7vgpFqhe0RRS3Qz8GCT5OKrmn0rpvvVlnGWdUL aSNa04Cr4x5t5u6N4ZPo00u7RDNd8IkrqWKjeXbaTCjd4cx1Gj5zyNsOzdcjFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761025667; a=rsa-sha256; cv=none; b=lmku/RDsBTt4jb0A0/yplIAJdTIs6nw0xp0k0B9cA+W2m89rZQW0zCGMIgVH5uRfZcct6k qmoo7wEqhBTEv1XmeAEbv7U+4dnoroy8JKP87XOOqu67AE1PHcRUl9wdx46i+X0pi+FQif 5tUTFxEfOGM2lRuO3CYS3qaQYljnkBSxexEUKTVVTBovRG5k4Nddlz5tR7nPzxVHES8N7t eV6+PkkStYDXFJFpHPS04ThDZ3hhYiEiZxa16K1dS69EoT0AoinBjVrQM2jAoUXZmbhpaL OGs3mozWKMJWtDocPrpp0TF5TAd10SnQ8GKlElcYqaJa5CIW7QdfapoMcC92mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crLtC4vrpzmnj; Tue, 21 Oct 2025 05:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L5llC6072167; Tue, 21 Oct 2025 05:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L5llEG072164; Tue, 21 Oct 2025 05:47:47 GMT (envelope-from git) Date: Tue, 21 Oct 2025 05:47:47 GMT Message-Id: <202510210547.59L5llEG072164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: cafb77e9e0d4 - releng/15.0 - pci: add quirk to disable Function-Level Reset (FLR) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: cafb77e9e0d495408666cd99d9d2f5eb8e768735 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cafb77e9e0d495408666cd99d9d2f5eb8e768735 commit cafb77e9e0d495408666cd99d9d2f5eb8e768735 Author: Bjoern A. Zeeb AuthorDate: 2025-09-25 12:49:07 +0000 Commit: Colin Percival CommitDate: 2025-10-21 05:45:11 +0000 pci: add quirk to disable Function-Level Reset (FLR) MediaTek mt76 WiFi cards are advertising FLR support but after issuing a FLR the chipset is gone. Add a quirk so we can disable FLR. The current reset code will automatically fall back to a power reset. This makes the card show up under bhyve where before it would just not be discovered at all. That should make wifibox work for it and will help development for a LinuxKPI based mt76 driver as found in framework laptops as no dedicated machine and constant reboots are needed anymore. We will likely need to add more PCI vendor/device IDs once we can test the other device IDs. Approved by: re (cperciva) After a lot of help from: jhb Really implemented by: jhb (I just typed and tested) GH issue: github.com/pgj/freebsd-wifibox/issues/73 Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D52728 (cherry picked from commit 4c0e53aced2251eb5ac7eca44e13a6b947be8582) (cherry picked from commit 3bd015a1a918d060dbef556ddfa6e236f5212330) --- sys/dev/pci/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 9e43a4c1909f..cde98cb62cef 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -240,6 +240,7 @@ struct pci_quirk { #define PCI_QUIRK_DISABLE_MSIX 5 /* MSI-X doesn't work */ #define PCI_QUIRK_MSI_INTX_BUG 6 /* PCIM_CMD_INTxDIS disables MSI */ #define PCI_QUIRK_REALLOC_BAR 7 /* Can't allocate memory at the default address */ +#define PCI_QUIRK_DISABLE_FLR 8 /* Function-Level Reset (FLR) not working. */ int arg1; int arg2; }; @@ -319,6 +320,13 @@ static const struct pci_quirk pci_quirks[] = { * expected place. */ { 0x98741002, PCI_QUIRK_REALLOC_BAR, 0, 0 }, + + /* + * With some MediaTek mt76 WiFi FLR does not work despite advertised. + */ + { 0x061614c3, PCI_QUIRK_DISABLE_FLR, 0, 0 }, /* mt76 7922 */ + + /* end of table */ { 0 } }; @@ -6740,6 +6748,8 @@ pcie_flr(device_t dev, u_int max_delay, bool force) if (!(pci_read_config(dev, cap + PCIER_DEVICE_CAP, 4) & PCIEM_CAP_FLR)) return (false); + if (pci_has_quirk(pci_get_devid(dev), PCI_QUIRK_DISABLE_FLR)) + return (false); /* * Disable busmastering to prevent generation of new From nobody Tue Oct 21 05:47:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crLtC0RP0z6DtWb; Tue, 21 Oct 2025 05:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crLtB4lScz3Zkq; Tue, 21 Oct 2025 05:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761025666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZGsRm3rECehVb0dLZPwfJR2SMPafAEUK0qOD483inw=; b=uEMdaOXYU8Z2hVc8+X+hzJ7Xi1qH8DqUpmqLByGcJK3DwdLysr7j8uZ4XurLDjl0zfhZYV C8eJh3/W8MgR+pC9KrrdNvVjuPU1ENa0FVJsq12Qts3XFSu78z7TSU4bSt1B+h3aJnIr3Z 2HurK+d6bj/L0hW31f+Y4XehCtSesx9qT1NulZEILZU7Qw1GvG0knr3tqQLqtFCfazovWG t/IMLwSH/7wNYj3iM/O8V78+ibILestA/rpZT1yyU0G6ISW3Fip3qIW37CEKfL9KGFJoJ6 eVkSHoS5n5uNSOoDV+/p2Z+m20abOESfzc4p2d49/zRjPUxMEC2ZFxwolGQWCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761025666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZGsRm3rECehVb0dLZPwfJR2SMPafAEUK0qOD483inw=; b=vTWZkoKWfdIaSPHRPSPHlteraplSTLhSCC2LSQxGCKcGKWb52h/1HcMn9YlQa2fXNq8akg FB5nIP9ny0E7WkId54sdM64ZJzRG50tEkS2J1qn52HHflbCDvAnqpe78e8twQ5pHIQfqIV cHo8MRPWGrW3nWFHlJw39OYkx8JdDSf4haUwCRIYfxfnasrbmgnuK7QhXURaCIsEDX06MB tp2W7JEOLigYiBrrewAvLyCZ6ufTW6YMjOKOeM1FelLAUuTwni9bi3NsW/rqBufNHjowmM lFNn9LPjENOLvVJdcaEbjpXIO0lYjKTeyEPa/3MlstTAo0tV+hLxHRepCKo+gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761025666; a=rsa-sha256; cv=none; b=dmn02/xM+d1mA5pCIPyzYbzG4qweCcf1stThCBvZUE+zdtsuzog8/8YRt2J3rT5oWdoHz3 Ix7jSLYPfvk/uDw+z+HJDl8dKBCuxgoc8OMfyTr4wlLm/ftoOyPHB/r+OR3+GlBPTVukdw slEXPcZ5lVp3wmBtoh2TXqQ3YovNW+G7+BeetGHxgMnmpvQos1x0GLijNFXqpqHVztIiSx QOJVBFfGBxaodMXJ99szeLf4nciD7WwkLqS9r6KhHX/a3rsJ9mFS7UyK3TqmFYQHOnXk9h QbIdiTkuys++6NEbhNUadyQYPTVaCIK9/tYJTjShKsQWrWSftvhdW1LJIbCP2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crLtB4Dqhzmnh; Tue, 21 Oct 2025 05:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L5lkVL072134; Tue, 21 Oct 2025 05:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L5lkAl072131; Tue, 21 Oct 2025 05:47:46 GMT (envelope-from git) Date: Tue, 21 Oct 2025 05:47:46 GMT Message-Id: <202510210547.59L5lkAl072131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 71f065aab558 - releng/15.0 - dc(4): fix argument to if_foreach_llmaddr() for 21143. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 71f065aab558123a35a885b1a9e205380fd551f5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=71f065aab558123a35a885b1a9e205380fd551f5 commit 71f065aab558123a35a885b1a9e205380fd551f5 Author: Chris Johns AuthorDate: 2025-10-17 12:38:30 +0000 Commit: Colin Percival CommitDate: 2025-10-21 05:45:08 +0000 dc(4): fix argument to if_foreach_llmaddr() for 21143. As found on RTEMS the argument to if_foreach_llmaddr() was wrong causing crashes. Approved by: re (cperciva) Fixes: 51e80820552e0 PR: 290314 (cherry picked from commit 33afdf0e356d84ffe5c62c886f84cf12ba147d3e) (cherry picked from commit 10c71151ade7b5f021b49b7e117059730a2ddb56) --- sys/dev/dc/if_dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index bed74c3b6181..5c1d7ff30976 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -999,7 +999,7 @@ dc_setfilt_21143(struct dc_softc *sc) else DC_CLRBIT(sc, DC_NETCFG, DC_NETCFG_RX_ALLMULTI); - if_foreach_llmaddr(ifp, dc_hash_maddr_21143, sp); + if_foreach_llmaddr(ifp, dc_hash_maddr_21143, sc); if (if_getflags(ifp) & IFF_BROADCAST) { h = dc_mchash_le(sc, if_getbroadcastaddr(ifp)); From nobody Tue Oct 21 07:53:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPft0dCzz6F3Gh; Tue, 21 Oct 2025 07:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfs4py8z3m4W; Tue, 21 Oct 2025 07:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbIiIc1gHhiWEuUhq+QeaH4U2dyBygCO8g5pb/wW9+s=; b=Fhnn7vpcHNZdoW58WfkqcACtgLUI08VK7uAFlIUrOKHZLGaYzaxTW0xIyCKJC3INEvJcYz SSveZpxWx+N1iSf3t2UHAbLBt9TDj1l6Q4R+httjFbByBMPe5fcClfCowbBsPKlXmsODpm I1NNdkVqFC81rUiAGMzKUBZVx3KCZFenN6m/qHF61uB7EkM8/xuXIwkrQInUcf55u9M2+Q MIj+KdmtZRe96T2JWzPOg4VG+9pv/JWRznyJ3lwLZm53aE5tmCqXltwotdyKXy8Kj6fHgK PvwA5o3/ENIwIh7TOMOZMIUE6gqpexEhfikY+Y4QsNNWeXJo7BPPcmGDNjdLWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbIiIc1gHhiWEuUhq+QeaH4U2dyBygCO8g5pb/wW9+s=; b=Cm/gXms4LMNj5Xdp3jPWzUlfafp3wj+besaZLsH+Vta2kjjV5qwa+LBNAj/shJvh34aITS YE7hzUZjyGN+IMLYqZVRMYFWRtmNjsqfEloUUnsFQ7xCb9iZonIGdA+5WlSy6LdkG0RBN1 uAyvKGDdRhdlCEdiqi0WeDg4ekXPJU513e2VqBCybvO53wV5Ly24ZjId56Gh1N3S+6kspD zSGP5jKdPVFUjPSShAXTPHx3caQtxch79yo+xSbqA2fyp62dWIf0rFd0APBocOn1dYRgCQ tA1tm7iQa3YV8NQVNVClRevu33m1OYzFsLvUj/ySAckvgTipe/SFHw5aV4lG1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033189; a=rsa-sha256; cv=none; b=o1gnVxoHhiSg0Q3Tv43N5H0NBDu8mUtqrQ/SNpuuh8KlfNg50c5mlriamDQeJTosnOglK3 DOvQ/fim6iX23wuJG63a7ayqypUh0cnEIR+3AoMVsgLaY1imQ9z+U3amuPBSr3p6ypkE7j /CCv8BSjeN0ryUgG9bczyhQlAS5RspfIx5UOBwcmMskDaIvDLgJM4SEM9xojGsyuJICUtB pBwPmDL3RinqnuAQfPDZ/h2o9K308Eh9jyd4PVSlhPiGmw+WYc6SHvyor5riSPIlCZmSpA eCoe5ss6+NJi9Wtlo08ZdvMfeoAdL+o7ORLhnrDn6B+PbzZbUEXe+lLg/ZPOdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfs4Qq5zqvf; Tue, 21 Oct 2025 07:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7r9Kt014417; Tue, 21 Oct 2025 07:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7r95x014414; Tue, 21 Oct 2025 07:53:09 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:09 GMT Message-Id: <202510210753.59L7r95x014414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0ae4998423e0 - main - LinuxKPI: platform_device return type change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ae4998423e0d513fb88e404dfb1c2a285d11309 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0ae4998423e0d513fb88e404dfb1c2a285d11309 commit 0ae4998423e0d513fb88e404dfb1c2a285d11309 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:24:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:39 +0000 LinuxKPI: platform_device return type change The return type now is void; I believe no one ever used this so we can just chnage it. The only active platform_driver_register() calls seems to be in ath1[01]k and mt76 and there in unsupported code. MFC after: 3 days Reviewed by: dumbbell, emaste Differential Revision: https://reviews.freebsd.org/D53205 --- sys/compat/linuxkpi/common/include/linux/platform_device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/platform_device.h b/sys/compat/linuxkpi/common/include/linux/platform_device.h index 6853e709cb70..dba79f5936cc 100644 --- a/sys/compat/linuxkpi/common/include/linux/platform_device.h +++ b/sys/compat/linuxkpi/common/include/linux/platform_device.h @@ -39,7 +39,7 @@ struct platform_device { }; struct platform_driver { - int (*remove)(struct platform_device *); + void (*remove)(struct platform_device *); struct device_driver driver; }; From nobody Tue Oct 21 07:53:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfq4dtlz6F3V3; Tue, 21 Oct 2025 07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfq33fNz3mS5; Tue, 21 Oct 2025 07: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=1761033187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33bGpX8jwkJWEh64RMLwvonnifsKPnl0DGY7umJqyK8=; b=nTQT3izzoR5Nn0Luqp8kCdiFna6VxOvJZcXq4IwTrERVfjGU3WLtknbetSP3IfvE6bSrZh t/l/YEug8u4aoksGhSeGHqMkK4xUNMMCtDkH9jimJXJH9DrggCd1LKJWuPMb1iAHCWfVzM sEAtEFqnGL5F7GPhNBchsMcB8zbYksPiSmPHqBikqzTFVki47gwsu6Dds1KOrShihoP21E QPywDKftqwHOqPoEm+AGZdu+Yane48WornaurlLgwyamjOaz4PP1WF3qsUvhByHif4nM3s lVPcbc6vPhcpjwPysxe8e4gZrqbiUD+wUYusQN97Z5H7HNNa7XQwjMEkqMHinw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33bGpX8jwkJWEh64RMLwvonnifsKPnl0DGY7umJqyK8=; b=Iq/89DccOKq2rDfhW11taJNI2zuqzmif8Ih3FjkH3A5hAVNETgdYVrxBe880z+OAyL4bAg GIAhqX+H3zUkYcTXrH4SDadCMNHy9EMiCJoiNHVi8YNQWGIsz1mb02vkBv7hjuHKkPcmEM JVcJeQA85/Ov7h3feAk7ul+cqadw9VBk5d2/zK/8UXff5IMlV89NfdPQSe5S4OojuqH9kp 4KhsMy2964gQ/iXQOFPjI+oF7p9jaMWhBe5xAueWflCfkjdXJzYvN1k1PaO+ZKJO1aVAEc ENFs9sENuADyz6Iwx3cIUPnxQ1zz/6vBbWf+jDh2qrrfhwXiR682g4RxucAcuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033187; a=rsa-sha256; cv=none; b=OCJopl1h/J+4Hv6R+zsGC1OpkuTCIsoFFYxGfqTY+2hdWD0bbn/JLVqZz1JpZJiZp/009j cLTkx9dnPJC/UgoTnAYHw3KFV3fSK+todHnY0p/sfZb1CuEuk/0jY+sBTQ79/xaankOVWP o3HK6xhLe+1ZpruBjzKdhoAk70AK0TbyRMN34lI6DmI+tOQ9/Wt8Ua6lhcn5T0MTIpZDCU FpOvnoThYBYVCRRpmHyOQFSckqOs0I+IAuIHDRRx2j4p6DDAvYZohfNU8BqbQltNLRzZIh Jt1eXG+5IBcPcfjVVKPOzFFO0cgzA0w4i2eSr+poKVIvUYYWnDtvoM6FlPB5dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfq2dcYzrQP; Tue, 21 Oct 2025 07:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7r7Hq014338; Tue, 21 Oct 2025 07:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7r7dG014335; Tue, 21 Oct 2025 07:53:07 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:07 GMT Message-Id: <202510210753.59L7r7dG014335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0a4b11ddb298 - main - LinuxKPI: add __counted_by_le() and __counted_by_be() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a4b11ddb298fa08e1a81af7337995a3769552bf Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0a4b11ddb298fa08e1a81af7337995a3769552bf commit 0a4b11ddb298fa08e1a81af7337995a3769552bf Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:22:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:38 +0000 LinuxKPI: add __counted_by_le() and __counted_by_be() The former is needed by a wireless driver at v6.17. MFC after: 3 days Reviewed by: dumbbell, emaste Differential Revision: https://reviews.freebsd.org/D53203 --- sys/compat/linuxkpi/common/include/linux/compiler.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 948396144ad6..4146c829b936 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -31,6 +31,7 @@ #define _LINUXKPI_LINUX_COMPILER_H_ #include +#include #define __user #define __kernel @@ -79,6 +80,13 @@ #else #define __counted_by(_x) #endif +#if BYTE_ORDER == LITTLE_ENDIAN +#define __counted_by_le(_x) __counted_by(_x) +#define __counted_by_be(_x) +#else +#define __counted_by_le(_x) +#define __counted_by_be(_x) __counted_by(_x) +#endif #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) From nobody Tue Oct 21 07:53:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfr54xcz6F3XF; Tue, 21 Oct 2025 07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfr4GWzz3mX9; Tue, 21 Oct 2025 07: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=1761033188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ARoujXtYKPpPvHxfDxlHh8PphkxpRP+sleTv3AL/zGY=; b=p49pzmNMocElli7mVv3atnSEEh0tlAXgrN4zaOtbr1ZI0fWCEbwaviOnFm3laR3g+DwR30 7GzbUfzU6LeWKpmmRekEHJ++M5r7WVoweHmp3/D6jnfzXPzi42jfq8ihmHZb+BdoTrAB0u SxIZs/HwNknQrvBeN/ki55q3/H0kBgTWZKI0+MgpcnmvV5X0p2f35RsUQ2YIp5hfOBuGXy IhoM/bDBSmC7skR1f6HfXEvfYUPu7Mg8guUixU5nqvbhDDsriWjx/y2Hgd8+Tdwx7Y7o1Y L026+1iVNwPy833qLW+Z5wZepZkl/sXvLkzyD3phPhCC02SOBXnby29dKc4EOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ARoujXtYKPpPvHxfDxlHh8PphkxpRP+sleTv3AL/zGY=; b=K/6huyQAxwdXCj3ye4qaIDSYyZSXGNEgmQH9pYDF+pdEpJLU9W48laWzr0cN+suUTdstRu aTJbMKkHtAexvgzy9MmCAO0LTcKVBKmdFzKl1XTMewAzywOzJaLbOBK8qt4xZaJMvyEhAG BLMnGMHPA+LMhzdDtPH52mOH6p8Y5C02F6q5blc9YcAX7MXxAgOaZcGwh7gcgARhhtPjsx 7JH1si/3SNzhzvk1NIiD6P4UBLobxFmIiNs9kRpHLwOkK8vYOVtKOrQrbUgOL2IocT8mCH 8xwAvWby+7WaPDs/1OnS4t1Naz+K0avmXp4ZAvgQpVzAEELBE9IgZOXgXTHEyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033188; a=rsa-sha256; cv=none; b=dqEXsA3GMwqI36jb7u1V2kgytST51wb6FFEUrXYgl2yAO2ZOC1svIKf7QVfdn5FTFBpRil tnxjmfyh5C1NqL72HMxLPtWKJ5JcBCtWsD2sBDzv/Cz71KhhhBK9EJoJfQkZL/HS3ZEdNy EIG0DAT/YhcIzIygzyLBe4dFMMNSgyOlr/D3k/QTE287ZVhaxmzbJbu3wjEoQ9A7Lv7n8o DgNa5eGKSMCmEKMNX9dUKbXwd37EdZcZ/Nm2WqE01NdiBGtzrBIvnkEpaAXgYiR13bSyOe wN0d8SIG7q1+nvpezrqGS2q0AtbSVf9WqPevOIc64Oa1T2QPvWKIdSes0aGUZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfr3skwzrP0; Tue, 21 Oct 2025 07:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7r8dd014376; Tue, 21 Oct 2025 07:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7r8RJ014373; Tue, 21 Oct 2025 07:53:08 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:08 GMT Message-Id: <202510210753.59L7r8RJ014373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cc792250acad - main - LinuxKPI: add three skeleton functions to etherdevice.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc792250acadd29e80a69501ad326d1340c0c1c6 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cc792250acadd29e80a69501ad326d1340c0c1c6 commit cc792250acadd29e80a69501ad326d1340c0c1c6 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:22:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:38 +0000 LinuxKPI: add three skeleton functions to etherdevice.h We will see how much we will need them and how to fill them at that point. They are left with a pr_debug("TODO") for now. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53204 --- .../linuxkpi/common/include/linux/etherdevice.h | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/etherdevice.h b/sys/compat/linuxkpi/common/include/linux/etherdevice.h index 1f2d6cf22d7e..b9a4951de8ac 100644 --- a/sys/compat/linuxkpi/common/include/linux/etherdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/etherdevice.h @@ -27,6 +27,8 @@ #include #include +#include +#include #include #include @@ -137,4 +139,25 @@ device_get_mac_address(struct device *dev, char *dst) return (-ENOENT); } +/* Returns network byte order. */ +static inline uint16_t +eth_type_trans(struct sk_buff *skb, struct net_device *dev) +{ + pr_debug("%s: TODO\n", __func__); + return (htons(ETHERTYPE_8023)); +} + +static inline void +eth_hw_addr_set(struct net_device *dev, const u8 *addr) +{ + pr_debug("%s: TODO (if we want to)\n", __func__); +} + +static inline int +eth_platform_get_mac_address(struct device *dev __unused, u8 *addr __unused) +{ + pr_debug("%s: TODO\n", __func__); + return (-ENODEV); +} + #endif /* _LINUXKPI_LINUX_ETHERDEVICE_H_ */ From nobody Tue Oct 21 07:53:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg15ks8z6F3hc; Tue, 21 Oct 2025 07:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg141ywz3mSL; Tue, 21 Oct 2025 07:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DM3BrCPurkMNMUwG9Jmt4tzpZD/Hd6r7L8E3+2xig0A=; b=a8qO6hbx6MbGCt/svxl/HubJHFQixNtvBBRvNzhQwCUosn5w8nIVD3BqLqVoAVOw4j+rup 3hGd6oKMjMU6l91C05Ngn8how8Zu8dn71xP/7V6azEDr8T3qEh6+CTVl0Dn7PQz6VDSLZg jzvwW7N9FdL4ZyJForDSW8T66Rtl0LP+GBQiIRuNpF862Q/vKXg6Dcg9A2LpzoEiKkgnYE 8dZIjpI9DurUpc+L1B1xsSCNDrjeqB1P+XiRWc2kUOj505K8wEQBVIL51lTvXLwVE6T8Pf BLceehfjSOwtvkzrteKG7BdBNrsT9cviH7gYxevuZcHID1YsvIG7rqplI/fikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DM3BrCPurkMNMUwG9Jmt4tzpZD/Hd6r7L8E3+2xig0A=; b=LA+AbAOqfVDeOJREHETgPXdq4bcMI2XaUavNr659b6wRUInGutMGiKlnwgy83YElefM1Jt jX1H6K7U9axj+PUUFg9aRdnX2B0g9jl6A9G4JtNV/UUoN+j8rjvdyV92M6zi3xJDuv1KtK x7BqTnxiySQzXwQCr6APB7ZwAxIWCjeOXPtycEwSsF9YUvBasDsczuRDeDoJssUcBj/hR4 xiV9z2pMpoPrDQa1wo+sGlPVjsRM65EUeAydpY884Vtr3Z6NW92KFmqABi7BPj6MiZoG46 Gx5ubJIuS6CXS3IEnQPysJreg9sfcEITBRbCX0j9hQSkcGCmm0S6hGxD33W0NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033197; a=rsa-sha256; cv=none; b=JNoEn5N+TmYNi6o36DuCatdZe4yVsPR4FXVbUpW4KJ1G7o9RZMwYrvmBSmB+p82auYUamS QmAaW1lgi3MsNeaX/M4/W98VZx+14lBSiDwKL5MWWJNTgtRkuWtnH5Xw6pOCkj40anuGOo XfB0BZYGby4Fr44hvc7/kMW9t354MxN8YieSn30K1jsa1pJTRN91pQ7f9H5FmtP61hrGTm sl+XukXtDd5COdtxrX2+PJLqO7nFJUUI2YchWsPt0s9HgAUhMQaN4RT5Yp2/sv7+iufdxo cA/BJcMCtYKRD2Qws/RsrtkxMRV1fugvYqkr9j7360s41IYwafQsX7R9xjEL7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg13Vylzqvh; Tue, 21 Oct 2025 07:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rHb6014669; Tue, 21 Oct 2025 07:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rHRd014666; Tue, 21 Oct 2025 07:53:17 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:17 GMT Message-Id: <202510210753.59L7rHRd014666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5ea941a4fbfd - main - LinuxKPI: netdevice add attach/detach skeleton functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ea941a4fbfd1ba2483e47fe30ed6713fe912284 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea941a4fbfd1ba2483e47fe30ed6713fe912284 commit 5ea941a4fbfd1ba2483e47fe30ed6713fe912284 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 20:28:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: netdevice add attach/detach skeleton functions For the moment add skeleton functions for netif_device_attach/detach() needed by rtw8[89] v6.17. MFC after; 3 days --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 3b808a4a1749..cf27753bcb80 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -485,6 +485,21 @@ netdev_priv(const struct net_device *ndev) return (__DECONST(void *, ndev->drv_priv)); } +/* -------------------------------------------------------------------------- */ + +static __inline void +netif_device_attach(struct net_device *ndev) +{ + pr_debug("%s: TODO\n", __func__); +} + +static __inline void +netif_device_detach(struct net_device *ndev) +{ + pr_debug("%s: TODO\n", __func__); +} + + /* -------------------------------------------------------------------------- */ /* This is really rtnetlink and probably belongs elsewhere. */ From nobody Tue Oct 21 07:53:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg40s2Kz6F3hd; Tue, 21 Oct 2025 07:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg36F0Cz3mXL; Tue, 21 Oct 2025 07:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqKhO0ee5npG33+u4fh9/u4wvz8pSFB2jFdniiSIoa8=; b=Aj8nW0cKxMxWEEBZpWZGkyuFmKPHFBtPfuqLezArg2tCEY+//TJHTlok1eF4BpNglK49v4 4JUY0Af4KQW1kliC104ydmhMRDekHFjBpt+TgDKc9e/Ops8xBM+5uYZsDDWJEVzDOUk0/k lA9xDWGVQWYgc1G5SDEorjU2qNyeMqq/9+uAzMKjzEE5TQix/73jKoJaoA/xo0U1nMBhez 43Jm7bgdJM1FlaGoBBX5KjLMpxrW5njsDu+ROcqu31EXXPaAUPWBXO7jar05sN21Pifv4L /3x3ht55eARDJRUzbRPlxb01Q9tXHJol4uxzsTkMRMwNWLvPuotQbcNp3hGU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqKhO0ee5npG33+u4fh9/u4wvz8pSFB2jFdniiSIoa8=; b=uLZGSlMH+uVbpeujeUUb1JtYYgG4GqQFdm9NaqASvnHWyt3aGVsOcwWFlayE2jeHBVo0U8 mO1zU1bqWTo5Y6ltnLb/R/+bj9X83IOl1AjQIPJhu6rJj6KM2Pkj7DlHEdcEY0mH6Bdm9z omoMkXwfi2J5riJuFMikOwkNuK4bPmdAOFnmm7bgp9SjF0UYUrICOPkBVXCqDRYMH9dvuN tEioWlj8CwfnTuolovU8BRC0YdfZLx+hR7q91S63rxll8zcTK5bms1vjHr+1b07nwrjNDr Oz3PgvJEbYOcHauWxGgpeksbWJOidcbXrmfKrR9mc27yQM7CiWN6P/+1rzX/1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033199; a=rsa-sha256; cv=none; b=l7gk9A5H2J5k8bYNXAMkz0oF5HC32HwuiDK/dNslRKfwPd5KVAgjeJTYJc5yGTFlT+xm6F 9rf4CZ+WxpyVycJWzx5QAt62suMB4ra44OFo0X/m++GuWflUFK+QpRaZVc6uzUKAPjHLTj ygyRW9ITaE3PM70ktBTG1pAW7MD/0eCBV/y22rr6DhXb2r3lNcaDEOtu4r4mukpAF+2iCF o2fHfs/B7XQxdsnpESTFucwGL0mWFPcgpvcLBkQ8Fqo/Ckjp2BVC2G8mQIC8E60PQMtOnq ZVsIQT7L0bQ8RCy0Xdup6eyxuTGIDnzXs6iC6qpHSTAm0+gEBEak3gAsNlI95g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg35jNNzqvj; Tue, 21 Oct 2025 07:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rJDL014739; Tue, 21 Oct 2025 07:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rJCE014736; Tue, 21 Oct 2025 07:53:19 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:19 GMT Message-Id: <202510210753.59L7rJCE014736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 37ad1beaf516 - main - UPDATING: bump __FreeBSD_version for LinuxKPI changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ad1beaf516854d5e59b90a9706b09d02cc2a81 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=37ad1beaf516854d5e59b90a9706b09d02cc2a81 commit 37ad1beaf516854d5e59b90a9706b09d02cc2a81 Author: Bjoern A. Zeeb AuthorDate: 2025-10-20 20:35:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:52:46 +0000 UPDATING: bump __FreeBSD_version for LinuxKPI changes The size of an embedded struct has changed and might possibly be a problem. Allow this change to be detected by bumping __FreeBSD_version. MFC after: 3 days --- UPDATING | 4 ++++ sys/sys/param.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 02541eb4b41c..448febb5ba1a 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20251021: + Bump __FreeBSD_version to 1600002 for LinuxKPI. An embedded struct + has changed size and might possibly be an issue otherwise. + 20251016: With the migration to OpenZFS in FreeBSD 13.x a number of ZFS sysctls moved to new locations, but backwards compatibility aliases were diff --git a/sys/sys/param.h b/sys/sys/param.h index 8a71693cff3d..7cfa3c6aa4a8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600001 +#define __FreeBSD_version 1600002 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Tue Oct 21 07:53:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg25kRTz6F3kC; Tue, 21 Oct 2025 07:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg253xnz3mZp; Tue, 21 Oct 2025 07:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AbiGvsL/USmNhN5LkjPfVphOhbP7B6wlIwBKcM2NRXE=; b=m3n6cCKFWtPsnv2v564RLb+dh50wfOjsaCurrAhhEAHphiKxgWIL9cwZP4QlWsrI6mnYQB UUiIkhzoiLCbeHrB+3ZgNez6nSxPcWPtiigpiRtfceMaSYMmfcsX0paqjh7yKJnmMHdDnJ 1m06UZtT4kXAqX11GAesXJU6awp3/kPkP7VS2l+APjwaZQOhjZ5351kWLo8q4SZsBA/rD1 Hq5uwLyu3HPPqTJgTz307uHAbqby6C4EqgNTKq30q82PWoyXUnSDZRsMLPcDPojLtPV+WY Q7LEMngsDiIJzNELh4hQ8B0jMAOUQr6fqU2ooUZYh45DMaMB3CBrree5S3we+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AbiGvsL/USmNhN5LkjPfVphOhbP7B6wlIwBKcM2NRXE=; b=Tpky7gW2KcQBv32R9BX8r9C3jYQ1DlHE3GETLxYVQ7Ww9DMHhWBqBsSKT2LLBK8jL98qNp 52cTYj1g6O5J+5OvUhROtGOpXGP80TszPZfDEGaMaxVhFoAprXGufs/WO9G0eXLfnml9HD Kqp2TwX31Dnh0V3kn9QbP6m0IYQu5T3o9eDX2XuQqOMnisDSxwtWQInEiB8gqmTWz56dWY +3HMdX4uPOSz/b6Icg9tbNFmKZxYZe5vyxT7WLvXwFUVXiCquj0Cqu4fN/O71cVPG7JIbY 9XmKcQ1vv95ybTRVHZUPEn168v0Rrdg8wIGr/inmFG1wtoUgx8Ie9cfJ56tcdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033198; a=rsa-sha256; cv=none; b=e/btrCOBBV9PXMGZkughxuqrbjOMQTB+oJF97C+rYhQLZhGbkpgmlq9hBqi7sugebfDr4m 9QOgHIylmq7jQJGCObwoyaAQLZZUKcLa01T1e9jPR7LgP/HGeWjaM7VGvhZhWttVqElBNe sU0uobYyKeO3mtWd54jzXqXTyemtKQtKJXJ5fQigqW55TjsNQtHmukcbj/5aaMSn3icv5h solUcUE2DVYWrs+XeSY3Hn+5iXHu6eaLkTuXgxkg2+e4w4BlyoYZhfPxW4APvv4khcb77Z KmMsD0xioDmM1dIOg+ZuxYXxjfN1WRJDhR3t+TRBV4IyYtKYmx6geDf4f6HAGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg24gQ1zrP1; Tue, 21 Oct 2025 07:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rILY014704; Tue, 21 Oct 2025 07:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rIuF014701; Tue, 21 Oct 2025 07:53:18 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:18 GMT Message-Id: <202510210753.59L7rIuF014701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0567484734ad - main - LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0567484734ad9732978e189ebed042f6320e2471 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0567484734ad9732978e189ebed042f6320e2471 commit 0567484734ad9732978e189ebed042f6320e2471 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:21:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:52:21 +0000 LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers This includes some type cleanups as well as some shuffling of structs and functions to sort dependencies out. Few new functions and defines as well as new struct members. Minor fixes to style and debug logging. This is the majority of changes. None of these should conflict with current in-tree drivers. The final bit of changes will come along with the driver updates adding an extra argument to function pointers. MFC after: 3 days --- .../linuxkpi/common/include/linux/ieee80211.h | 2 + sys/compat/linuxkpi/common/include/linux/nl80211.h | 10 + sys/compat/linuxkpi/common/include/net/cfg80211.h | 320 ++++++++++++++------- sys/compat/linuxkpi/common/include/net/mac80211.h | 37 +-- sys/compat/linuxkpi/common/src/linux_80211.c | 12 +- .../linuxkpi/common/src/linux_80211_macops.c | 2 +- 6 files changed, 247 insertions(+), 136 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 17041bb03ce8..ea8c0fc8ef5e 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -312,6 +312,7 @@ enum ieee80211_ac_numbers { #define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS 0xf #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP 0x0060 #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME 1 +#define IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT 0x2000 struct ieee80211_mcs_info { uint8_t rx_mask[IEEE80211_HT_MCS_MASK_LEN]; @@ -365,6 +366,7 @@ enum ieee80211_chanctx_change_flags { IEEE80211_CHANCTX_CHANGE_CHANNEL = BIT(4), IEEE80211_CHANCTX_CHANGE_PUNCTURING = BIT(5), IEEE80211_CHANCTX_CHANGE_MIN_DEF = BIT(6), + IEEE80211_CHANCTX_CHANGE_AP = BIT(7), }; enum ieee80211_frame_release_type { diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index f3979d3a2abc..845ffec4bcba 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -50,6 +50,7 @@ enum nl80211_feature_flags { NL80211_FEATURE_WFA_TPC_IE_IN_PROBES = BIT(15), NL80211_FEATURE_AP_SCAN = BIT(16), NL80211_FEATURE_ACTIVE_MONITOR = BIT(17), + NL80211_FEATURE_SAE = BIT(18), }; enum nl80211_pmsr_ftm_failure_flags { @@ -85,6 +86,7 @@ enum nl80211_reg_rule_flags { NL80211_RRF_NO_6GHZ_AFC_CLIENT = BIT(15), NL80211_RRF_PSD = BIT(16), NL80211_RRF_ALLOW_6GHZ_VLP_AP = BIT(17), + NL80211_RRF_ALLOW_20MHZ_ACTIVITY = BIT(18), }; #define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS|NL80211_RRF_NO_HT40PLUS) @@ -434,6 +436,14 @@ enum nl80211_hidden_ssid { NL80211_HIDDEN_SSID_NOT_IN_USE, }; +enum nl80211_external_auth_action { + NL80211_EXTERNAL_AUTH_START, +}; + +enum nl80211_rxmgmt_flags { + NL80211_RXMGMT_FLAG_EXTERNAL_AUTH = BIT(1), +}; + #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16 #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24 diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 239b4a5ae7b8..f769cfdd4075 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -56,7 +56,7 @@ extern int linuxkpi_debug_80211; #define D80211_IMPROVE 0x2 #endif #define TODO(fmt, ...) if (linuxkpi_debug_80211 & D80211_TODO) \ - printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) + printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) #define IMPROVE(fmt, ...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ printf("%s:%d: XXX LKPI80211 IMPROVE " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) @@ -260,6 +260,19 @@ enum ieee80211_vht_opmode { IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT = 4, }; +struct cfg80211_bss_ies { + uint8_t *data; + size_t len; +}; + +struct cfg80211_bss { + /* XXX TODO */ + struct cfg80211_bss_ies *ies; + struct cfg80211_bss_ies *beacon_ies; + uint64_t ts_boottime; + int32_t signal; +}; + struct cfg80211_connect_resp_params { /* XXX TODO */ uint8_t *bssid; @@ -267,7 +280,13 @@ struct cfg80211_connect_resp_params { const uint8_t *resp_ie; uint32_t req_ie_len; uint32_t resp_ie_len; - int status; + int status; + struct { + const uint8_t *addr; + const uint8_t *bssid; + struct cfg80211_bss *bss; + uint16_t status; + } links[IEEE80211_MLD_MAX_NUM_LINKS]; }; struct cfg80211_inform_bss { @@ -284,19 +303,12 @@ struct cfg80211_roam_info { uint32_t req_ie_len; uint32_t resp_ie_len; struct linuxkpi_ieee80211_channel *channel; -}; - -struct cfg80211_bss_ies { - uint8_t *data; - size_t len; -}; - -struct cfg80211_bss { - /* XXX TODO */ - struct cfg80211_bss_ies *ies; - struct cfg80211_bss_ies *beacon_ies; - - int32_t signal; + struct { + const uint8_t *addr; + const uint8_t *bssid; + struct cfg80211_bss *bss; + struct linuxkpi_ieee80211_channel *channel; + } links[IEEE80211_MLD_MAX_NUM_LINKS]; }; struct cfg80211_chan_def { @@ -404,6 +416,7 @@ struct cfg80211_scan_request { bool no_cck; bool scan_6ghz; bool duration_mandatory; + bool first_part; int8_t tsf_report_link_id; uint16_t duration; uint32_t flags; @@ -463,6 +476,24 @@ struct cfg80211_beacon_data { uint32_t assocresp_ies_len; }; +struct cfg80211_ap_update { + /* XXX TODO */ + struct cfg80211_beacon_data beacon; +}; + +struct cfg80211_crypto_settings { + /* XXX TODO */ + enum nl80211_wpa_versions wpa_versions; + uint32_t cipher_group; /* WLAN_CIPHER_SUITE_* */ + uint32_t *akm_suites; + uint32_t *ciphers_pairwise; + const uint8_t *sae_pwd; + const uint8_t *psk; + int n_akm_suites; + int n_ciphers_pairwise; + int sae_pwd_len; +}; + struct cfg80211_ap_settings { /* XXX TODO */ int auth_type, beacon_interval, dtim_period, hidden_ssid, inactivity_timeout; @@ -470,6 +501,7 @@ struct cfg80211_ap_settings { size_t ssid_len; struct cfg80211_beacon_data beacon; struct cfg80211_chan_def chandef; + struct cfg80211_crypto_settings crypto; }; struct cfg80211_bss_selection { @@ -484,23 +516,12 @@ struct cfg80211_bss_selection { } param; }; -struct cfg80211_crypto { /* XXX made up name */ - /* XXX TODO */ - enum nl80211_wpa_versions wpa_versions; - uint32_t cipher_group; /* WLAN_CIPHER_SUITE_* */ - uint32_t *akm_suites; - uint32_t *ciphers_pairwise; - const uint8_t *sae_pwd; - const uint8_t *psk; - int n_akm_suites; - int n_ciphers_pairwise; - int sae_pwd_len; -}; - struct cfg80211_connect_params { /* XXX TODO */ struct linuxkpi_ieee80211_channel *channel; + struct linuxkpi_ieee80211_channel *channel_hint; uint8_t *bssid; + uint8_t *bssid_hint; const uint8_t *ie; const uint8_t *ssid; uint32_t ie_len; @@ -509,7 +530,7 @@ struct cfg80211_connect_params { uint32_t key_len; int auth_type, key_idx, privacy, want_1x; struct cfg80211_bss_selection bss_select; - struct cfg80211_crypto crypto; + struct cfg80211_crypto_settings crypto; }; enum bss_param_flags { /* Used as bitflags. XXX FIXME values? */ @@ -538,6 +559,14 @@ struct cfg80211_mgmt_tx_params { int wait; }; +struct cfg80211_external_auth_params { + uint8_t bssid[ETH_ALEN]; + uint16_t status; + enum nl80211_external_auth_action action; + unsigned int key_mgmt_suite; + struct cfg80211_ssid ssid; +}; + struct cfg80211_pmk_conf { /* XXX TODO */ const uint8_t *pmk; @@ -548,6 +577,8 @@ struct cfg80211_pmksa { /* XXX TODO */ const uint8_t *bssid; const uint8_t *pmkid; + const uint8_t *ssid; + size_t ssid_len; }; struct station_del_parameters { @@ -961,6 +992,27 @@ struct cfg80211_set_hw_timestamp { bool enable; }; +struct survey_info { /* net80211::struct ieee80211_channel_survey */ + /* TODO FIXME */ + uint32_t filled; +#define SURVEY_INFO_TIME 0x0001 +#define SURVEY_INFO_TIME_RX 0x0002 +#define SURVEY_INFO_TIME_SCAN 0x0004 +#define SURVEY_INFO_TIME_TX 0x0008 +#define SURVEY_INFO_TIME_BSS_RX 0x0010 +#define SURVEY_INFO_TIME_BUSY 0x0020 +#define SURVEY_INFO_IN_USE 0x0040 +#define SURVEY_INFO_NOISE_DBM 0x0080 + uint32_t noise; + uint64_t time; + uint64_t time_bss_rx; + uint64_t time_busy; + uint64_t time_rx; + uint64_t time_scan; + uint64_t time_tx; + struct linuxkpi_ieee80211_channel *channel; +}; + enum wiphy_vendor_cmd_need_flags { WIPHY_VENDOR_CMD_NEED_NETDEV = 0x01, WIPHY_VENDOR_CMD_NEED_RUNNING = 0x02, @@ -1118,49 +1170,53 @@ struct wireless_dev { struct cfg80211_ops { /* XXX TODO */ struct wireless_dev *(*add_virtual_intf)(struct wiphy *, const char *, unsigned char, enum nl80211_iftype, struct vif_params *); - int (*del_virtual_intf)(struct wiphy *, struct wireless_dev *); - s32 (*change_virtual_intf)(struct wiphy *, struct net_device *, enum nl80211_iftype, struct vif_params *); - s32 (*scan)(struct wiphy *, struct cfg80211_scan_request *); - s32 (*set_wiphy_params)(struct wiphy *, u32); - s32 (*join_ibss)(struct wiphy *, struct net_device *, struct cfg80211_ibss_params *); - s32 (*leave_ibss)(struct wiphy *, struct net_device *); - s32 (*get_station)(struct wiphy *, struct net_device *, const u8 *, struct station_info *); - int (*dump_station)(struct wiphy *, struct net_device *, int, u8 *, struct station_info *); - s32 (*set_tx_power)(struct wiphy *, struct wireless_dev *, enum nl80211_tx_power_setting, s32); - s32 (*get_tx_power)(struct wiphy *, struct wireless_dev *, s32 *); - s32 (*add_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *, struct key_params *); - s32 (*del_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *); - s32 (*get_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *, void *, void(*)(void *, struct key_params *)); - s32 (*set_default_key)(struct wiphy *, struct net_device *, u8, bool, bool); - s32 (*set_default_mgmt_key)(struct wiphy *, struct net_device *, u8); - s32 (*set_power_mgmt)(struct wiphy *, struct net_device *, bool, s32); - s32 (*connect)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *); - s32 (*disconnect)(struct wiphy *, struct net_device *, u16); - s32 (*suspend)(struct wiphy *, struct cfg80211_wowlan *); - s32 (*resume)(struct wiphy *); - s32 (*set_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); - s32 (*del_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); - s32 (*flush_pmksa)(struct wiphy *, struct net_device *); - s32 (*start_ap)(struct wiphy *, struct net_device *, struct cfg80211_ap_settings *); - int (*stop_ap)(struct wiphy *, struct net_device *); - s32 (*change_beacon)(struct wiphy *, struct net_device *, struct cfg80211_beacon_data *); - int (*del_station)(struct wiphy *, struct net_device *, struct station_del_parameters *); - int (*change_station)(struct wiphy *, struct net_device *, const u8 *, struct station_parameters *); + int (*del_virtual_intf)(struct wiphy *, struct wireless_dev *); + int (*change_virtual_intf)(struct wiphy *, struct net_device *, enum nl80211_iftype, struct vif_params *); + int (*scan)(struct wiphy *, struct cfg80211_scan_request *); + int (*set_wiphy_params)(struct wiphy *, int, uint32_t); + int (*join_ibss)(struct wiphy *, struct net_device *, struct cfg80211_ibss_params *); + int (*leave_ibss)(struct wiphy *, struct net_device *); + int (*get_station)(struct wiphy *, struct net_device *, const uint8_t *, struct station_info *); + int (*dump_station)(struct wiphy *, struct net_device *, int, uint8_t *, struct station_info *); + int (*set_tx_power)(struct wiphy *, struct wireless_dev *, int, enum nl80211_tx_power_setting, int); + int (*get_tx_power)(struct wiphy *, struct wireless_dev *, int, unsigned int, int *); + int (*add_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, const uint8_t *, struct key_params *); + int (*del_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, const uint8_t *); + int (*get_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, const uint8_t *, void *, void(*)(void *, struct key_params *)); + int (*set_default_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, bool); + int (*set_default_mgmt_key)(struct wiphy *, struct net_device *, int, uint8_t); + int (*set_power_mgmt)(struct wiphy *, struct net_device *, bool, int); + int (*connect)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *); + int (*disconnect)(struct wiphy *, struct net_device *, uint16_t); + int (*suspend)(struct wiphy *, struct cfg80211_wowlan *); + int (*resume)(struct wiphy *); + int (*set_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); + int (*del_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); + int (*flush_pmksa)(struct wiphy *, struct net_device *); + int (*start_ap)(struct wiphy *, struct net_device *, struct cfg80211_ap_settings *); + int (*stop_ap)(struct wiphy *, struct net_device *, unsigned int); + int (*change_beacon)(struct wiphy *, struct net_device *, struct cfg80211_ap_update *); + int (*del_station)(struct wiphy *, struct net_device *, struct station_del_parameters *); + int (*change_station)(struct wiphy *, struct net_device *, const uint8_t *, struct station_parameters *); int (*sched_scan_start)(struct wiphy *, struct net_device *, struct cfg80211_sched_scan_request *); - int (*sched_scan_stop)(struct wiphy *, struct net_device *, u64); + int (*sched_scan_stop)(struct wiphy *, struct net_device *, uint64_t); void (*update_mgmt_frame_registrations)(struct wiphy *, struct wireless_dev *, struct mgmt_frame_regs *); - int (*mgmt_tx)(struct wiphy *, struct wireless_dev *, struct cfg80211_mgmt_tx_params *, u64 *); - int (*cancel_remain_on_channel)(struct wiphy *, struct wireless_dev *, u64); - int (*get_channel)(struct wiphy *, struct wireless_dev *, struct cfg80211_chan_def *); - int (*crit_proto_start)(struct wiphy *, struct wireless_dev *, enum nl80211_crit_proto_id, u16); + int (*mgmt_tx)(struct wiphy *, struct wireless_dev *, struct cfg80211_mgmt_tx_params *, uint64_t *); + int (*cancel_remain_on_channel)(struct wiphy *, struct wireless_dev *, uint64_t); + int (*get_channel)(struct wiphy *, struct wireless_dev *, unsigned int, struct cfg80211_chan_def *); + int (*crit_proto_start)(struct wiphy *, struct wireless_dev *, enum nl80211_crit_proto_id, uint16_t); void (*crit_proto_stop)(struct wiphy *, struct wireless_dev *); - int (*tdls_oper)(struct wiphy *, struct net_device *, const u8 *, enum nl80211_tdls_operation); - int (*update_connect_params)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *, u32); - int (*set_pmk)(struct wiphy *, struct net_device *, const struct cfg80211_pmk_conf *); - int (*del_pmk)(struct wiphy *, struct net_device *, const u8 *); - int (*remain_on_channel)(struct wiphy *, struct wireless_dev *, struct linuxkpi_ieee80211_channel *, unsigned int, u64 *); - int (*start_p2p_device)(struct wiphy *, struct wireless_dev *); - void (*stop_p2p_device)(struct wiphy *, struct wireless_dev *); + int (*tdls_oper)(struct wiphy *, struct net_device *, const uint8_t *, enum nl80211_tdls_operation); + int (*update_connect_params)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *, uint32_t); + int (*set_pmk)(struct wiphy *, struct net_device *, const struct cfg80211_pmk_conf *); + int (*del_pmk)(struct wiphy *, struct net_device *, const uint8_t *); + int (*remain_on_channel)(struct wiphy *, struct wireless_dev *, struct linuxkpi_ieee80211_channel *, unsigned int, uint64_t *); + int (*start_p2p_device)(struct wiphy *, struct wireless_dev *); + void (*stop_p2p_device)(struct wiphy *, struct wireless_dev *); + int (*dump_survey)(struct wiphy *, struct net_device *, int, struct survey_info *); + int (*external_auth)(struct wiphy *, struct net_device *, struct cfg80211_external_auth_params *); + int (*set_cqm_rssi_range_config)(struct wiphy *, struct net_device *, int, int); + }; @@ -1179,6 +1235,8 @@ void linuxkpi_wiphy_delayed_work_queue(struct wiphy *, struct wiphy_delayed_work *, unsigned long); void linuxkpi_wiphy_delayed_work_cancel(struct wiphy *, struct wiphy_delayed_work *); +void linuxkpi_wiphy_delayed_work_flush(struct wiphy *, + struct wiphy_delayed_work *); int linuxkpi_regulatory_set_wiphy_regd_sync(struct wiphy *wiphy, struct linuxkpi_ieee80211_regdomain *regd); @@ -1247,6 +1305,21 @@ wiphy_rfkill_set_hw_state_reason(struct wiphy *wiphy, bool blocked, /* -------------------------------------------------------------------------- */ +static inline int +cfg80211_register_netdevice(struct net_device *ndev) +{ + TODO(); + return (-ENXIO); +} + +static inline void +cfg80211_unregister_netdevice(struct net_device *ndev) +{ + TODO(); +} + +/* -------------------------------------------------------------------------- */ + static inline struct cfg80211_bss * cfg80211_get_bss(struct wiphy *wiphy, struct linuxkpi_ieee80211_channel *chan, const uint8_t *bssid, const uint8_t *ssid, size_t ssid_len, @@ -1309,15 +1382,15 @@ reg_query_regdb_wmm(uint8_t *alpha2, uint32_t center_freq, return (-ENODATA); } -static __inline const u8 * -cfg80211_find_ie_match(uint32_t f, const u8 *ies, size_t ies_len, - const u8 *match, int x, int y) +static __inline const uint8_t * +cfg80211_find_ie_match(uint32_t f, const uint8_t *ies, size_t ies_len, + const uint8_t *match, int x, int y) { TODO(); return (NULL); } -static __inline const u8 * +static __inline const uint8_t * cfg80211_find_ie(uint8_t eid, const uint8_t *ie, uint32_t ielen) { TODO(); @@ -1339,6 +1412,36 @@ cfg80211_pmsr_report(struct wireless_dev *wdev, TODO(); } +static inline int +nl80211_chan_width_to_mhz(enum nl80211_chan_width width) +{ + switch (width) { + case NL80211_CHAN_WIDTH_5: + return (5); + break; + case NL80211_CHAN_WIDTH_10: + return (10); + break; + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_20: + return (20); + break; + case NL80211_CHAN_WIDTH_40: + return (40); + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_80P80: + return (80); + break; + case NL80211_CHAN_WIDTH_160: + return (160); + break; + case NL80211_CHAN_WIDTH_320: + return (320); + break; + } +} + static inline void cfg80211_chandef_create(struct cfg80211_chan_def *chandef, struct linuxkpi_ieee80211_channel *chan, enum nl80211_channel_type chan_type) @@ -1377,6 +1480,12 @@ cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return (false); } +static inline int +cfg80211_chandef_get_width(const struct cfg80211_chan_def *chandef) +{ + return (nl80211_chan_width_to_mhz(chandef->width)); +} + static __inline bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) { @@ -1688,8 +1797,8 @@ cfg80211_disconnected(struct net_device *ndev, uint16_t reason, } static __inline int -cfg80211_get_p2p_attr(const u8 *ie, u32 ie_len, - enum ieee80211_p2p_attr_ids attr, u8 *p, size_t p_len) +cfg80211_get_p2p_attr(const uint8_t *ie, uint32_t ie_len, + enum ieee80211_p2p_attr_ids attr, uint8_t *p, size_t p_len) { TODO(); return (-1); @@ -1725,13 +1834,13 @@ cfg80211_inform_bss_data(struct wiphy *wiphy, static __inline void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, uint64_t cookie, - const u8 *buf, size_t len, bool ack, gfp_t gfp) + const uint8_t *buf, size_t len, bool ack, gfp_t gfp) { TODO(); } static __inline void -cfg80211_michael_mic_failure(struct net_device *ndev, const uint8_t *addr, +cfg80211_michael_mic_failure(struct net_device *ndev, const uint8_t addr[ETH_ALEN], enum nl80211_key_type key_type, int _x, void *p, gfp_t gfp) { TODO(); @@ -1751,8 +1860,8 @@ cfg80211_del_sta(struct net_device *ndev, const uint8_t *addr, gfp_t gfp) } static __inline void -cfg80211_port_authorized(struct net_device *ndev, const uint8_t *bssid, - gfp_t gfp) +cfg80211_port_authorized(struct net_device *ndev, const uint8_t *addr, + const uint8_t *bitmap, uint8_t len, gfp_t gfp) { TODO(); } @@ -1935,7 +2044,7 @@ cfg80211_background_radar_event(struct wiphy *wiphy, TODO(); } -static __inline const u8 * +static __inline const uint8_t * cfg80211_find_ext_ie(uint8_t eid, const uint8_t *p, size_t len) { TODO(); @@ -2033,6 +2142,14 @@ cfg80211_get_iftype_ext_capa(struct wiphy *wiphy, enum nl80211_iftype iftype) return (NULL); } +static inline int +cfg80211_external_auth_request(struct net_device *ndev, + struct cfg80211_external_auth_params *params, gfp_t gfp) +{ + TODO(); + return (-ENXIO); +} + static inline uint16_t ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband, enum nl80211_iftype iftype) @@ -2041,36 +2158,6 @@ ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband, return (0); } -static inline int -nl80211_chan_width_to_mhz(enum nl80211_chan_width width) -{ - switch (width) { - case NL80211_CHAN_WIDTH_5: - return (5); - break; - case NL80211_CHAN_WIDTH_10: - return (10); - break; - case NL80211_CHAN_WIDTH_20_NOHT: - case NL80211_CHAN_WIDTH_20: - return (20); - break; - case NL80211_CHAN_WIDTH_40: - return (40); - break; - case NL80211_CHAN_WIDTH_80: - case NL80211_CHAN_WIDTH_80P80: - return (80); - break; - case NL80211_CHAN_WIDTH_160: - return (160); - break; - case NL80211_CHAN_WIDTH_320: - return (320); - break; - } -} - static __inline ssize_t wiphy_locked_debugfs_read(struct wiphy *wiphy, struct file *file, char *buf, size_t bufsize, const char __user *userbuf, size_t count, @@ -2093,6 +2180,13 @@ wiphy_locked_debugfs_write(struct wiphy *wiphy, struct file *file, return (-ENXIO); } +static inline void +cfg80211_cqm_rssi_notify(struct net_device *dev, + enum nl80211_cqm_rssi_threshold_event rssi_te, int32_t rssi, gfp_t gfp) +{ + TODO(); +} + /* -------------------------------------------------------------------------- */ static inline void @@ -2140,6 +2234,12 @@ wiphy_delayed_work_cancel(struct wiphy *wiphy, struct wiphy_delayed_work *wdwk) linuxkpi_wiphy_delayed_work_cancel(wiphy, wdwk); } +static inline void +wiphy_delayed_work_flush(struct wiphy *wiphy, struct wiphy_delayed_work *wdwk) +{ + linuxkpi_wiphy_delayed_work_flush(wiphy, wdwk); +} + /* -------------------------------------------------------------------------- */ #define wiphy_err(_wiphy, _fmt, ...) \ diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 8de03410c6b6..523836b52a40 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -166,7 +166,7 @@ enum ieee80211_bss_changed { #define WLAN_AKM_SUITE_PSK_SHA256 WLAN_AKM_SUITE(6) /* TDLS 7 */ #define WLAN_AKM_SUITE_SAE WLAN_AKM_SUITE(8) -/* FToSAE 9 */ +#define WLAN_AKM_SUITE_FT_OVER_SAE WLAN_AKM_SUITE(9) /* AP peer key 10 */ /* 802.1x suite B 11 */ /* 802.1x suite B 384 12 */ @@ -857,7 +857,8 @@ struct ieee80211_vif_chanctx_switch { }; struct ieee80211_prep_tx_info { - u16 duration; + uint16_t duration; + uint16_t subtype; bool success; bool was_assoc; int link_id; @@ -904,27 +905,6 @@ struct linuxkpi_ieee80211_tim_ie { }; #define ieee80211_tim_ie linuxkpi_ieee80211_tim_ie -struct survey_info { /* net80211::struct ieee80211_channel_survey */ - /* TODO FIXME */ - uint32_t filled; -#define SURVEY_INFO_TIME 0x0001 -#define SURVEY_INFO_TIME_RX 0x0002 -#define SURVEY_INFO_TIME_SCAN 0x0004 -#define SURVEY_INFO_TIME_TX 0x0008 -#define SURVEY_INFO_TIME_BSS_RX 0x0010 -#define SURVEY_INFO_TIME_BUSY 0x0020 -#define SURVEY_INFO_IN_USE 0x0040 -#define SURVEY_INFO_NOISE_DBM 0x0080 - uint32_t noise; - uint64_t time; - uint64_t time_bss_rx; - uint64_t time_busy; - uint64_t time_rx; - uint64_t time_scan; - uint64_t time_tx; - struct ieee80211_channel *channel; -}; - enum ieee80211_iface_iter { IEEE80211_IFACE_ITER_NORMAL = BIT(0), IEEE80211_IFACE_ITER_RESUME_ALL = BIT(1), @@ -1552,6 +1532,15 @@ ieee80211_iter_chan_contexts_atomic(struct ieee80211_hw *hw, linuxkpi_ieee80211_iterate_chan_contexts(hw, iterfunc, arg); } +static __inline void +ieee80211_iter_chan_contexts_mtx(struct ieee80211_hw *hw, + void (*iterfunc)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, void *), + void *arg) +{ + IMPROVE("XXX LKPI80211 TODO MTX\n"); + linuxkpi_ieee80211_iterate_chan_contexts(hw, iterfunc, arg); +} + static __inline void ieee80211_iterate_stations_atomic(struct ieee80211_hw *hw, void (*iterfunc)(void *, struct ieee80211_sta *), void *arg) @@ -2063,7 +2052,7 @@ ieee80211_tx_dequeue_ni(struct ieee80211_hw *hw, struct ieee80211_txq *txq) static __inline void ieee80211_update_mu_groups(struct ieee80211_vif *vif, - u_int _i, uint8_t *ms, uint8_t *up) + u_int link_id, const uint8_t *ms, const uint8_t *up) { TODO(); } diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index bc4b334de28e..0dc3b2631804 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -7833,7 +7833,7 @@ lkpi_wiphy_delayed_work_timer(struct timer_list *tl) struct wiphy_delayed_work *wdwk; wdwk = timer_container_of(wdwk, tl, timer); - wiphy_work_queue(wdwk->wiphy, &wdwk->work); + wiphy_work_queue(wdwk->wiphy, &wdwk->work); } void @@ -7858,6 +7858,16 @@ linuxkpi_wiphy_delayed_work_cancel(struct wiphy *wiphy, wiphy_work_cancel(wiphy, &wdwk->work); } +void +linuxkpi_wiphy_delayed_work_flush(struct wiphy *wiphy, + struct wiphy_delayed_work *wdwk) +{ + lockdep_assert_held(&wiphy->mtx); + + del_timer_sync(&wdwk->timer); + wiphy_work_flush(wiphy, &wdwk->work); +} + /* -------------------------------------------------------------------------- */ struct wiphy * diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 1046b753574f..04f9f6d7e7fc 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -42,7 +42,7 @@ if (linuxkpi_debug_80211 & D80211_TRACE_MO) \ printf("LKPI_80211_TRACE_MO %s:%d: %d %d %lu: " fmt "\n", \ __func__, __LINE__, curcpu, curthread->td_tid, \ - jiffies, __VA_ARGS__) + jiffies, ##__VA_ARGS__) #else #define LKPI_80211_TRACE_MO(...) do { } while(0) #endif From nobody Tue Oct 21 07:53:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfz3v6jz6F3kB; Tue, 21 Oct 2025 07:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfz29VSz3mTn; Tue, 21 Oct 2025 07:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SnG91x55v6VRHCH322FzHbI9u6ud57mvlJiGzh3LLw=; b=vg+hQKNQExVsenVtttN8HxOJ0Ps+jKYkUPi1WjThf/MF9SdhUZTQB+X4svbPyeMyD/kg5O VvZk0QA1Vw1mvTu821kOGBbiMZ7snWm4qsOURmOOIucF0njITxrRJ46navdbdHXOCXbpK0 cV/D2NLI74LtcV1WTVquivr1mPaQodmyIEP0VFNfchK3Iy7hrfIlWj9SV+qPzxCJcLN8KP YGGzkozzaewRfflchx9/deFtY0i3EkfbvawXymi0DK9R5NUPPSallUhKGKpMxwL9O9xJlG TZ9RSsnzORydxmJgdD0XPaqUw5rDbpn55kZgXFl1oCq/PI70Za3RZTZ32mKhYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SnG91x55v6VRHCH322FzHbI9u6ud57mvlJiGzh3LLw=; b=C+h7amhG9TBcP9MkUxek9rCTs/eidbU60fgp002anyiogX2ySMyIrJeqSIkDmV6ODTb36z fvN/KZUr2GL8gcYX3vFtLHo+ThOmBFNVmCEHi+drlF1skRhIFtzdcBSb1JNtgwzTZ5e04I X45kfCfaQzy2Eoax4Z8wXlps4lVzQoHcqzHjtyT3lTGjYa3Q7eK+RE6hGOBLvM5DcpWqNR eFFpJabfZtwksN4/8iX8Uc+p8dYIwYZ8i4icprW4XakGjFBsnjznMvyH+WxRf53m+jMKHd 4Gdc/uvwq0S1c69wmLNN9ACDK2bSaM7ef/6ZO9B9jYPOBe2RlR+h6xetqb20Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033195; a=rsa-sha256; cv=none; b=pgeG+e432kH7xa9vV7ND+coN21/3hnUq2rP5JarQxtbHbSaG/ocUHPdE4JSvGKgCFJKaT/ pVHnPbk9m/w7svFhxevh7bMImY3/pWY7FTX+pwwzBD0dbxwRpuGLGQFm/N+UTOCrzSgnK6 rVuDUC5wscmoGqW0EfWVVfyUE4m2aHiwYjGkLXzYJdW0XkqK0caC6fcp1szW+CWR7XCq1a beldb+cey89ewcTKcucwkylFMdBn3/Y8btMXpLfRKP07pFTYjDOhVGUHh133kJakuOVCxG r04cNTuMzBIQNZLBjz69nmGMFFxlSBimbeYM0zbPE7b9U+oAyw+OXm7YMOL0Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfz1n6lzqxT; Tue, 21 Oct 2025 07:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rFRZ014595; Tue, 21 Oct 2025 07:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rFEG014591; Tue, 21 Oct 2025 07:53:15 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:15 GMT Message-Id: <202510210753.59L7rFEG014591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 224ac9d2a030 - main - LinuxKPI: soc/mediatek add pr_debug calls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 224ac9d2a030f85924e44a507ddc412797c3fe87 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=224ac9d2a030f85924e44a507ddc412797c3fe87 commit 224ac9d2a030f85924e44a507ddc412797c3fe87 Author: Bjoern A. Zeeb AuthorDate: 2025-10-19 15:28:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: soc/mediatek add pr_debug calls We do not support Wireless Ethernet Dispatch (wed) on the mt76 (yet). Add pr_debug calls with TODO in case we run into the calls anyway so we could deal with them. MFC after: 3 days --- .../common/include/linux/soc/mediatek/mtk_wed.h | 47 +++++++--------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h index 903053e7f6e8..9f3a1ee4c139 100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h @@ -1,54 +1,36 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2022-2023 Bjoern A. Zeeb - * - * 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. + * Copyright (c) 2022-2025 Bjoern A. Zeeb * - * 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. + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H #define _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H +#include /* pr_debug */ + struct mtk_wed_device { }; #define WED_WO_STA_REC 0x6 -#define mtk_wed_device_start(_dev, _mask) do { } while(0) -#define mtk_wed_device_detach(_dev) do { } while(0) +#define mtk_wed_device_start(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_detach(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) #define mtk_wed_device_irq_get(_dev, _mask) 0 -#define mtk_wed_device_irq_set_mask(_dev, _mask) do { } while(0) -#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) (-ENODEV) -#define mtk_wed_device_dma_reset(_dev) do {} while (0) +#define mtk_wed_device_irq_set_mask(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) ({ pr_debug("%s: TODO\n", __func__); -ENODEV; }) +#define mtk_wed_device_dma_reset(_dev) do { pr_debug("%s: TODO\n", __func__); } while (0) #define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) \ - do {} while (0) -#define mtk_wed_device_stop(_dev) do { } while(0) -#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { } while(0) -#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) (-EOPNOTSUPP) + do { pr_debug("%s: TODO\n", __func__); } while (0) +#define mtk_wed_device_stop(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) ({ pr_debug("%s: TODO\n", __func__); -EOPNOTSUPP; }) static inline bool mtk_wed_device_active(struct mtk_wed_device *dev __unused) { + pr_debug("%s: TODO\n", __func__); return (false); } @@ -56,6 +38,7 @@ static inline bool mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) { + pr_debug("%s: TODO\n", __func__); return (false); } From nobody Tue Oct 21 07:53:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfy33Mtz6F3rs; Tue, 21 Oct 2025 07:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfy1g4Lz3mJM; Tue, 21 Oct 2025 07:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfN+M27lOt+VVkOz83PvBrLQ68otos2NijLXH857CiU=; b=gD1aJYWv+NitMzN/mOVmhJu3VKS0DJH76xmmDs6VAfOrW+K+YFaQxdKEabTnjnJj/Finz+ 9C0uycJ6fZ83FZUgAHjyNWwI1DGS6GQg91cr1mt/y7SHeu2XrS9+6c7+N4A1T4awq7a+r7 C7SbK4giClN4wps0Msy4cQd7zcDlQDUFrvMJdXIN8OV8jBoQ4P7hqnVWe4FM9cWGnnroQE LYEvtU/aFsOnzpsPEGJ+iBDdZJjsYGPWSqUTpwSHqL6pXvKkhnOoKNPlV8CKg1yWGtSeRY xYdOfw2nBjq/NGycbezHQUjYuuL+4Vq7F9i4xp3OTcjxs7gXi5pDmse703gl3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfN+M27lOt+VVkOz83PvBrLQ68otos2NijLXH857CiU=; b=ZI+c1JoulMQ/Khg7uzTcJ2SIYbd8ZWuYDCfQQOeaRCAmAEhRUB2iT3A4lsfz6rofH1SJcB IwuMIl5Y5CTMZQ7dwFxQTYyt3e9bMB45Ls+Janak+QFykJLIpqiOQhAZZcOpghuVt49V/n NUGGIfXIaPDm84AEb6oluEvOlMS3YIXi55+GkCl7byNcyNyNjkudJ5B4LQ8AU7JU5vp/io thxp6/pC0tyDFQy+/0guuhiGuoFruFeMCMgJbYp1tStAxCT6Y9zKfJFgd13yl987mkyzW2 C5FphZ4VhowBgaofxutxUKbtfRNeimuQnsFoS3HJqgewc0uRQPyZ/4g5fROoVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033194; a=rsa-sha256; cv=none; b=qTFiLRkDIp0rPueWLzMT+qLTbVc8XOs3DFU9xpeeMzWGEnTMyGkkEI/42sqQnsoJRV6b4b S2CNv+ovW7vIm7BbDgWyW8MzSVpT8mBFwfZoVS8RF/x1gQERuZru2HnvMILJW+eggoMwgp twuT6Dhc9macpLZ9a2x32/R7d8GMdP/oqwDAwAvjf3C1I75Q+8HVr2w+QWDWLCSZGleYjd VhU89M2MlELRIyV5NFTHxY2Cie8oFwDTx06Y6YRQG+J2WD193uuHysuXh3ZOGiqPm6ftWn GnVRhRa42xRaydVx53qDDhZjWCqDaUJLpNIy8yi825kHfPTSacRBYPVd3uccfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfy15kJzrB9; Tue, 21 Oct 2025 07:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rEsx014558; Tue, 21 Oct 2025 07:53:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rEhh014555; Tue, 21 Oct 2025 07:53:14 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:14 GMT Message-Id: <202510210753.59L7rEhh014555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7c31cdfa408a - main - LinuxKPI: page_pool headers moved; add netmem.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c31cdfa408a4ebce7a3e10d29056a15c28bc092 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7c31cdfa408a4ebce7a3e10d29056a15c28bc092 commit 7c31cdfa408a4ebce7a3e10d29056a15c28bc092 Author: Bjoern A. Zeeb AuthorDate: 2025-10-19 22:57:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: page_pool headers moved; add netmem.h page_pool headers were not used yet; they were created for mt76 but are without functionality. Upstream has migrated them for v6.17 and split them up into multiple files. Also add netmem.h which the little needed is directly related to page pools. MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/netmem.h | 21 ++++ sys/compat/linuxkpi/common/include/net/page_pool.h | 119 --------------------- .../common/include/net/page_pool/helpers.h | 79 ++++++++++++++ .../linuxkpi/common/include/net/page_pool/types.h | 36 +++++++ 4 files changed, 136 insertions(+), 119 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/netmem.h b/sys/compat/linuxkpi/common/include/net/netmem.h new file mode 100644 index 000000000000..c8de09a2e8c2 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/netmem.h @@ -0,0 +1,21 @@ +/*- + * Copyright (c) 2023-2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_NET_NETMEM_H +#define _LINUXKPI_NET_NETMEM_H + +struct page_pool; + +struct netmem_desc { + struct page_pool *pp; +}; + +#define pp_page_to_nmdesc(page) \ + (_Generic((page), \ + const struct page *: (const struct netmem_desc *)(page), \ + struct page *: (struct netmem_desc *)(page))) + +#endif /* _LINUXKPI_NET_NETMEM_H */ diff --git a/sys/compat/linuxkpi/common/include/net/page_pool.h b/sys/compat/linuxkpi/common/include/net/page_pool.h deleted file mode 100644 index 2dc8f74b31f3..000000000000 --- a/sys/compat/linuxkpi/common/include/net/page_pool.h +++ /dev/null @@ -1,119 +0,0 @@ -/*- - * Copyright (c) 2023 Bjoern A. Zeeb - * - * 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. - */ - -#ifndef _LINUXKPI_NET_PAGE_POOL_H -#define _LINUXKPI_NET_PAGE_POOL_H - -#include /* pr_debug */ -#include -#include -#include - -struct device; - -struct page_pool_params { - struct device *dev; - uint32_t flags; - uint32_t order; - uint32_t pool_size; - uint32_t max_len; - uint32_t offset; - int nid; /* NUMA */ - enum dma_data_direction dma_dir; - struct napi_struct *napi; -}; - -struct page_pool { -}; - -#define PP_FLAG_DMA_MAP BIT(0) -#define PP_FLAG_DMA_SYNC_DEV BIT(1) -#define PP_FLAG_PAGE_FRAG BIT(2) - -static inline struct page_pool * -page_pool_create(const struct page_pool_params *ppparams) -{ - - pr_debug("%s: TODO\n", __func__); - return (NULL); -} - -static inline void -page_pool_destroy(struct page_pool *ppool) -{ - - pr_debug("%s: TODO\n", __func__); -} - -static inline struct page * -page_pool_dev_alloc_frag(struct page_pool *ppool, uint32_t *offset, - size_t size) -{ - - pr_debug("%s: TODO\n", __func__); - return (NULL); -} - -static inline dma_addr_t -page_pool_get_dma_addr(struct page *page) -{ - - pr_debug("%s: TODO\n", __func__); - return (0); -} - -static inline enum dma_data_direction -page_pool_get_dma_dir(const struct page_pool *ppool) -{ - - pr_debug("%s: TODO\n", __func__); - return (DMA_BIDIRECTIONAL); -} - -static inline void -page_pool_put_full_page(struct page_pool *ppool, struct page *page, - bool allow_direct) -{ - - pr_debug("%s: TODO\n", __func__); -} - -static inline int -page_pool_ethtool_stats_get_count(void) -{ - - pr_debug("%s: TODO\n", __func__); - return (0); -} - -static inline uint8_t * -page_pool_ethtool_stats_get_strings(uint8_t *x) -{ - - pr_debug("%s: TODO\n", __func__); - return (x); -} - -#endif /* _LINUXKPI_NET_PAGE_POOL_H */ diff --git a/sys/compat/linuxkpi/common/include/net/page_pool/helpers.h b/sys/compat/linuxkpi/common/include/net/page_pool/helpers.h new file mode 100644 index 000000000000..3469c39c7757 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/page_pool/helpers.h @@ -0,0 +1,79 @@ +/*- + * Copyright (c) 2023-2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_NET_PAGE_POOL_HELPERS_H +#define _LINUXKPI_NET_PAGE_POOL_HELPERS_H + +#include /* pr_debug */ +#include +#include +#include + +static inline struct page_pool * +page_pool_create(const struct page_pool_params *ppparams) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline void +page_pool_destroy(struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline struct page * +page_pool_dev_alloc_frag(struct page_pool *ppool, uint32_t *offset, + size_t size) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline dma_addr_t +page_pool_get_dma_addr(struct page *page) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline enum dma_data_direction +page_pool_get_dma_dir(const struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); + return (DMA_BIDIRECTIONAL); +} + +static inline void +page_pool_put_full_page(struct page_pool *ppool, struct page *page, + bool allow_direct) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline int +page_pool_ethtool_stats_get_count(void) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline uint8_t * +page_pool_ethtool_stats_get_strings(uint8_t *x) +{ + + pr_debug("%s: TODO\n", __func__); + return (x); +} + +#endif /* _LINUXKPI_NET_PAGE_POOL_HELPERS_H */ diff --git a/sys/compat/linuxkpi/common/include/net/page_pool/types.h b/sys/compat/linuxkpi/common/include/net/page_pool/types.h new file mode 100644 index 000000000000..6747be50b9b2 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/page_pool/types.h @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2023-2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_NET_PAGE_POOL_TYPES_H +#define _LINUXKPI_NET_PAGE_POOL_TYPES_H + +#include +#include +#include + +struct device; +struct napi_struct; + +struct page_pool_params { + struct device *dev; + uint32_t flags; + uint32_t order; + uint32_t pool_size; + uint32_t max_len; + uint32_t offset; + int nid; /* NUMA */ + enum dma_data_direction dma_dir; + struct napi_struct *napi; +}; + +struct page_pool { +}; + +#define PP_FLAG_DMA_MAP BIT(0) +#define PP_FLAG_DMA_SYNC_DEV BIT(1) +#define PP_FLAG_PAGE_FRAG BIT(2) + +#endif /* _LINUXKPI_NET_PAGE_POOL_TYPES_H */ From nobody Tue Oct 21 07:53:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg04rldz6F3lx; Tue, 21 Oct 2025 07:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg03Skhz3mXJ; Tue, 21 Oct 2025 07:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/8P4ROwIisur0jOH84d3uKs6k18AAVvh06CFBC7HBA=; b=uutThw3Wj9U1waL0js9jieGdIVN2ZCmERWWgO6AbDd0sMcUzIqQrTQc2QieLIXOxwX8HIz YsO3OIc8rUk1n8rlRqvrkTtr1qMUGw5dmJfmfxvQ1atoiZaU3p7uPjnCDs+A6paQRqAqMn 81sZFDvpXEw3Zpk4jVuF83Bp5Gvg6C/xPHcY6x1fI2JOvj+LsAz981WRmSp4jKKD0L6uxr fBTX6GO1IYtCLEkw77CALf0k2GIADn0VvzGCY97+TXwxM5LAK3xr5tZTodau7f3zLJk1P0 GdGAqZFvLo6ilP3ElE6S/4yGBLZUofiOtnoIg59vyi5T2WDiRoyIpO2fNp3RFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/8P4ROwIisur0jOH84d3uKs6k18AAVvh06CFBC7HBA=; b=cQFy8sZzLIDosS2LSaWnrQaTfW7h4IgzCjXHTNcpN0QhYhMXxVeoXjz3TzF40x1+U2R0/B OtsgOH6pRJhKNY4MQVvPD/vL9eC5hF5oV0OX0T53r57biMUjUR6AgRE9DwTTVoGI+ZR5GZ 0a9KGlZFtmqh/08O4aIPNDXD3SLlYGDhhPifa8CVc62hE+1Ulx7hRECn+D4WsCUiyaYtU+ CLXqCbuWOfclaettLPoB244E8VXgnWftGv5dQLgnI8JYbkCM6LOVl1fGAwZrgHpbXUqEAy DBqVBSM60K3GJvqOVFgBIA4XS+44/swX/Xl/jtJEz+IY6QGAld+B4Wny0fgtGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033196; a=rsa-sha256; cv=none; b=Bq0Zk620i5aLunOXCu/siMLJjD+0NGitwdud+zyxxa+l1h0R5F4+gI9AOleIJEpJJmo17b tJLcBfgh3WuU/nTqt2R1HkybHUbIfAWQz4XOnap6i6eVx3fOfqGDdnmqnHmB/LZJr1Xvt7 llRv5uzsuJcpS7cfdF6QPHgLEQEhJa7lxbRhlUP0dJY0i13L2i8XN/iDDwJY5E7IuILTRy g7inGHWv72q5K5b09BsklR5lHuJwSYdt/gnQPNt3FkCbRa1mcsmnwF20MCN+AmOktdibiD UMFBWkhi/GiPBeUXFGqi1zhxNJz9sYc9dELhTP48E26OdX9ifA2iBZQFTKV+xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg034bwzr7d; Tue, 21 Oct 2025 07:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rGZQ014634; Tue, 21 Oct 2025 07:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rGQG014631; Tue, 21 Oct 2025 07:53:16 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:16 GMT Message-Id: <202510210753.59L7rGQG014631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88dbf83345fe - main - LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88dbf83345feefa7181bd6df47786e1a8d1d304d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88dbf83345feefa7181bd6df47786e1a8d1d304d commit 88dbf83345feefa7181bd6df47786e1a8d1d304d Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:25:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now This likely belongs in socket code which we do not have in LinuxKPI. Needed by a wirless driver at v6.17. MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 6e41c368a8b8..2e560a120e41 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1159,6 +1159,9 @@ skb_cow_head(struct sk_buff *skb, unsigned int headroom) return (-1); } +/* Misplaced here really but sock comes from skbuff. */ +#define sk_pacing_shift_update(sock, n) + #define SKB_WITH_OVERHEAD(_s) \ (_s) - ALIGN(sizeof(struct skb_shared_info), CACHE_LINE_SIZE) From nobody Tue Oct 21 07:53:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfx12ZMz6F3lw; Tue, 21 Oct 2025 07:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfx0KGYz3mCb; Tue, 21 Oct 2025 07:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PL6yU4fxEvboaIeZ6Ir/FIQ/yEv60eSa4e1lOuSM3Q=; b=NREMqr/8ZAGcH8DjgqttB5rs+Eg0vcua8wCtrqWXYLG2pnqZfw4qzBXQ8cvaMDiztiKm0V KECPoYiJrHnS3OryqRm4FgNL8GJf9VYzO1/nang19svZNzDNsOaHY7YyL+gJAS5E9yyGNM EeXsavRV4B0astHqhmWy37zVrxgbcQbtL8PUJAnxz0GeOIgjHWYoSooysO0cxzcn28GajT YJaQqiNIAgjmjJDmbqj6dP27B0pm6VOwmDD5S7J9cY+Vr/M6+QtRNWtXzNFbRtovgyFhvv 17BJrridt63Gb+atfNSQtIbr8nRjuMR91GBwWaBmmd1bluvbj3PuvS8/ZtvWdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PL6yU4fxEvboaIeZ6Ir/FIQ/yEv60eSa4e1lOuSM3Q=; b=nag1UhahSaC6Uhj54ayFoJrYqUU+ooxJOUZf1ldo5Zn4u//FEEdXVL3kUDP/KCymb9fRw0 2JUqMS9sj07rwU/pi3B4x1sgFIprzIF0DFZHael0mBOh9t1mtBaO05+yTNIT/Hk30KuJsb JtD2kn54z5YDWGZzoCbW35ENE+Fob0HoEsdb8smpbnRTGjOoDsin3HZKnaez2NS1ZZK0nz NosE+bi/2ZcfbAO6IFmswGmUDZ4XEyIGKdvcBREsX1IdDG7XsClzR++kIZDdsclRGXz5Dk k+pCWAkVGGTuGRZuBjOeUvszU//Y+2MfyDNyP6d3o+EMefc/cZjcitA8dSoIVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033193; a=rsa-sha256; cv=none; b=EhLMDHcoyAijQ6eUMFnsvr+oGabpFU5PNng3wMeUih8+BQawlK8GnijlFfGywwlqR0tVNz 2gC30pEA3QPcJdvsI+8P9CviodGn6fS8mdmbG3Qpe9FVP+gwo+QYlVtWYaMO0c7PZ5AnCr EoNhcoTVihK+Z2VIuEC+Tk0P+6fSgiUDFK/jEoNCcwE+lmWTtUNEu9/IQ/uvMQajXxiS10 vwCSzyXCmPbFcRFqhY/j/UPf0u/9eCYHMZhmXDs2tZGDQ1BxJPSqduwSl5TdLR9gk87vod pe6ndMxyUncZR6sjtlJ3cI5QnOETdg6d1r9wOIkQYN/QWVS302eNNY+plt0BhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfw6xM3zr7c; Tue, 21 Oct 2025 07:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rCc8014523; Tue, 21 Oct 2025 07:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rC0f014520; Tue, 21 Oct 2025 07:53:12 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:12 GMT Message-Id: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 885e8f272f75 - main - LinuxKPI: add skeleton pci_enable_wake() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 885e8f272f7515b0325974de72d18b73318eff07 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=885e8f272f7515b0325974de72d18b73318eff07 commit 885e8f272f7515b0325974de72d18b73318eff07 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 20:38:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:39 +0000 LinuxKPI: add skeleton pci_enable_wake() Given we do not yet support "wake" bits in device there is little need doing it in PCI if we cannot check if we are supposed to do the operation in first place. Once we would implement this, we would need to also do the appropriate PCI (pme) checks before enabling (disabling) it. MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D53208 --- sys/compat/linuxkpi/common/include/linux/pci.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index ffc2be600c22..06336bf963d6 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -831,6 +831,19 @@ lkpi_pci_restore_state(struct pci_dev *pdev) #define pci_save_state(dev) lkpi_pci_save_state(dev) #define pci_restore_state(dev) lkpi_pci_restore_state(dev) +static inline int +linuxkpi_pci_enable_wake(struct pci_dev *pdev, pci_power_t state, bool ena) +{ + /* + * We do not currently support this in device.h either to + * check if the device is allowed to wake up in first place. + */ + pr_debug("%s: TODO\n", __func__); + return (0); +} +#define pci_enable_wake(dev, state, ena) \ + linuxkpi_pci_enable_wake(dev, state, ena) + static inline int pci_reset_function(struct pci_dev *pdev) { From nobody Tue Oct 21 08:43:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQnR4SLWz6F6YN for ; Tue, 21 Oct 2025 08:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQnR2gBlz3v2g; Tue, 21 Oct 2025 08:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0HCzXIPtuTqv4KH7zuDz2M7TDXKAcNidIF/GeQwc63U=; b=a/4nMzd5mLQuvvQhXTK5M7AY/iNBMhtLjyS9cRlXzlLHZKOcRXC3AMgPPnwIFQAQgRIqqV vQecFszm2m2AVNytubaHnli/f03xIWwFfoj/cNfRs0w22m4wGJyM0XN3rasfXPTy8qHJP0 GngzwNilLla9Asi+JOUnfMMjWgnR+J10a/0+XBzGlIHrdb571oQn/bhr2NzH8JRbR6ep3J F1i9AgEU1SjJuck83/oZYa1Amu89YNUdGMOeCNVCtxaEdbLm5nBzXlyDebQa4cpJRL3FeU f8tNMLWvfemSXHJwUuF1Rz5LlL9tKlj5w6oUSGJ6VNS3TqUWPjzs4mhdhcx6ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0HCzXIPtuTqv4KH7zuDz2M7TDXKAcNidIF/GeQwc63U=; b=JHdXCOzQwIn1/ZzyYqnjQ1GXq76dmhP6APtPfj7oIcs5VF2uGfDbiwYGK/58WejfajprOs h5wc0tcV01fWmrin+uTdquE0zvAO5XJ4mx9LEt5C0zMpKFKCIhjwjU3dw/7KClQASmxbO6 DBdU9LTLS0lEnow/1qujWW+D8jCF+6uyRcNtJUjooHautd4W0TVmVlgLJVS/MC3oP3Z6hI /lTd6gSv0D7tO7XAevryUTm1IZ14qJoCAz5AAAZJZ7x+Vlol3cDRv9KjT6vAEEO8WV0ymm hRULMa5W0M8sa8cV6z2r4Bgk1/D1f53CYcpMU1gJZ2oysDExUYXFxEyewEbiJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036235; a=rsa-sha256; cv=none; b=mBj73PsVupLIjxtD8EZCsb5k6Vyd+CPVrODGGRykKhvEw9jnZGUlCXA0AyHlEdxploH1G6 oiOgr1+qVlKXHJF3fDTENFga6JZz8nj0+nbHGLyBiUv0uNJsDDKQt7ACCrSYMq2siMZluk HkAl9d+EhPLfVLkzVGUWjJZlrufnLmQYhpezwhoVdjTqHjV44xEvZFlNUYliqTG1NciQ9m bYL2L7D49AAJa+sCtAnMPZPYD8ITJ6/izJRqGW3KSf5shgFp5GltNzIDq3vXV2rIXJ3aYW XLGCktfgpJ4ttT5z4RnnCHAGkA+7fkan5sTAwqalKjyrlggcUNS58TM77SFgIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQnR1mgpzsfj; Tue, 21 Oct 2025 08:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8htXt009567; Tue, 21 Oct 2025 08:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8htBd009566; Tue, 21 Oct 2025 08:43:55 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:43:55 GMT Message-Id: <202510210843.59L8htBd009566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1a52eb13de88..99ad6f4f54c8 - vendor/Linux/ath-common - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath-common X-Git-Reftype: branch X-Git-Commit: 99ad6f4f54c86845d6e3f03541913c07fcdeef59 X-Git-Oldrev: 1a52eb13de88a0933159e98abb9a89ec178d62c1 X-Git-Newrev: 99ad6f4f54c86845d6e3f03541913c07fcdeef59 Auto-Submitted: auto-generated The branch vendor/Linux/ath-common has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=1a52eb13de88..99ad6f4f54c8 99ad6f4f54c8 ath-common: update common Atheros/QCA code From nobody Tue Oct 21 08:44:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQp04ly8z6F6fp for ; Tue, 21 Oct 2025 08:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQp020N3z3tqB; Tue, 21 Oct 2025 08: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=1761036264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iiFBrwDOHWcCY6+FP++A+34OetkSi/jFCmuuiwS33X4=; b=ajSKSKFOazWompBX+c3ojxViS0Ts/2AkzbueiNwK0mCWNyBRENIP+uzm3vRnx0psAjHMjh c6sSyLJ/lccjFqHcrRe4sBrhHyx32N+403pLU09Ub09peOGkdBcPvNM4OZkpkrjDErysKc U0b7+zoSX8hicSIVWAkqWnKjaaUgxGwq7IHpgGrY7MoOTFXNyKpf0TMn0PyhpuGIAgbf3z oEYiwKFlL2O08UvMEYBIqULk7YGUAjno62p9B9xbvb9EGryzmxXQ/kKsLW3/X1h5827EZO hScdpr8K89h/DXx/kv46wwjIWEXuGOG33oYNWsyOq932PcBZUru2MQyGvQoICg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iiFBrwDOHWcCY6+FP++A+34OetkSi/jFCmuuiwS33X4=; b=rPN/RrbYrc2YAJX2u7JKaM3/xIAPlm0L4Ld0ZXSdJgwR6e4cAUR9ADJ4jVuZx7QveGP3hJ ElgIxthZUkAXFjlHAe+q0zoHDzCTOffZpO7vbwjYkfMxHzXx7I3RwYilXXOzs6mP+HnLXH v8ceJ6WUplSz3e5rQ8cNI5JGSzl9AXYAb6xq0sE0LJ3LgUrk/g+f5NdJM4dlGkVCwLpv7i Ygn1aVVDe1jKeYHsywmpKEsAG8UAmDIRA8S87ZJjX3yazL1i20+aLO9LmBjhwZxPbMCsED G1+uQ6J2wGB+YO7K3W5cgUidvAc3TfkGzSqBLCmpmqNOHWqFUF7Z93bYVON2oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036264; a=rsa-sha256; cv=none; b=S7cS4MMAPy/dm32SGx4GhAluSKviaIoTRDQDzmaDoAZ29wWsEZgNsk6E4LTTTKW8vQQi39 w144+MMzOEWW1/fTb53dDnFBZVG0lJbSLUJ0QCZP29ZKCF6q06zpA3Zv41HGuD/0vF0I2s NEArcXb+ZhH+XI6WuTwx317QCletjx749Xqqww1VDIcwAdo9rUiI/mKlxfkqukj7WAHuRA +VAiILBTvurN72oby9uLfZgP7jaboyc8y3UW6SSgwkoBFAHB/iNCo2oSDfeKcBsQyDzxoq 72OuAy5XwEM3O0deKjU5ztUMZS3LBULxRI+YAQ0GkpkAeGdzfg7LXiGjSI3Hnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQp010j0zsfk; Tue, 21 Oct 2025 08:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8iOP3009812; Tue, 21 Oct 2025 08:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8iOYo009811; Tue, 21 Oct 2025 08:44:24 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:44:24 GMT Message-Id: <202510210844.59L8iOYo009811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8f313c717a4a..4cd16d389f73 - vendor/Linux/ath10k - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath10k X-Git-Reftype: branch X-Git-Commit: 4cd16d389f7331efa3da5d765c55f612876cd2a9 X-Git-Oldrev: 8f313c717a4a6de3530045df370c7c716d8f9c57 X-Git-Newrev: 4cd16d389f7331efa3da5d765c55f612876cd2a9 Auto-Submitted: auto-generated The branch vendor/Linux/ath10k has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=8f313c717a4a..4cd16d389f73 4cd16d389f73 ath10k: update Atheros/QCA's ath10k driver From nobody Tue Oct 21 08:44:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQpP5K6gz6F6ft for ; Tue, 21 Oct 2025 08:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQpP3D9Rz3vCv; Tue, 21 Oct 2025 08:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCNksf5w/qefs2ptAPE9TTxzO+hs1DJqqZYmaXCnYyw=; b=iYGq9jQeg8BJH5NoOVZ9WKoTxmbfSH+9C9XTPIiffHbQN5OCB6aqzHUeKqcuMwDIxzA85I jaNQyAUGS/BmzKxaH+toTs2xNaHHxvb93G5SXbOjjXUbdtkoI+7Fro2XT9JsBWsLiQoxg6 BBUa1G57jih0lvUtW5jwxKUnrODO2+0+Npgn2k07QREAL20fTBsiNox+G2ksPrY4K9NcVs XBxU5O5JJ6Oe+3Y2SdJ2nSBKvKZZyeyt0vb/uGgyDjt4F0pjQLf/V0e79cCNN+L+rqOmbZ S9tQ3+tBq1t4sO6t6lEl5315dRFy7bsVSmDwxJWqVxLiJCYOFR5mmU1bFmJsQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCNksf5w/qefs2ptAPE9TTxzO+hs1DJqqZYmaXCnYyw=; b=RQduorXQYNIRFcsPVCuu961M7SJtj9iztJEWMGv9PjvR0Nv/jiOUR+6j5uaU1M/+zQZBh3 vnabyGd9bdSDT8L274k6XXHC/dhiT4/j1E6AJduKNjeT+2rvSen+ODTDjgLG3xHn5PoO/I 4TnopVWDgtazgMAg2PwRqeWwEu1tvdo0bridZWez5hIER+cAbiNLGkGdzH+jFqOFGg8S2f FvzriN76V7I4d+E9U4p3gYyVGymi8ryiueWYZT/eqrPF2pjlprKSAMuEz6WcEFwNEVRWkf 7aMw3SV2+eM9YGoKHVwY2JcW4rjcTEXJgnCQtMiBa1O65wrRzjVywyRNs4vmEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036285; a=rsa-sha256; cv=none; b=nIG6rHh9fZotiks2euOMGW6AqD/nCe9cdhq75/2ZiwelPLSWV557Bd9LSOh+X/Q64oQbqy eo8L49qHjZucEt2q4fdPKC8WA4t1p0yCsWiiJWaXi1SQWodaUtLpDwjHB5xH3x6CTYuzj7 rgkyBHiN8U/i3gOG1KKW3GQ+4CQOmKz1zBDDH82cDA12uuUec3BhFBClEiAgoulSNxr7fH diJAq5PrESYMRMmyZilayFTJtIQa+5Y4hxAKcwoOHrSN7lREBk6oEb7WOUgiMQrs6stk07 0hrrsNcX5z2PCQnYIyB7uZPl0kWLCOUsj6J7tGIZ+Mtk6mSQz/C0A3MW0nQB5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQpP2KYyzsfl; Tue, 21 Oct 2025 08:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8ijg5010038; Tue, 21 Oct 2025 08:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8ij4b010037; Tue, 21 Oct 2025 08:44:45 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:44:45 GMT Message-Id: <202510210844.59L8ij4b010037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 15532c2764c1..d6c6e04e692f - vendor/Linux/ath11k - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath11k X-Git-Reftype: branch X-Git-Commit: d6c6e04e692ffd932fa8d31a827fb24e99b135bc X-Git-Oldrev: 15532c2764c1526ec441fd6e2950a14975a6ae24 X-Git-Newrev: d6c6e04e692ffd932fa8d31a827fb24e99b135bc Auto-Submitted: auto-generated The branch vendor/Linux/ath11k has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=15532c2764c1..d6c6e04e692f d6c6e04e692f ath11k: update Atheros/QCA's ath11k driver From nobody Tue Oct 21 08:44:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQpb4rbmz6F6hD for ; Tue, 21 Oct 2025 08:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQpb2xX2z3v6g; Tue, 21 Oct 2025 08: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=1761036295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7BBufqxg4vhXdyi7muE07SJVGqIkWodsLlfnxibIo8=; b=DPp3GPR409P0qGbyBSjCrHkbKqG8PgrqHnLyQr6yMBp0urThbj/fkdR8uE5JGn1gEmKMwD OM0+Oqcnzi80UKpBKAN1pSNtKs3ZWVfuUWp1LXhRKFew171whC1XUXpTUnDytHih1Wy1z+ 7LJrto9gQj6Ka9wi3X/o9KULwIH8oHDqKGWFWZbYjHSJS14dBpR+UOg0nqxz9qrMW2vbX/ uXGuQI67QZcxkP+i2mDJnMl26jOOoTUB3UVdRd+zxJ6RR9i4OymXW/YangfLcSnRbAdPvg xa0XgiONac02UBM+YQlBsx0F+0qWd1Lu07XgVZprUZeeTo+2/TFkNe3JYeYXog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7BBufqxg4vhXdyi7muE07SJVGqIkWodsLlfnxibIo8=; b=t2M0RaUZqiTvnuTfqyHRZJmXVcNMq4yQ/dLZP71cYC2c/IBY37EqFDWLPickYXLFaUcoOB X/bfu/B50EwppBP/0mG0OXPCUU4ljJckzUHOJSj7acSAfPiibWAmL2fYhCr+ZpIxBwA9FO 7DG9OFc01XIpBeQ19CKpWoFHzaqvzO/Y0EcYFaZoPbWoyd4Zv4AVfuOmvtpm/EYknIw/hC KGjmm7lfcx9ycle8xOZRAoXme3CQ5rofBIKZ2+YDFK7yTYvw5q3BgeSP+6HiwOouZmX6r+ /Ca3Zxc+B31o9/25IbkpbHdYpDP0VmgMmHcECTbNCQkYC2sDY3xgkgxE+EsVhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036295; a=rsa-sha256; cv=none; b=ZsijUZmYC6AaIdkuXGRSqC/5b2ZhGpyHNce+ItuhWLi71hx5bLsiOJG5hYukIGXknHdVuN rdSVMKwZYxiD41oNqXzLxAafqPgtPvaJXlMqTSIKd5yoaWzXgOeII8XhUwFzEZ947bqkqd 7DlzIWryGH9IplVHYVzjPK7ha+QSV/W5bVi2w92JDdy9zKImv9T3jOmG76QdK2Ty8MyIbr r+sBjYsWM8oHk63zVDPVZpozN3zmzPmnNRPpIzUBRVhuSXBBN2z9kBGbU+RWgkbvWnAteV YKbUz21Pa0l177oxiJxMSk5rv0QixS1w+EU+vKwb/YWCMmAEI1qZKUXWY3GVNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQpb2F2HzsDt; Tue, 21 Oct 2025 08:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8itWq010185; Tue, 21 Oct 2025 08:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8itZe010184; Tue, 21 Oct 2025 08:44:55 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:44:55 GMT Message-Id: <202510210844.59L8itZe010184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4aae7925631c..fa442f39ccf1 - vendor/Linux/ath12k - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath12k X-Git-Reftype: branch X-Git-Commit: fa442f39ccf12bf1c9aa499cd0f40e321d495464 X-Git-Oldrev: 4aae7925631cae913da62ea9966383b4ae44aa74 X-Git-Newrev: fa442f39ccf12bf1c9aa499cd0f40e321d495464 Auto-Submitted: auto-generated The branch vendor/Linux/ath12k has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=4aae7925631c..fa442f39ccf1 fa442f39ccf1 ath12k: update Atheros/QCA's ath12k driver From nobody Tue Oct 21 08:45:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQpp1xPhz6F6W0 for ; Tue, 21 Oct 2025 08:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQpn5g7dz3vZ2; Tue, 21 Oct 2025 08:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=069dmqA6x7pJV0ToqX1vc50xBcF3Q/Kllxe20TN8ioE=; b=KFHZjkWtuKnnOvH8S8adXWnvh5trC9cgLldtikaI7FI6gQHeTmMoBsSElqa4mywMQylJ1h aj+mn/CNXznhAkL6L54V9ByWWegoBnwywLJfCNLRdAxMHJ1vRpoMZSUcCCfywcCjAH3gAx aUhE2Apw1fgEsQ+lpqmEwBRHPQWCarXJI3EWSOkUS8pIx3p2BUSWgey2xDbiM3tGOGLh8J 2ptYvNilJRD9ByPn4V/9guAZDh4imDALp1YyZn1ZXvtjJAR3I/9FehgDfX+Tca2wJnnaH7 +jWxCyrMpJLnU1spPA+Mqk8nQKNVjUV+c/37+GqzqLJ0y/Qck3ZyCi/USmCdXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=069dmqA6x7pJV0ToqX1vc50xBcF3Q/Kllxe20TN8ioE=; b=RWpWJM18QkivRH4FidEd5Jk+PPrwCllgtXl68CnCY2E1PHXosK1+ZKY87D0xKlXwqHcJFl MWen17uf2CFU9KtHbat3uUeRT2Birbca5Ht2ufzkr+gFnuPnM9HuvSanIy8LLT4zmdUMsd qHsWD8N8kPEpoHruNPDVDlqGMY0kZF75KBzAPpSK0KrAN9760IvcwiEXVlKB3DTVIG8ow6 IwSQEXf25H2UnWECnbFfvDXlfyVBZCW0uvm5n8j/mGoVFvDiMpE3lCDI10T1o5EAhZ8cAZ 4OQtd9JCy44kQCdr4jm0dVxj2CF3s55ov64e3TBlBdDMQZCci3t3/rE7Qn28qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036305; a=rsa-sha256; cv=none; b=Nhxd07JKCEn2bRJnpdsNFFB2cwlGKnV204vMxer7b62Ki/MBroMGg4Wrs+Fsq8a49rqCUU 64pbob57nYQKHrO2UDEom1YS2RT6rMFwBubeml4h5/9yF9Q9IoCXX+YlDFF76FmdijMAfl hGQqdWQOXN/Z6Jx9URZbK5lFQmQfPuEPor2FznieWcdy5kd6kwS6+K2snEgMnhciMAtAZg 8w+YcY6NtW+ck0PfA4Ju9Nt3SdegYVerOVi2DNzeK5LtQ/SKYoZ19Wfu95lFIA7H/mv8PE 8Git69ezQWLFSW4VssYC1uK3+ytX3+/w6WDw2bSxI6L90OcO757aC3gbsWqrtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQpn4mKhzrlB; Tue, 21 Oct 2025 08:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8j53o010360; Tue, 21 Oct 2025 08:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8j5AG010359; Tue, 21 Oct 2025 08:45:05 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:45:05 GMT Message-Id: <202510210845.59L8j5AG010359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a5855fe57efb..69caa1cf3ce5 - vendor/Linux/iwlwifi - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/iwlwifi X-Git-Reftype: branch X-Git-Commit: 69caa1cf3ce5f0b6b27a0ed03a21d9e2f2bc0a9f X-Git-Oldrev: a5855fe57efbaafbcbe18d604c0fec37453255d0 X-Git-Newrev: 69caa1cf3ce5f0b6b27a0ed03a21d9e2f2bc0a9f Auto-Submitted: auto-generated The branch vendor/Linux/iwlwifi has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=a5855fe57efb..69caa1cf3ce5 69caa1cf3ce5 iwlwifi: update Intel's mvm/mld drivers From nobody Tue Oct 21 08:45:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQq13kktz6F6hL for ; Tue, 21 Oct 2025 08:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQq05Thnz3vpW; Tue, 21 Oct 2025 08:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cdv1DDDZQLMSBmVlEjTZkDWnEEyc9Kaf9kMDqEs0r9o=; b=yDhRpqj0xOr93Ujfn/MxD+qTfwT5Vj3ytCbDucwa4rCdK/0GLpTQ3d2tdLkQcnABzet0Np W+9l/Z6KDQT9Nr8ROg1qQGObsrAAl5nE0tgmwkJB8WUP0Nt2ARj0Eg0cWGMgtEdgI9yUTD //lqKM1CUg2zn2UwScpWJ7BoFTum2lPVq0kXLxswFuHC2+HdwhACDS6cP278QmOLNZvzUB SQegjMCUWcn+ojcsv+RgKs7TVZ0DSEcaYmyBD4cASi8T9Wnw5M1PnGnOEIRBPgKjh9aEHC q5kEdQYXy8S3kFrvjCEVVhzIWf5wRv7PRhxjKUaqcQrbhZMn/wKRAKSrHe/DAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cdv1DDDZQLMSBmVlEjTZkDWnEEyc9Kaf9kMDqEs0r9o=; b=RNqBG5fdyxZQyGZDmDUNPg+oGdw1OXIhV6d4lT+3l3KV72PahSHgzQhEa9POfpQHYJBkTN FM28E2MXCK+MgTNklYKDkQEnY6CeC4iLkoC9NzeoIgTIWuss18H5VrjeG/wrNrXLXKSzif co/oFF2R8arSyA8K8ngC9gk8ZSYN5SaIGXXsRFW+2ARn/qTAtah6um/RB7I8DDeHmjXg+d tyKu6DvDh6m9XN7ojFrlJirc8l5q9v1rmu7QcVgY3/xFZFG+Ju1LgFSFLBOwuhHPi/6FC1 UwnvFz9pWV1aul9yg5zEH2ylbaA3SLZgbtLadm3HaiGxbj3symj6OZ8S//9rcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036316; a=rsa-sha256; cv=none; b=d4+o3zTQ6XKXI2qKUi3wAJY1RY/PAcmWfkx2J69Usu7RvvqQCBv+8eqcTPgdmsdA8mqDg5 NZUrVSIlcWGfl/ZniToE4LbbUBZNk3hsk9BNrB4AH6rTHV5CTyrG+YhGO1uzeykP/ldEsi xpLDGR7ubypFx6nc78xyDaJ+Td4jBq/RutoIcJZC0pATo3IJKa1pOZCsHQ3DlcNVESjwcX hpYbNFfRkiyscHeFfT2rQ/wITfnX2LQ7HhQvkgwkHr/jZqDJj9w/3F8RQgiXM+WyLPmJZt AbyTv+L97v19G4iLltJ5wDtLoFHp9Px2DcI83OHCGFNXlAxlUQiEVl69UT2z8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQq04kHTzsfm; Tue, 21 Oct 2025 08:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8jGAZ010511; Tue, 21 Oct 2025 08:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8jGmg010510; Tue, 21 Oct 2025 08:45:16 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:45:16 GMT Message-Id: <202510210845.59L8jGmg010510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: edcaf9a46fb0..731c85b79831 - vendor/Linux/mt76 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/mt76 X-Git-Reftype: branch X-Git-Commit: 731c85b798313a757d42a3cc9861359f47d84ed5 X-Git-Oldrev: edcaf9a46fb0beed65e157dc601508a7ef8091b7 X-Git-Newrev: 731c85b798313a757d42a3cc9861359f47d84ed5 Auto-Submitted: auto-generated The branch vendor/Linux/mt76 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=edcaf9a46fb0..731c85b79831 731c85b79831 mt76: update Mediatek's mt76 driver From nobody Tue Oct 21 08:45:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQqC2ckmz6F6W3 for ; Tue, 21 Oct 2025 08:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQqB74FYz3vyR; Tue, 21 Oct 2025 08:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vzp5aZ1rJQXTVjWeCVv4avJLuIMPKqcZVwf+gYdwpUM=; b=wdmXNAoee8qRxa97/DcZQvJpoOqp3zilgAYAmmjwmUytgispVaBEqMl6VZTmkbmGrxbBnP MYtSF2pgi6Ya93juLmwETawwQuDq6t7MLbxlZ4l9e54Yd9LbeB3h0RWhRGABPHKEt7pHaO yAV/omOPcDccVMWYzVl4tR4k6Ov43idw2LEZx8aEo9l3Ue2+09PTWRB98AddPLEny8V29A WDqnpYzQQ65p15Re+AwF83mRREUc4TTQGNCL8LIMILFpD0Ou1ww+3MpOrUhdU2r0TAFEWY iDzOzKA4T49WSjnQ6wZmPb9+ER4QNNxsM6xbAt3JNqp0q4qZd5fjhR5rhPvgqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vzp5aZ1rJQXTVjWeCVv4avJLuIMPKqcZVwf+gYdwpUM=; b=XcPqx4k2ulT9ZnH2yDb257DUPTdmdWOz2mt9Iy4TtRIUMWeyLHe+KeOxp3GGyNaxQfmBN2 eIoX76NQI5OtRw0n61Z2KwN67nS7WLJ6kAaURPCpctRSomxObKCtfkUVDuZUbWzUSjPBxd 5NeMBrJ+tZogJIAf8p3nxdiHRWXgA3TLg2y6bLSko6a7QzdnenEqpZtT2QSkPbzvFblrZi Nc4eOKy2ReBeGkRIfI8VVxbTeVYbawEwbmxrcB4HsxY7PUJtRxloiHY94n82uEeNtMbhwI zaBS9/je1XPV5Cv5PBKltM6MGB+OP5qVpOu3VPM/BpRlG7OqJwHyuk9/mxwDTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036327; a=rsa-sha256; cv=none; b=El59RO+6aL0pczL40rxGjb8LrMA+xR05yheaJQBxK3rCHVA2b5B5f+EJJwHwrYqaHbq1fD l9rH+tGG49Ee3ywbM2jv4Fqsv1EqHizRAJpHlkfvvDBDtitRkLJpFnaVz1TfbYjhe5i+mr auE+ajEkgWPTF8NJKnYf3hfRq/Hs9ox8pg6U8tDPnscc20Y5J6uD1z/ECH7cpuCpNB+eXe xEtrED3GmlOkeGZFCEMCEp1ZAE9KP0SkB3PTGxSlzxqDnbyIMri7x2V+ZDpUB5hJP4WYIo dqycfynxtNvUwYqx91iJIQmI0+yMC8klYGV5aU/UsZVMM9ExJSjbrcuVwk3Y/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQqB65p8zsDv; Tue, 21 Oct 2025 08:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8jQF8010649; Tue, 21 Oct 2025 08:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8jQZk010648; Tue, 21 Oct 2025 08:45:26 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:45:26 GMT Message-Id: <202510210845.59L8jQZk010648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e3c5f7ec50c8..c1d365f39e08 - vendor/Linux/rtw88 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/rtw88 X-Git-Reftype: branch X-Git-Commit: c1d365f39e083bb66a6e278939cd194026984d2f X-Git-Oldrev: e3c5f7ec50c8a015667c99eb57107404afce069a X-Git-Newrev: c1d365f39e083bb66a6e278939cd194026984d2f Auto-Submitted: auto-generated The branch vendor/Linux/rtw88 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=e3c5f7ec50c8..c1d365f39e08 c1d365f39e08 rtw88: update Realtek's rtw88 driver From nobody Tue Oct 21 08:45:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crQqR1Lsxz6F6kf for ; Tue, 21 Oct 2025 08:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQqQ58yCz3w1g; Tue, 21 Oct 2025 08:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hfromc4miaZOwEPHJ7oSnZILUauRmrJevN+STQ7R+1U=; b=gnIDya/GN1CMLw8ja1sQfyvXK0LAxR8PMBwM+Cl+zCcSP6qsJc+KOcgqA1K6R4U2s0ZlTJ MjZmeeqm4a9Zq7nec2hGqTWURWOgHE2pLrgc4ItJDMq0qpGwF0tvtyFq35v329FC5uHJs+ bBLXBVkLTBQetYaLkvhuyLvVd5htji4aiNPZIEuYVTAOyoozvVP9LXfZUOTEEp2sBXvq86 kOdCXH8p8zD8cAaJcwKuXChhP+DALQLTPoPqHurqET/dciyZ9WBXDD5eQoIm6YaLNrYZu0 YJ+A1t4AicwVp5eIQqwmPf/BnMWWKt2NSVipl+SbVqoHFn7dgBKm9k6dAyF+iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hfromc4miaZOwEPHJ7oSnZILUauRmrJevN+STQ7R+1U=; b=jjrRNiQFR9G7xIC1v1TQkh0hT0n59c6hA3JgsgSZjt1XimXxLnw5GOwrKfg5CEQdKWbMcw BWEnTcW7x2LbCSKkdppi8ZP0Df331FPJjXeKeLk02XNQPz6W/57Jfh6xsTyXwBWFJKYW1a oYvxnD/9WAKF8xJyqtr+iydSDo1/bO77uW6VrJK0gK2q/LepS8bX8XHq2/T+rcEueoi2Lw YWebzn8MAv7+JxBwk/kEYpKAe8tl6zQ/8Xj32gtZiEbWJbsxB86L9Y14Rcv/0rsTlaLRwF Tlxoy8hwFYFH1w15rMi7ca+WGDGcUKZlRjDFZMXr+Q6qF4Jt2qdE0UsVtNrf5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036338; a=rsa-sha256; cv=none; b=PG8j0FYKuydy5btfqwnWTamTlcumKij8TF7+HxWHOPwT1zmEIMFX1MpC+CNvTAvIT1ocIB ndSyFpb4EIZrtDi1t3q9IZqTnivmGzQyqfdRCG7ZaHlUEkZLFs26MyCckYzNQHU27UUwyW cj5ZNPCOGGG2Ubp1yySbNfswUIK3oA8lu5ZgVvU9uta2mO5jJTMtzBgV5YJ8r6WwUpaklk Wn0ptRvhHt0RwXZy/iomo+9y4nkc1AS9ycAd2DOdb1ZpB5Nqaq2kifxhaTJz7tuyKbAhQm NGYn1Hx6ZFe3taqBhUtN2usAowg2U0KA6KNpJgCR5rxFwBKjaeZsnoph7rV6rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQqQ4S8pzsfn; Tue, 21 Oct 2025 08:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8jcvL010808; Tue, 21 Oct 2025 08:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8jcsk010807; Tue, 21 Oct 2025 08:45:38 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:45:38 GMT Message-Id: <202510210845.59L8jcsk010807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7cdaab6a9134..b35044b38f74 - vendor/Linux/rtw89 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/rtw89 X-Git-Reftype: branch X-Git-Commit: b35044b38f74cf28d9e50b14854b1a8b5524aa89 X-Git-Oldrev: 7cdaab6a9134c3492bf9a46cb1bb04e293c176ed X-Git-Newrev: b35044b38f74cf28d9e50b14854b1a8b5524aa89 Auto-Submitted: auto-generated The branch vendor/Linux/rtw89 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=7cdaab6a9134..b35044b38f74 b35044b38f74 rtw89: update Realtek's rtw89 driver From nobody Tue Oct 21 08:53:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR001ScZz6F7Mq for ; Tue, 21 Oct 2025 08: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crQzz6p39z3x1H; Tue, 21 Oct 2025 08: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=1761036784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vMXQyZTG5+ISz0LS5BivMIYScYTElqccxpz8cx1pOZI=; b=gJk5Nl1em3DnoHb+nO6TDq5oJZTD0TyBWI0/z0pTiVt7PVOcd7epfTliDLuJtY8iAsMqPs 9ExGMx96WhIPnUdoZKvu/C+7UlxMeBKshFqn3X0q3+4ZSRkH0n8kpzNCu5SWbzRWTuNDLx zuq3UdWHqlOGpaEBrbz0vo2M07GczCVSx3Va4GPKnpj/eoUQzRRtSaB4AXJyf1FHqjlSKm DbXcOh5ipAIf/qrnUpzQdylJd0aYH+vmdCY0yfnG1NBjY+Q3OTlD0eB3ckcKJiqeZyX19W Ho/YxdIfeeBZSM+jzcIBmZz0QbyJvOravncDvnLyS58CK+4Ub7mMqe/F4Pctzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vMXQyZTG5+ISz0LS5BivMIYScYTElqccxpz8cx1pOZI=; b=co3aRRwHuKcXCoUxlhtbUlBFF0od0McJjBQkldwpgttiUBkwYhelZmElV1UyEtjI9Z0ilL k6oDl/YPMc91djYf3Q89KaZdHARd2qgJXfb5k/hvSlgWV5SWP+1HtUhZSBABtjoOqG6q32 wNy+usayOX5MqIjWwWPhNM2lpbV95UxQALeGNYOsKEHmh/n8VSyOMb8ntj7vTA7E0ksLIx wdVcbqxi4F2m6ylIqTN8B4o2ULjQTlVM8+j6mJWcztfD0i03fNJlY8Vmv7KLdo1aJMS5st HvPxo5r+zAN50DeR0CIi/Ljxldj1Z2CYyHDYIRwnmm+nB34HVG2mKs04T60afQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036784; a=rsa-sha256; cv=none; b=RauvG/+OKij5nNq+4p2x5BJoKNspkO5+3rfJEDYj+J7hpcqaFCR493DxDco5k49j3s2KAA r/36qM+RlZJjFYynwp0tmih95y1syO55SwTBxn2wSQosw9jTRASCjaIyoRnSm87Vu4u4yh xJdWuUJNrXwlI9taKgvaFOGhXWD3iWjGIUl+gAThZ4FQmI2YlMbVEm6Ev9tE4PIbu7nDbc w8xq7apOPW6OG9unsp174MDUn9Tnq6HUxdMrxOWp/V70he1QD22b5xs2ajbMR3f0CNHsQO ncNhvF3w/R6lBOnNO6ARgEoBKHeUst8iZcvmZp2+h5N1V6Da5UZah/y+gyJ4dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crQzz6BMQzs84; Tue, 21 Oct 2025 08:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8r3FD029012; Tue, 21 Oct 2025 08:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8r3dx029011; Tue, 21 Oct 2025 08:53:03 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:53:03 GMT Message-Id: <202510210853.59L8r3dx029011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e7214196c2b0 - Create tag vendor/Linux/ath-common/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath-common/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: e7214196c2b06f7c0da2ae794ffc0a71d546032f Auto-Submitted: auto-generated The annotated tag vendor/Linux/ath-common/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath-common/torvalds-v6.17 tag vendor/Linux/ath-common/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:21 +0000 ath-common: update common Atheros/QCA code This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit 99ad6f4f54c86845d6e3f03541913c07fcdeef59 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 22:04:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 22:04:50 +0000 ath-common: update common Atheros/QCA code This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:53:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR0Q3Yfdz6F7hk for ; Tue, 21 Oct 2025 08:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR0Q1tcFz3wwK; Tue, 21 Oct 2025 08:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KamW7hoYK64aQsrZ+AvNHwGfc+Ze0cvecgnS4+JpF2E=; b=jjaLl71inEeYAeqviUCyVxi0n/z1QKQqpeHVvl0xgjbaWTYNGlwUWBj6d1kjqeWiccbF7c JTKwoWAWL9591f5rSRE5/qciy3wDCuCsPTdZhchJmb4+ej5fuPfNw/xC5x5Jf4+X25xbRb pCLYmDdBS9FQ0YojkoX4TL33gFKKSrog/xJakj6WbCnsuT75dYVhBLiTDiZ8XJpe431jaB hfa6XPHVaQj4bkebZJxf2/kdH4SKAnbtsdbr0JTOMmg52+TFl3SAs9l3bEugM+2G5F8Hn4 2S/ev8K3T19KzP0Cigwm0Ps9xxrBlDDzSqPssaqtr2m7NBGlaHUfDei3YckoPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KamW7hoYK64aQsrZ+AvNHwGfc+Ze0cvecgnS4+JpF2E=; b=Pa+IWE30H9ypRguJYMik87sLmETvgXE4wZRDpOCyltzldraWrbcnmZDVARppUVAYNo1yoE GRI3NJ94+pX6HN1HZyFM1hm5L3d90aexHMPIK93sJ3s3qgaHdAEKQTqrtg7hCGBvNUZ5gx EAykH7HKjGvNZUToAOOOezymJI+fKiRXLEva68E5KwmO2/Uryam1abGF4ZNW/KORZSbdEb IF/VPoQ+Vj+LNC/uWWpXhLaGs0yTNNh1o7jZQ7zK30Xlxv5k/tPB5StE+F5y7NEgZEjw3Z ijtfdEsH5jpW4imYpdiFhxmwFoJ3FfKflKIJ4tQcNA+33QYDT/EJnzazWRMBQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036806; a=rsa-sha256; cv=none; b=CB+hgA0dIDh6jeI0A2tBiHPUM1+ski8UJ15FvG3T3r9LoMrF7CY7grxhsP+ipAytVi5SVB 1XnstUub1wOEPOME4NoH9RP9JMgY31dz8CQqeNZO6thV5wE9Hwu8F/DS2dy6VwQscTTBY3 xEAHoS5dMbcxql8/O0+/WFuJ5khzZzKq+ZafurI5eL8CfC+b01uNirvzXMt4w1eNDZObmL kPTm6SIzRC8Oq/60t78JiEumXpb/6KqYMNY1H+f2DnvLKxXbVq16uZeRZ+FrwrvgbXK8M9 3Ih96RqiI6qRRkdZLMGli93zlSX3FJARNbm3t4g9804X0sD8VBfTnnfW8vSchQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR0Q1RKdzsRk; Tue, 21 Oct 2025 08:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8rQdA029175; Tue, 21 Oct 2025 08:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8rQ28029174; Tue, 21 Oct 2025 08:53:26 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:53:26 GMT Message-Id: <202510210853.59L8rQ28029174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a9dfa01e6c30 - Create tag vendor/Linux/ath10k/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath10k/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: a9dfa01e6c30ec4ec5fb711d947a1014d6520f50 Auto-Submitted: auto-generated The annotated tag vendor/Linux/ath10k/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath10k/torvalds-v6.17 tag vendor/Linux/ath10k/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit 4cd16d389f7331efa3da5d765c55f612876cd2a9 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 22:07:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 22:07:56 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:53:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR0Z0J1Wz6F7fd for ; Tue, 21 Oct 2025 08:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR0Y5HDBz3xDD; Tue, 21 Oct 2025 08:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pu7fwIiPyG3cfTONMI9mYpQukYFyA01n1N7WvZbl6eQ=; b=QDgwrkAL7FGuTQ3kjNy0vMo8PiwiM66JHMZi7wlQHynEXlOsPINU3dGeEilRijMgX4ZxuQ q5YLBnfirFSBjUh9TPTSAJQXUYplaW2RURMKN2XEqPPsZvkzcZsPNwlmQ8ay20nElOeFn1 7kYAFU0uv6Ak5a/je4+ETA0rP12X8Zr+b05F/hrGCtbQ+ynspLSn4m1CFVxKc4uJtPzMkv lgQcpaIw1mBypRrzm1bh7AXNmS3k4T7Plza0jHMHKSQTmRVoBwijN7YhxLO+Nb26X7ixuV VklgbsC24HpNV/Z7wsVDero/P2fgrAflnS3gLhdaSvZQU4fhqJLxSzrJsXLIkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pu7fwIiPyG3cfTONMI9mYpQukYFyA01n1N7WvZbl6eQ=; b=yrCx+YYMlkRO9JPKc9VlJb78XCPHzSgrgXnZLlXfpPQceVfWL5jUW/An1shDHRfodY0ck9 IzIansF1HkhROYGfZ2XAlBTzm1P4gdSLtiMBcEaair7pTt+YP2vTYDVDfoguvxW+WKc6Z2 h9GgEshgazzqHgp4KO5ntNGM9O4AiFdQYoN+1+gZ8DahOfskILWlbuHaWlssyELMieAYU2 B/rC71q/eJudxrTb7MedwFq3z7LjdHnyc0SiNYe0TydJx4awobaPrIGjJ3ObO3FgvYEmYi hYIfLbSnv8sXSTpP/8UumvT4U1tizIHOjCk1wlmjWt2RREbEmRBbDUB3C0T35A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036813; a=rsa-sha256; cv=none; b=euoJpxoLMhlxlqj8PBF37LVpVGETZxyiSI24IcILbxu+PVTsE/8z1zo7HPBUa7RLnGWcED /K7FDMgsZ5DAFTOnbFV1AYD+g/ZkPFsb357tfFdlTliHRQL7KwDw669GQKd0mObhVNl+SD 1ajYUobW+s4uVvkN7W7L4sIvW8rlaw89m/Ubo0z5hT3UVvqX6HXmj57GgnFrg4qPg20Pv+ PJp04yNn+sZx3Q7QWO0dFyqCt+2oekLLmlsP0T5qq6qMd32JqeuB/wqykRo0mKChI1JaOy MwJGfPYg8Flh5f9Dephu89cvdUyeqdlzb2XXyGXoqrpdJkrwG4gyz+hMoxAHLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR0Y4qBTzshq; Tue, 21 Oct 2025 08:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8rXjG029295; Tue, 21 Oct 2025 08:53:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8rX5G029294; Tue, 21 Oct 2025 08:53:33 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:53:33 GMT Message-Id: <202510210853.59L8rX5G029294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d3bae5c79906 - Create tag vendor/Linux/ath11k/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath11k/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: d3bae5c799064eebfa6899997b13cc547919fcc1 Auto-Submitted: auto-generated The annotated tag vendor/Linux/ath11k/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath11k/torvalds-v6.17 tag vendor/Linux/ath11k/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 ath11k: update Atheros/QCA's ath11k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit d6c6e04e692ffd932fa8d31a827fb24e99b135bc Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 22:10:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 22:10:06 +0000 ath11k: update Atheros/QCA's ath11k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:53:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR0h21pnz6F7hn for ; Tue, 21 Oct 2025 08:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR0h079sz3wyb; Tue, 21 Oct 2025 08:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxwBuTvamYDI80p5fW1Q0iRGAHA36sXrFUtW8ZyX4vk=; b=wIb5qeuu88dtJt3zSFvI29WBvR0mAJIOGK039zGyNj4d2c6LTj86mE5gHicAbfrl6vDHRj 3Q+/rd5GK4Va4F1fcI1xpfueYcCbPxu9WA7s/GwVbWQCsQJE+2Yu4jDc8ehqlpjGt5O411 MN3N+asGUBtpEUXXsz9g45QS6fR/rJWJyYPIiN9i84cMZjqGciX4e0ANzcABUBO8mmt/c5 MtlQfCF8ojU5zMOGvQbajXjcUGYp3sLggOcuXU5edpT7CpLGKJaxjBkRZvISPLbEUXR4zL m+cZf60WhPvces+ehCnoSw2meAPEYg7dtl8D1VzSNUgxkN1+MyQOZCstf278tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxwBuTvamYDI80p5fW1Q0iRGAHA36sXrFUtW8ZyX4vk=; b=K7BqinjqVk7QhuUdLI/oqWBF686YwvLzWGVIGPqn+zdGQw2Xx14j05n4PVDXRzyPREDJZe FrOMBVvfvbJPZm6wveZbUoRzJWzWO5X2A8svBAofEBJidoUhnLMSwG8W7ofulrx54FJFxH m8rpaEk0eC9IPnJV+vemRDoT32hnaFZgk32OFp2HhVROFjaqPJT5cZb9KQiGejbIDeeear sPPaZqKusyhPgXv2BpccJxK3/wI9i0WsfQr0CoA8f+9SMVhTgg+pg8W9cpzPoPtb9vVPzj sGkKdagsrZjpK+C3Q3k5e2r3SvyIS9ODJhLJs4HLT38swHdYc1klt4rSQiKrVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036820; a=rsa-sha256; cv=none; b=ECnp/70KsgsmPou7LSu6JGhNsgOu2820ZJ1yRoucGmSS8yoXFKtxe15NRFK+xsU7OL8/YM GMgiI5qYpY6g+uobKZQCauw01Z4bzqIOk1iqF2f3Z2XWTpJ0Tqm+AZZPmFQgakqCVz4yX0 +Wf5mv8gZ6zdF6J3swmCFxgZWvLn4HGIstscOVpsAhXgpSO2aGoq08N1FsKoUrhLkrViiD WyTlgetRwPtSAWdf7yNXMjeBSaseS/pu4HIByATvoyltrqkLMLgKMR6Aw5MqNB94wlVL5Y IEyeaz1m6lst5zuMGIVt3X0wyfLPcVeiI0U0HZXzMcMFzWmKJhQAyX2xL/BLGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR0g6g9kzsFh; Tue, 21 Oct 2025 08:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8rdw6029419; Tue, 21 Oct 2025 08:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8rdGP029418; Tue, 21 Oct 2025 08:53:39 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:53:39 GMT Message-Id: <202510210853.59L8rdGP029418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0167f5ef7cd6 - Create tag vendor/Linux/ath12k/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath12k/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: 0167f5ef7cd6e543111de6ec0a7870731dea2b98 Auto-Submitted: auto-generated The annotated tag vendor/Linux/ath12k/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath12k/torvalds-v6.17 tag vendor/Linux/ath12k/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 ath12k: update Atheros/QCA's ath12k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit fa442f39ccf12bf1c9aa499cd0f40e321d495464 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 22:11:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 22:11:57 +0000 ath12k: update Atheros/QCA's ath12k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:53:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR0s5l0rz6F7Qt for ; Tue, 21 Oct 2025 08:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR0s3v5Gz3xKh; Tue, 21 Oct 2025 08:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8NUpjdHG/udrBmxwiWXyaHOrCklpwG/9eiTfeQ2h1r4=; b=A9IAIf+MD58SwYJ0agBXNALe1S/Bl8XuWldda48z20oM/cXNksJZECM3Gfwu2VTARE2VO3 Yj7xRw3T6AXACDG64eJ6gIJycaIigZtgqSzAbwJd599m0UjgQmxPo0EFMZ7UDvMtW8zd7q Al5QBVs056LUoXn2LosThTT3KEDRTy5ydHz01JPMb6ZfM2wt5NOefHFGq+tL3pc59/si1W EMO1XfEOXauI9ZNZdUfcAGK0GDcX5BohyihMfWuemh/OwG4ET05fvnGFIrJSOo9QKW018m Z/fktrLEyKo+qw+KLbaDDAhZXPk48PEHois/Sd1rTBcBd8oc69Qr5RtxbxYIqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8NUpjdHG/udrBmxwiWXyaHOrCklpwG/9eiTfeQ2h1r4=; b=ekRvrdetYsdNlR1ESKYUZfctoIA6JlTemCmDPZEgWMkXQAu1BfLezf1ONd3p5PAFAS7Ub4 +7oWf2oQQDnm0OtQE3/kyouXQ9Cy1DuajSZwNpc4bbbHmloBmbbGG9KYp7ULktgdoipyvm 9M46vqWdm6udxY94Q9tPMzTmvmGD98N6wE8H0VD6aqaSJX5vcwaBpIk9heUmzY6eOhxy9k sF2AIrKhhWl6mpogDTVzH3HxhsgA0EbWfcL5qESgIVVfq42ezVz1iQTISoIYd63HWUlJ9K WD6iJPHfyAh7WcoCoRwvTpDERQ20XiZUYezeOgXcsZ4uL/gvPMBQNTBatjnS8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036829; a=rsa-sha256; cv=none; b=GePejtuNlURXliYtu8uwf0LKo42Gq6hjK7KEovFZyeyp7ny980lsapfv5+2bBTNSh5xw/l 4UMSl+61vhm1BVfbUuGbsDdittppmqBVn//Xg894oXo7K+/b9P3hkr6jYELuin8u3SON0M qF3gOAcUK1cXOtiJTnOPAAx2TTuk4S94MtoywHG/YPVLSwMc5Mz73agGcAx9lFxEFKcDBp SVtp+/7fYxIoWEga8n2zJJ6E4rJmnXuKW5aP7YDYJgosAwFKe7lUwuDtz3DFkunBnf15Kz OtQvh7vrN15TWejW91R5BcgYPzBv5KCsfI91d/EuJqIICKylwDuW8+tTP30j3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR0s3VZtzsSx; Tue, 21 Oct 2025 08:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8rnTR029548; Tue, 21 Oct 2025 08:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8rnsa029547; Tue, 21 Oct 2025 08:53:49 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:53:49 GMT Message-Id: <202510210853.59L8rnsa029547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 76d984d16cb5 - Create tag vendor/Linux/iwlwifi/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/iwlwifi/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: 76d984d16cb5e58cb9a4015aac4ca0c024ae2ff3 Auto-Submitted: auto-generated The annotated tag vendor/Linux/iwlwifi/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/iwlwifi/torvalds-v6.17 tag vendor/Linux/iwlwifi/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit 69caa1cf3ce5f0b6b27a0ed03a21d9e2f2bc0a9f Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 21:55:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 21:55:33 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:53:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR1218c1z6F7HR for ; Tue, 21 Oct 2025 08:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR116X72z3xVq; Tue, 21 Oct 2025 08:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIAoJWcvr8rz/J9V/tmxLMuYtGBaLF1NnhVVy5wQcr4=; b=kTBuXbkrpcCes4+68OwsitLLUKOpHi3tJxy54dOlxw5swmjowjpRGAFFgvuysJv4Gdh8p+ u4HwqDi1331ckwx2kwl9t0HLMSVvF3AXK2gpul2hmnUvIJESyjpo0tZSWDfDEJKViQF0Zu /QTdQuRjN64Q+1rrbUg5KqalM+GOjh6yyHSwbKo6PkGjRjAyVkFj44lDzmM2d/62c9X2v3 ZJvHGAVELpAokZsfvzUX3KeZA4wql2Uw++hCl79YrCo82z9vD+VpIzqBTOA3dnWNlJJprl DRMFEE4xsPnFHQLWTWSeMc1MEYippLCySu4+qBx78xZgVRpqzfQwTUo4R8jznw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIAoJWcvr8rz/J9V/tmxLMuYtGBaLF1NnhVVy5wQcr4=; b=eNTunv6msYyscm2xuB6CeUR13vMippcQWP6501/wnGzfvYtJDvt0q7wG6FESWvjToQkcwI SLiKnZyusTmeKPqJ2wdcpfKvcjYBYWIe6X7DcjRULuwECjfkn+hSrGoPdV7hXcG9nBmJ8L Mw7h6XHo7GaCxRc72ylcOx0OiHmg3jeQ7hN5FKhtQ5WqVCrJjC0mDEhZcr7jkyrecCnwih mvCY4d3j11AzNVrguUyInyNWHL7jRpKghdHf6J8Q6oDfbsLq5Ola6Ek2kjSN3JHDoALRiG JpxkyDRqJ7CjyqUrbDQl4u+4eHDtZ6ZSa/87F8ySbZ5oCF/cldn/wGQc7sW9Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036837; a=rsa-sha256; cv=none; b=qZc34nQAf4sQMvrqoVq2xNYVH7bakT/Zj9pRDtw03hZD/eMlsTRYr8lxJUlMYfhk8RjoYd o2ZXg2FapcHeWFNXNoGThzyZ/WIMzJYZZM0vRXczTMXT+F7kLDM9A919pWTKiQh8MRrFVv u1vXOv2WCT5nUo6Pf06YfTJ+Jho0VuEfCICcKRXfmCuu8wiiZqhDQJ9pc3Xl2patqDgWnh kIAofMsEJHSQNC/WMdFE4s1eMzw4rbjRCDCvGLgJLKoWLb0mzFP68PI+L2CJIL5uyh6V/I RbmEfHQxcF/1wjX5JSFIhH3JOjhJjOMQuPC3Z3yOpH0zmA2y7QN/+BsumqCYWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR115tGqzstj; Tue, 21 Oct 2025 08:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8rvNO029684; Tue, 21 Oct 2025 08:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8rv1B029683; Tue, 21 Oct 2025 08:53:57 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:53:57 GMT Message-Id: <202510210853.59L8rv1B029683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2673788dabb9 - Create tag vendor/Linux/mt76/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/mt76/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: 2673788dabb9e7974ada822495aff6d930867af3 Auto-Submitted: auto-generated The annotated tag vendor/Linux/mt76/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/mt76/torvalds-v6.17 tag vendor/Linux/mt76/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 mt76: update Mediatek's mt76 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit 731c85b798313a757d42a3cc9861359f47d84ed5 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 21:27:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 21:27:11 +0000 mt76: update Mediatek's mt76 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:54:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR1F4jTFz6F7fh for ; Tue, 21 Oct 2025 08:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR1F2sklz3xlN; Tue, 21 Oct 2025 08:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vb0Sl+MXyuQByqyF6OBYSd5emkzIaSCuc1nP7AFB800=; b=rn8f9dCALjTOZqBUW2uZSTTrhCi1jKVLtA47RZOib3dAozeeHokbEAEwT6IpsQae7BucjJ KmFfg6BF4xA2ouo+0cmkle0Xfx/RtYiVuGObaTm5/vMe2EerNbo0rGfZkLSzTi3sfCX9k8 eX8l75M3x9M/rsmNE+o0F5yzK9+MEn6jBxpqRCsCdAOqEMZZ+0R/MFeuUKnTB1h92xae9e WrA1T7K8eflDXZVioDeXfFkiLD91FrrTpF5JEhfwb1D9oAyEKSUWk9sEcW2mdPwRY4stDZ NEVIrcCEL42AtpdQibQcG+gE5jooaX6jKP+n2U8E3/D73j5hHJF5AME+M6ND7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vb0Sl+MXyuQByqyF6OBYSd5emkzIaSCuc1nP7AFB800=; b=EgZxTqhDnFJc8I1IYYJLMzEILEOs6cVkHHrd1oOUcGJATB3+jp6thNYomibojIzcE3jhvV UlhxsoGpM+CPw/9N12T6TPA9SXDO1ZpKpqn7vO4UN4OoY7ucaAek4GvB98MUcL+VAoHDFd /YzZGHzHVAxJTPm/gpt1RV32n37+W9/2Yhu8MU0jWiAZLxfI8AD8bBbRXzMghpxspMqdmy +H+pAn1NZeNP8KDcg85G0sGvkeLfWB9fVgrr1g3KOOSpWgphoBkEuBKcFnpecUPCuPVJKo eqbhASa4hVQsBZmNQTOx6KQkrVpAtr4qlno3G3fqlDue74EXEfg7cUgWd7SakA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036849; a=rsa-sha256; cv=none; b=CaCIj5OhGfrPT6aHG4xWXywh2r4x1q5il30YkqJLskjRF61C6jEa8ZH+KQWZhZYO61S6ME URCrASfQn3J91o9cy/kyybZAw1HbyQihsStUJBzL2ZcCWQNlOaHC8ej4BzwhxXYMH5sk2V dMbdmUAq3ePxN9uIWBtTo7wQKZc0TnoEXniFYdH86hiMtGoYqSF297YolCuAAkKHMyC30I PoR28c3g1HDTZfGJ/LG0hs2y3zg5gg0GBHnxQfWHpE93+rwHUVvQF8gqJ4JOoWQigHNDYD 2rTP0PHPpnlYd92zmLBiwanC4Fmm7pWEsagOi0e/vDOu+YkIMy0k85Dkpiopwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR1F2PThzst5; Tue, 21 Oct 2025 08:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8s9v2029908; Tue, 21 Oct 2025 08:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8s9Gi029907; Tue, 21 Oct 2025 08:54:09 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:54:09 GMT Message-Id: <202510210854.59L8s9Gi029907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f1d0f6779e84 - Create tag vendor/Linux/rtw89/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/rtw89/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: f1d0f6779e84d39e9349cf7db39a4421f76bcc47 Auto-Submitted: auto-generated The annotated tag vendor/Linux/rtw89/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/rtw89/torvalds-v6.17 tag vendor/Linux/rtw89/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 rtw89: update Realtek's rtw89 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit b35044b38f74cf28d9e50b14854b1a8b5524aa89 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 21:35:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 21:35:59 +0000 rtw89: update Realtek's rtw89 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:54:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR184pXCz6F78j for ; Tue, 21 Oct 2025 08:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR182tXqz3xg4; Tue, 21 Oct 2025 08:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7pAW9uZClbf/SXIYet0ylzJzl1gN0vOnvCfaiYeWuxk=; b=EHRenWT/sJogGuTDV4WcIqv6xTFaCR9INBO+3Sfc5SWKjlqlp9kEcaYtGQrV99xkMQlRuY 5lA8s7tzjgt76kkheA2cnH18DlB25ydoBtRht4aAAmkV7pOTokYY6XffwCOu6F+YwsscNv 1PsKMs4vWGS19fipXsVSIHsZYvawvW3yPworzdn6suBnV2oT3ZvgOly6HukuskATpltRwR Z47AFgXxTL7a4vMgiIAxNtwmCivoDUdFhJe/DSSflrHA3V0Vq4tw6/1Db7ZiLGYXEyP2q7 VXCxgLKqLtiinPZBURnaBGt1QratQVYfP860q1HshKQPWQJFvCYQtbvyGkojUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761036844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7pAW9uZClbf/SXIYet0ylzJzl1gN0vOnvCfaiYeWuxk=; b=gSmx0DsVZ6eIidcYyg5V9+tvGiKAna+QxMIdFqtA59Xe5Ey5h8pxRg8xVfcmwxR2h2xeDQ wOHgrSm2Nd9oiB8AqwYZCZWEJgKXqfVFV/Io5sNPst1QRzBPIz5GqqL+hbRge5GDp4TPk7 T2q18+cNqj3hTQxVOXq2lcpvrOOK323Jm5TjlF/prXyEmaSWrbUwVAIIHQlJBmMatJEYoT MboDN9lPm9zY8wNJIDAcoER8CIpxrsDuqkCAKADvoKqUMh6bXQ8o/2PcU6VlBvcadnduXS leKWhK0/ri2264h5JAuKW6K0tAU4LGJMKHYUX5FafnXFZ+KLAX50LoBZgOCrwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761036844; a=rsa-sha256; cv=none; b=gJ+kURt0uxhngqC4Yk0HFbjxOeEvj6NW4+RowdxRzhFWLMf20QsqN0+E9IAjNKMwaSxkei XuA36Ak9tPRO6McwQcyaJmqBDrnMXeCxuaivsNGYlR4E9mrz8XzgpCnAXp0FnpEJh+X328 UCfiYD1o+O1q3DHLA8FHT6m8Z2Y0kD5yG8B/Jxg+6LDkorbB4Nn3Wxy5SP7i+vOq4A62VH KpvArf9ClOwbUsoYdI1P+Cr5sPTb9gkF54MqZ7eBho5vSHzt2E1b073WNNYah6mr0S1Hvh 3bbvYECW3gjrM3a2K3GoWxgigk1cTPHyq4hV3+z0n7qPJKehq5f5SN5TqteYlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR182Q9HzsFj; Tue, 21 Oct 2025 08:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8s4r5029807; Tue, 21 Oct 2025 08:54:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8s4Mp029806; Tue, 21 Oct 2025 08:54:04 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:54:04 GMT Message-Id: <202510210854.59L8s4Mp029806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b0582dabf27c - Create tag vendor/Linux/rtw88/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/rtw88/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: b0582dabf27cca28f65853c9b5d39eea9a3e88ff Auto-Submitted: auto-generated The annotated tag vendor/Linux/rtw88/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/rtw88/torvalds-v6.17 tag vendor/Linux/rtw88/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-21 08:47:22 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit c1d365f39e083bb66a6e278939cd194026984d2f Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 21:31:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-11 21:31:47 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 08:56:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crR4K4fx2z6F7m5 for ; Tue, 21 Oct 2025 08:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crR4K3g1Vz40XQ; Tue, 21 Oct 2025 08:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761037009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZqEGFJ5zWz6RV4ewXPS2dM8GX0mUt0gcQrgb/2midU=; b=Xi6OSxwcVSsO8yb97NhSirN78sNlGHW8kW93xakioQ2HLuvAzAZW4MDDRfAxAEBQn874jg a5yRz9yaQEyjRwwMYtcK44VUQ4zd0pxrucOhrPp5jiBMELJYB406UXqnyVH14jAqkga1Fd i/2d0Tz8ecuyeFu7PT9teJhevFeBdWQGQswnwZXwxx40eZkMBoi4NPNTtno8JKFhdXYcBM b4pABEWOks+QfbLzJG1aYMdp4k8SVhWoMD9spqcu1aFkhmoIG5djokMglFUbWSJW/5HXoQ bgit7m9sHm3jCMwn4PjT3hzYhE3op6HJdEpRMx3HT+JJevGEVmAjAxyrZlpoSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761037009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZqEGFJ5zWz6RV4ewXPS2dM8GX0mUt0gcQrgb/2midU=; b=g7822t8jODsUhJFHoncF9jHibgMyW23EsD5xfAX3m5qq4cDaDTX5YEGCGWODAC79yNqw6G 84hm1VQQGKofmEGrtZc6mCSaPokUll2pes3YG0hwoXHheatkvr5i1ByfNBLhp3yxY/TupP 6XgUEMWzD//Evr4re19ty71yz7OwK8Q0+5vKjYkmieaIZQe2+SeqVdeTjM4ApRz2AJsc/h ++gdw9uq/qcLs7FuuZzysnOESIwo0Q5sTqzCTpsgHb9+8kWFRNxQqf2x5qwiBJ7VAhmUhk PRd6t34De9k3XPyJ/qs7hK1tiSulFiBVb7Ssdf8quFaiIV6ZXNcLX+Crnk2Pfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761037009; a=rsa-sha256; cv=none; b=vWL82LbYhYpA+2IQkH9zqFFcJIHZ95adAosTFKrsl2bb8hfNl4j9Z+7lOeY8kUtwqWilPn 1fhq6BMqjNh+zYIiszeBJsyWz4SbEi46wC+wOzv6ITMt1Hw6ZHojJ3Tbr8hEBPR50q1lAJ ce8RCybk0IR+wVTo5pqevu2+iRrhKD4vmBq5igcgMivcXFDnWcSb/NXXfBI80KDjOrjPeO xnNr19ZK9o9zzNxchT4RdzB7+X0IifomCVKNQfOTswTSSmfn4r1InPGP7equptFF+icozY SQXlXFUU5SNSItDirRJxNGGm+q652jDfBUHxVDEOu6frQS0pBSFfpFBwAGM8XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crR4K2zx8zsFl; Tue, 21 Oct 2025 08:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L8unUB030788; Tue, 21 Oct 2025 08:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L8un3a030787; Tue, 21 Oct 2025 08:56:49 GMT (envelope-from git) Date: Tue, 21 Oct 2025 08:56:49 GMT Message-Id: <202510210856.59L8un3a030787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a57c77a79bda - Create tag vendor/Linux/brcm80211/torvalds-v6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/brcm80211/torvalds-v6.17 X-Git-Reftype: annotated tag X-Git-Commit: a57c77a79bda7bab77f2ef8c2425871577fb9960 Auto-Submitted: auto-generated The annotated tag vendor/Linux/brcm80211/torvalds-v6.17 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/brcm80211/torvalds-v6.17 tag vendor/Linux/brcm80211/torvalds-v6.17 Tagger: Bjoern A. Zeeb TaggerDate: 2025-10-10 19:06:23 +0000 brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). commit 1eabd3ed89eb4bb5c69e90eeaeda1a6dd31e8bab Author: Bjoern A. Zeeb AuthorDate: 2025-10-10 18:55:21 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-10 18:55:21 +0000 brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). From nobody Tue Oct 21 13:26:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crY3M6FDCz6BWdP for ; Tue, 21 Oct 2025 13:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crY3M5n7Mz4NfY; Tue, 21 Oct 2025 13:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761053183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7ptrsXYn4I1cKsirsfNLGqNWVqkDgrWEQWRYKgKDb0=; b=x0+JSPVu4XPNmjTPoALXNsNwYgKl6Tpz9iAMhdQuJg1L9La2Uctq1jBXiZn5guo3rdK67a uHLWw7Nga3FljHZawRx+cXt/pHxVqyuSqnQXU7pE/URx5D5cMmv90AGmq0RbGW8l+zgQyW QJo8kM5u+OcvgloOrbYxRA81B+Rlzf7NctakdM4FEBTXds7sZHhtO7NbjYi5uKtM1zstod 7m4kLqVxCtDELNIR5wRzbUczQ8NjHlmHl4Qm0ZCdh6kcX6VkNixnaK8Ss6jyCoQZGaop60 78fcW5zBwVr7Cdbv54bshwj1DLmMXOH3ef8eXUeaDkAVFIOOxSxdsy0Z5rcCiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761053183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7ptrsXYn4I1cKsirsfNLGqNWVqkDgrWEQWRYKgKDb0=; b=MboUo0V6rlESh4+yoEKeMgit7Y/5DyylY68/sri4h3/pHJ3/xL7Ir6ul8VxBtGYx6gAgqi Sl2lab/0nN5Ceu7+v/VNfCdQ4jsK32p3qlD34y5jkgXRyW1lab3Naubny/idL0a+qxruQR OUjGRTlDrfp2tV9/1TTfIUHobdX/UOmS65Khi0wk1bKu3vmdKjcF2UEeaoU0NiueJBo0m6 wyE0VWB0ETVemfBaW3NBro9FIoBR1Q3R27uFfuhynD8LCXoPDi1iG2BezMeld/kW2Eo8y8 PQAMnG5dII14r41FXPl6vnFqHKm+HygLlKajXR+93uOs/M3Rq0rEHkPzCSz/eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761053183; a=rsa-sha256; cv=none; b=ln8sgIJPcmIx3COiGoOSrggOefXl4725C0St6gsMYAzcyFpcF9W07K5bKo+DSOBUz/MhtU 1QWAlP9wKor9XGt+DKTdVCf7mA9avrasdmw/Gq3Dyd7ST1CWRBL87o0oSM4Noz+jOuxR42 hIADfRwcCt+SDv+Lc94KuprEI5Ez1hgfg00MeBVXwYKZg9gQtUjyHqHaZyArw/Sh4G6IKV BYaZ7aSjoBn/Vyf2eGn3EuCZksK6KtAQc0qjwT9NWODJQJII4FFkV21sozO/jxjPvsBxpD boLH6s6+gRQt9k7MDOYTE+6yrk2LacsR7fezXd1QuUNfOpzf+UPTfi2OlQJEAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crY3M5Mqjz11b8; Tue, 21 Oct 2025 13:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LDQNVI038821; Tue, 21 Oct 2025 13:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LDQNb5038818; Tue, 21 Oct 2025 13:26:23 GMT (envelope-from git) Date: Tue, 21 Oct 2025 13:26:23 GMT Message-Id: <202510211326.59LDQNb5038818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Mark Johnston Subject: git: 934f2606afe4 - internal/admin - Welcome fuz@ (Robert Clausecker) as a src committer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/internal/admin X-Git-Reftype: branch X-Git-Commit: 934f2606afe4498ab0138f1fd6525fa5eda5be84 Auto-Submitted: auto-generated The branch internal/admin has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=934f2606afe4498ab0138f1fd6525fa5eda5be84 commit 934f2606afe4498ab0138f1fd6525fa5eda5be84 Author: Mark Johnston AuthorDate: 2025-10-21 13:19:36 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 13:19:36 +0000 Welcome fuz@ (Robert Clausecker) as a src committer Approved by: srcmgr --- access | 1 + mentors | 1 + 2 files changed, 2 insertions(+) diff --git a/access b/access index 6a1b6b818eae..14eb1581f8c9 100644 --- a/access +++ b/access @@ -63,6 +63,7 @@ emaste erj eugen fsu +fuz gad gallatin ganbold diff --git a/mentors b/mentors index 4797a26effbb..cb6442684d15 100644 --- a/mentors +++ b/mentors @@ -14,6 +14,7 @@ aokblast lwhsu Co-mentor: markj brd allanjude Co-mentor: bapt bryanv grehan def oshogbo +fuz markj jaeyoon imp jrhall imp kgalazka erj Co-mentor: kbowling From nobody Tue Oct 21 13:36:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crYHS3Pw4z6BXLh; Tue, 21 Oct 2025 13:36:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crYHS2x4Jz4Pxk; Tue, 21 Oct 2025 13:36:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761053812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71aWx0eq+XmcFY5oofANjWspX7gXMogyHRab1g+7ZDg=; b=iXYaS7xRkZ7AVcGbY0Ki031yMr9rvbxdSiJTi9mKyv5imiZq7WNUhKko1ejJVEKd1Kj+je fIrvEvmDP0zBHb8e+Zu3k9YU+p1prKMPuK+Zr1AYxc+rx4r3apoAa5rNM7regE6rO+rQqI 2R+kf44d2Wz4lNN8OcNMXIW0bazW3N+jLoTyOU0ZWug1bUDOFE4vBQmUg8eUcRlZbomtCt HwBYGY3Foy8A1jNYkFpc47PEYHUCC2qi5XQjAEhQv9gTUe1abb4nl2n5YVbiBuDgJm0dxK YU3Aw2BeITxHgx22zquA9dqZ8BaM8nrhdkP+5kj9Y8kB/lRXFVtjf5WTzCUe6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761053812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71aWx0eq+XmcFY5oofANjWspX7gXMogyHRab1g+7ZDg=; b=eiyJaeVWOWydU4k+Ig1a8ppeRMEkV9dr/1+VYpNb6oNXLPYssTQndLhz7vyAXdUR89VrBD mwitbLcwg2doPGJd2LsIfk6ugVeXOwCMfKGNx0Gr70+avIg9Aynv504d443nR39zO6Sg2T qJW4OdYk48R2Wi7KJP09e7SY0mo/+nnekr7zqo7RMm8rF2TIMbwPsWoUwQ0WAf6hmQxWka vwiLhqDPck5hlcyDV3vEPegrykC/3q7kCAeIsbZwQ/h6UaVk6W2wCv2FOeHT0ar4JeVUjt t6fgp5Y17f92QyKor1BbNwuyt1jFX5CfPxKdnVsIZ+oMU9NV/EEOsU44l7101w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761053812; a=rsa-sha256; cv=none; b=K/nQKJJFHkXszAOK6RSI6DMeBsceeCvliiQCddMWhlYU+dvrOGsRaHjOuOIxCjCQjJf605 54C8IrS2hhIiEmGdpIzTqjV0Vri2jigEE5iFMUnFDrIixAUBoXUfypyqtlY6dwARGBW9n8 yXxnhllaTXICgohsmSRPS8n39uRIyku3q8GrU2zk3NgUl/fwqMh10+xHytqxsW7eL9LQa/ q/9pW1OGoP+kvCtLwCgIPed8gQC6CQepk+s2O0RihnnIK6Oi7G9P6CBhaZAMtewLB3wcyC 7J77n1nuKVDidx7/eW3piX9gqY2Abd4BJtXUfjtYnTCLBJpdqg3KUgdMco78Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7] (unknown [IPv6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4crYHS17ldzNys; Tue, 21 Oct 2025 13:36:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0548e02e-3ee1-4459-95b7-ca3b720cbe96@FreeBSD.org> Date: Tue, 21 Oct 2025 09:36:50 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 885e8f272f75 - main - LinuxKPI: add skeleton pci_enable_wake() Content-Language: en-US To: "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/21/25 03:53, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=885e8f272f7515b0325974de72d18b73318eff07 > > commit 885e8f272f7515b0325974de72d18b73318eff07 > Author: Bjoern A. Zeeb > AuthorDate: 2025-10-17 20:38:11 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2025-10-21 07:49:39 +0000 > > LinuxKPI: add skeleton pci_enable_wake() > > Given we do not yet support "wake" bits in device there is little need > doing it in PCI if we cannot check if we are supposed to do the > operation in first place. Once we would implement this, we would need > to also do the appropriate PCI (pme) checks before enabling (disabling) > it. > > MFC after: 3 days > Reviewed by: dumbbell > Differential Revision: https://reviews.freebsd.org/D53208 FWIW, we have pci_enable_pme() that this probably maps to. Similarly, pci_has_pm() is a helper routine to see if a device supports power management. The various NIC drivers supporting WOL use these helper routines to manage PME. -- John Baldwin From nobody Tue Oct 21 13:44:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crYSF60kqz6BXkR; Tue, 21 Oct 2025 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crYSF4zm8z3CLY; Tue, 21 Oct 2025 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1VEefCFko13doTmK2uFk5dgNN8oL7xFuIS7BaeRvoTk=; b=A4KA+I9BUn0hUgC3vzXr56A5g4YmR3kR+zRFdAJ3rxhDAjjQKEdsiTD9iuv1SrbD9PLdpM 8TIW6k+172GOBZQKCnvLI18iGgHM65Ue+5G0ppkBBgDLm9jcX+3l9g0sXwNtNeKrkRPRu4 fc3vSN1uKRFQEs2G3fX0UfyNTj/muJmdMARGgzJUcLFbwXZDhqC3POBgAnF/2OBiL3Hwg0 lkAeeCBVU67TKlRHtaXpX1CfKR6jJpRzvXR7DwMmHzZrAq0tHqpUkFRo8HK9rPE1th0NQy R/Lt1LQVvHVmST5NYTQg4VVwtPS6QV54WBau5kGRSMO5ndkizEyO5ZE/SzeuhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1VEefCFko13doTmK2uFk5dgNN8oL7xFuIS7BaeRvoTk=; b=hd/HqsiQesIv8GbUjEyof019O5n5JQ8PxTpyhYhesah/GajqYcYcecfK1hgYvtHXRaMAIQ G+oWJvuJl3ZUH2Vp/FVecSqaCGDA+fzMLiIP3RPKopQNMjRYzxB5obGtRiWRb7vP0VHuEz fYiQi/2sgDd0YTlcma3pB4CQfBQ1I044rTJRjYspNI2MnOViPX5BHtrOlFLSJlm2i4vmT8 42GhVKCyqESKZ7dDkaSzx4aodet0toU762D/hjBV/EV8psm08nGScg1SXcsRFInrpw3jcy 6DQx8LRfQOXAoxqlEzmdc8fh6IwcP3BljoFwIcZfseziMudexiFNc1dQLiHuDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761054269; a=rsa-sha256; cv=none; b=R+22y3rbiGML6H6IxkM+wDsfJ14dWtvkjUQFieE7kPdmIICqfV3MfLsCCHMJUcJbGBG2hC 5ECRRppLLfo0ZXDC3J4iyspSpm+tU+dCVUj4Con+Yaop6KuwKqnkssgm0ZDRzWQ44bDbQO YHu90sUUzavlODmsGsi/G2t68mU63JepDOeKv9xkCZq5oi0tdiiAotJ9XkxsVjTMJN6y1C J1fwNr92HglQSOT7IHZrqOMCROsTqfTSEJEPm2rApw1yYomDYcOu2WBQUGPMSxeXiP1G1K 9ZsPXeZlB9tsODd0B16wYsNVB6EPKxxnls6kPKl+xrIzBHM+hqIR3alcSzFr1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crYSF4Js9z128D; Tue, 21 Oct 2025 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LDiTft076440; Tue, 21 Oct 2025 13:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LDiTsZ076437; Tue, 21 Oct 2025 13:44:29 GMT (envelope-from git) Date: Tue, 21 Oct 2025 13:44:29 GMT Message-Id: <202510211344.59LDiTsZ076437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e29f81c2adc1 - main - ata: Add error bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e29f81c2adc1fbe970fa5da8cc3dd6d300c76d7b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e29f81c2adc1fbe970fa5da8cc3dd6d300c76d7b commit e29f81c2adc1fbe970fa5da8cc3dd6d300c76d7b Author: Warner Losh AuthorDate: 2025-10-21 13:35:32 +0000 Commit: Warner Losh CommitDate: 2025-10-21 13:36:55 +0000 ata: Add error bits Add notes for other bits that we don't use in the code for error status. We report these when there's an error, and this allows people decoding it to not have to chase down these bits from the standard. Sponsored by: Netflix --- sys/sys/ata.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/sys/ata.h b/sys/sys/ata.h index 5e9c2bcb9aa0..9ce822214f6d 100644 --- a/sys/sys/ata.h +++ b/sys/sys/ata.h @@ -347,8 +347,11 @@ struct ata_params { #define ATA_STATUS_BUSY 0x80 /* ATA Error Register */ +/* COMMAND TIMEOUT 0x01 */ #define ATA_ERROR_ABORT 0x04 #define ATA_ERROR_ID_NOT_FOUND 0x10 +/* UNCORRECTABLE ERROR 0x40 */ +/* INTERFACE CRC 0x80 */ /* ATA HPA Features */ #define ATA_HPA_FEAT_MAX_ADDR 0x00 From nobody Tue Oct 21 13:51:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crYch3YCxz6BYZG; Tue, 21 Oct 2025 13:51:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crYch34RMz3DQ7; Tue, 21 Oct 2025 13:51:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054708; 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: in-reply-to:in-reply-to:references:references; bh=WFeefxLm+6xbRDLtfxXL9nAJkbVzFSm6y8GZfTocfbE=; b=uUaY1bE3HUzCQnACgkzPIJbM2Au4B3kyL/2qBkIFd1+9lzmJHJN5l7kWOZfRWH+FZu6trm aDd2m6ZN/oNzmIJHKYHX/MEl2vV30EI4StXObo1Bo0RobbO48v1Su3eyzzEGKSpPcvv4PA 0YWLBy+pDAMCRriTo7VVwwzYH8I0Zwi/g+Y7bePBs+iCEp3y3hrgCyVIAIUm++a5/oxtyb ZxHgE/mmR1HvwbPqRTyWpMoTMjOpszTFB84dh2e5GOs05Oh07zoCzBELZ3U+pPN+6FnBP/ h+5bYr/mFVjeVkMhd038o9wF9Z6AJo6IUEBqxjdoyTtTMTrTBAu83vncwg+fdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054708; 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: in-reply-to:in-reply-to:references:references; bh=WFeefxLm+6xbRDLtfxXL9nAJkbVzFSm6y8GZfTocfbE=; b=M1XRH7WdGmTDNhepEj8HxpG4X6Do5Lkdm0jaVqmQcrD6owIjBukI6YGzdErxkMgWQWLu+Y m7mZcUXN3XS1+UgyJQdln4yt/j9RkGiBZkUrcXCyyeDwe/XwKqIesB60wbnctbaZOREaul NNcXc5OGfo51E4vvfSecEvvCGmRxqtU4AoW4zpNKw24ae6DHEsE8SJuRitQjk5iitxqDsQ OFi3y0Mg+JjQQGZ9hQm78qK4ML6Z21sl2No0OecnY+NjaZUod1GGmRx3Gx1JiNmrIJuzbj dmJHK9ylV9J7A/pEEFlKir4IGDjhE/2xjDw+me9yncBjLXeVAOAQh2O/vKNZJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761054708; a=rsa-sha256; cv=none; b=VgOKZax7bXgjsF8CX+13kXnxQz20IWLNqPKpHItmxZ0smcM1ZIQWDwfBiEskmNdEQT4f4W DuJ43mUKrae3ZcBP9Rn4T/P2Tvs48EIiOUaZalWhhHIlhhTw7Isq+W54g27ElB/Ba8D4RX aPKoVG/kUJscvcUMDbFqvIt5zzgHptUVV/d5+t1radJgeuJczwU6n/XbHweKnjr4gReC4Y dygVTiil8lBsH0cSXDTb3LvvQzDVxp9wjykynwJxWAyJom+AVmlZ2JVu3VsPgn0b014ZpK cNQDcSlVQAJwEWZuwuj5bD5AKpkDfl4J1DuKY/6mBzyQnbfaQcrtKGxbUs0UMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7] (unknown [IPv6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4crYch1PkFzNsk; Tue, 21 Oct 2025 13:51:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1e0fa955-a6d9-4c21-9620-3eea6d7682be@FreeBSD.org> Date: Tue, 21 Oct 2025 09:51:47 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Content-Language: en-US To: Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/21/25 00:20, Warner Losh wrote: > On Mon, Oct 20, 2025 at 1:44 PM John Baldwin wrote: > >> On 10/20/25 10:59, Warner Losh wrote: >>> Install* should eventually just do the right thing like ports: stage the >>> packages, make the packages and the install from the packages. 16 time >>> frame, though. >> >> Hmm, 'make installkernel' needs to still create kernel.old for those >> of us doing development (or really, just running main. The tb(4) driver >> turned my laptop into a brick recently and I needed kernel.old so I could >> recover). AFAIK, pkgbase doesn't have any provision for doing that. Also, >> `make installkernel INSTKERNNAME=test; nextboot -k test` is a key part of >> my workflow for testing kernels. I'm fine with using packages to ship >> updates to users running stock sources, but please do not make it harder >> to do development. >> > > Yes. Though I'd hope we'd get slightly better BE integration. Then it > doesn't matter... unless you're running UFS root... so something needs to > happen. But it's not clear to me if the stagekernel stuff should do that, > or if *ANY* update from pkg to /boot/kernel (or the booted kernel) > shouldn't do the /boot/kernel -> /boot/kernel.old rename, sysctl tweaks so > ps can still fine the kernel if it needs it. > > >> When hacking on userspace components I often need to be able to do >> just 'make install' of a single binary or library onto an installed >> system knowing that a future installworld or `make install` will revert >> to "stock" binaries later. Please don't break that. It's like when >> I work on changes to GDB or LLVM, I use the native build system to build >> the modified version, I don't try to hack up a port to build a package >> with the extra changes I have either in a working tree or committed on a >> feature branch. >> > > Oh yes. I was thinking that only install{world,kernel} would change to > depend on the staging + packaging and then accomplish this by doing a pkg > update. The per-directory stuff I didn't think should change (though I > honestly wish we'd have the 'stating' just be a metafile creation with a > contents= tag in the METALOG instead of so much copying. I think the only friction here is that 'make installkernel' is the 'make install' analog for a kernel. 'make installworld' is more obviously a meta operation, but `installkernel` is a bit different. It's also important to not break `make installworld TARGET_ARCH= DESTDIR=/path/to/rootfs` which is another use case I at least use quite frequently to build cross-arch disk images for use in QEMU (or to cross-install onto the SD card I use in SBCs). Also, I know that for cheribuild we certainly cross-build OS images (including a cross-install kernel/world into a rootfs) on Linux and macOS, so switching to packages adds another dependency (pkg) to that. This is probably easier to make work if pkg is in the base system and built as a cross-tool rather than an external tool (though an external tool can work). -- John Baldwin From nobody Tue Oct 21 15:06:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crbGm0dJnz6CQ3L; Tue, 21 Oct 2025 15:06:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crbGm04Qyz3M33; Tue, 21 Oct 2025 15:06:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761059184; 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: in-reply-to:in-reply-to:references:references; bh=SpwSHYx0W/yvqWr4I7zj+UwjUqbsEDqxwIW2SSkYZCI=; b=S4Mg1NtfEjD36ASzVeO4qoj4ncqq/Wg0D2EYr06F+Kes72Zs4+2foKjsV5nej7LBP96GuG vYGXF7M0+afOa73JoWkL272zkQ8iIXUouChsAhjSn58dhyAsSqkGPXvy1JIPKyL2fnCXhm 03764GuR4jo89QJ6IQHC1lbkcIeog+oD6QdIbySYSMb4mIJC/u1bIzcBnXByMVQF5gNozh utnG797QJr2SkqHt03VjbUR+B9/tzprNOVuw9OBYo5EmnLku+k0w6ek+hwIvkZtJaDCRws I4pSi2WFIxJml0owubehf7CO3uCjERBKuxjAW0Cpv9GQhUCDBe6HDsZvMzZ2Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761059184; 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: in-reply-to:in-reply-to:references:references; bh=SpwSHYx0W/yvqWr4I7zj+UwjUqbsEDqxwIW2SSkYZCI=; b=gJdb29Vb44SGUSGohTuO2bn1EIHX3efnb3V9tEfm7cVspBpCQ351PExDQA7yHV5f9CmVVi Cgb//MMKOk2ID3X5hHakkLeL08sImv83TOtHy0m1imQqZNLF4LEc8GP2IE92goMBJcv8g0 zDS/ySiQLLg6vp8pr7MdE3F2GC+67kujq0cJ11ITHVQBzXdcrl8g9lDX96BtxSTBWv/2jp tycbV38ehSu5cso6Rqrp1Hz90Pb5H4dN5/TgFzkPagOBtB+5nLMeZK77Rvr7Lzh7OaXMyi gaBuTtO7QeJx3A/JEfQdyd4f4IGFXpKmdgjfYj90X958KbLjdItZGKT6gR3JiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761059184; a=rsa-sha256; cv=none; b=VVF7kQm42BGPgD02CIrSwY5QdHUL48jhRTeP+Hnxk2fKDd+gnV3gQAHnkTljDKmvGMUjN9 emdXnxNhuwy5DBppQQsbuv52/L9+WYqpXtLJ7DRhi7bLqgCqW4LjfJyLmji4jTb8YMKLeC mGwRz4bA567f9Jbl8w0e2JoV6aO18miVOS//9xkCoCPpz5wxRt5jkC9YkTa1oK53Ivw7Cg e/f3voYAqfkZEjCuvjnptsUCtcAGO0ZVtsiNzI9J4mecsshZZ0oIrXJW6IWZKzcPIvD2Q2 6c3FFVZU21rRCTBWIkGEUcgYt1FpNXYiWKq+5eo8xuOzlm/mXbLN5fM5dJnIkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4crbGl5fs0zNwf; Tue, 21 Oct 2025 15:06:23 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id A1C34A64805; Tue, 21 Oct 2025 15:06:05 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 7E9222D029E6; Tue, 21 Oct 2025 15:06:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id tSkBecJFQq0C; Tue, 21 Oct 2025 15:06:12 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id C811B2D029D8; Tue, 21 Oct 2025 15:06:11 +0000 (UTC) Date: Tue, 21 Oct 2025 15:06:11 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 885e8f272f75 - main - LinuxKPI: add skeleton pci_enable_wake() In-Reply-To: <0548e02e-3ee1-4459-95b7-ca3b720cbe96@FreeBSD.org> Message-ID: <72669827-7s38-oo59-6128-rns453r8n7r6@SerrOFQ.bet> References: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> <0548e02e-3ee1-4459-95b7-ca3b720cbe96@FreeBSD.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 21 Oct 2025, John Baldwin wrote: > On 10/21/25 03:53, Bjoern A. Zeeb wrote: >> The branch main has been updated by bz: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=885e8f272f7515b0325974de72d18b73318eff07 >> >> commit 885e8f272f7515b0325974de72d18b73318eff07 >> Author: Bjoern A. Zeeb >> AuthorDate: 2025-10-17 20:38:11 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2025-10-21 07:49:39 +0000 >> >> LinuxKPI: add skeleton pci_enable_wake() >> Given we do not yet support "wake" bits in device there is little >> need >> doing it in PCI if we cannot check if we are supposed to do the >> operation in first place. Once we would implement this, we would need >> to also do the appropriate PCI (pme) checks before enabling >> (disabling) >> it. >> MFC after: 3 days >> Reviewed by: dumbbell >> Differential Revision: https://reviews.freebsd.org/D53208 > > FWIW, we have pci_enable_pme() that this probably maps to. Similarly, > pci_has_pm() > is a helper routine to see if a device supports power management. The > various NIC > drivers supporting WOL use these helper routines to manage PME. Thank you. LinuxKPI also has pci_pme_capable() already. I'll try to implement the lower device bits in LinuxKPI at some point (at least it's on my list) and this will hopefully help then to do the PCI bits quickly. /bz -- Bjoern A. Zeeb r15:7 From nobody Tue Oct 21 15:53:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crcKZ2rGCz6CTKj; Tue, 21 Oct 2025 15:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crcKZ2S81z3RHC; Tue, 21 Oct 2025 15:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761062034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyHlXk0Is0h8joLQSITYBA2jrDvhCtFUQShlf5aPzUY=; b=KbpOlctSJ9zEHNyPc/dkpSuHxYXOUsCh6SIoHzSgyRo8a38afs8qLAn0hKQ/6mwMEW3j6u HOffblwv/yKOV8TaFihZg6rFIJQg1zGJKLiWHM0d/cdeLri+0Fm0g8MUHN4qs1vfycsNKE AqlhhkaeE/lj/Xtu/M0JNNS+amUfoi3pYX3bh3sV39qm5QdAAw7eeFc4QFpkGWWcWEjbjh xxRj/JbqTXozazh6gdg2dajbAHLq/JY+ntc8Gsd2m/P0VzZIdxvqSXNd6G0Uu+N8GFJk53 aVTKN6E+Am40LergKDEAv17xIhv4n29y7UmqppsJEm2dQ1invfkgcE9M3/pBrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761062034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyHlXk0Is0h8joLQSITYBA2jrDvhCtFUQShlf5aPzUY=; b=sP125jn8tE/vSHowlwdZAKRMAsCVqA1nWs+SUz8x5x/Sd6r5Up+uhbWHFP1FMBM3v7ZpMv 2sBVppFJa2a2r6AmR29kDMmFlR6w4p5GaMd7QlXIXITnFX10/6T9JCt8DObKF2jVCIzymf ZymoQGuXZFpOGrt8GhTatVOWeyQtYM+sY8TT5pScuEZteFuhwF/gGbjTlV1DJPqtGb2oBT hhJ/7VPS1cmdSGIdtaY47yvxByQXuF5owUNVGEvVQbUVNhoW87pkrHsa875ZZDPEUhbIEY 6WXpUOcncdedcQ+Dgaf0aVbYW0kMFRDk9EG81U7RFUIzpl2FdrFiy2j75LYivQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761062034; a=rsa-sha256; cv=none; b=Qg5VInjXW5X4nV21ZSUG4MWwJx2IVAwG2Er7dkQnR1GC2W1V0JkvKC+JXuRaZ9RXytDbsV 7MqlnIpOKN+Gh31GVBEqTre9CW/BrNz4/c2VltF309++LUWRClWFytmdeKAuxFoEvpDZ6L tlGmpyurAVj7oknRSeK8xoKT/fjAdL9yDo6frrc4UhW6Dp9bNwRsqveIyKn57k+Ny9vcZf m8WqBaug3jqOjrHJLfx+9ajALQfEvn+/ANvkrJEO916sEL+CxfHvZtaeiLx3gs52+wh3Rr 3NcUuZG44ejcKq46jAEFF9MOtAerh2JR1UssBBwFgVhM5z3b7AYLJxtNnf1AEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crcKZ22fXz154H; Tue, 21 Oct 2025 15:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LFrsbQ020470; Tue, 21 Oct 2025 15:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LFrrW2020467; Tue, 21 Oct 2025 15:53:53 GMT (envelope-from git) Date: Tue, 21 Oct 2025 15:53:53 GMT Message-Id: <202510211553.59LFrrW2020467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 401026e4825a - main - libarchive: merge from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 401026e4825a05abba6f945cf1b74b3328876fa2 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=401026e4825a05abba6f945cf1b74b3328876fa2 commit 401026e4825a05abba6f945cf1b74b3328876fa2 Merge: e29f81c2adc1 8f38cbcd9c4a Author: Martin Matuska AuthorDate: 2025-10-21 14:10:15 +0000 Commit: Martin Matuska CommitDate: 2025-10-21 15:52:44 +0000 libarchive: merge from vendor branch Update vendor/libarchive to 3.8.2 Important bugfixes: #2477 tar writer: fix replacing a regular file with a dir for ARCHIVE_EXTRACT_SAFE_WRITES #2659 lib: improve filter process handling #2664 zip writer: fix a memory leak if write callback error early #2665 lib: archive_read_data: handle sparse holes at end of file correctly #2668 7zip: Fix out of boundary access #2670 zip writer: fix writing with ZSTD compression #2672 lib: fix error checking in writing files #2678 zstd write filter: enable Zstandard's checksum feature #2679 lib: handle possible errors from system calls #2707 lib: avoid leaking file descriptors into subprocesses #2713 RAR5 reader: fix multiple issues in extra field parsing function #2716 RAR5 reader: early fail when file declares data for a dir entry #2717 bsdtar: Allow filename to have CRLF endings #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724) #2737 tar reader: fix an infinite loop when parsing V headers #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big enough Obtained from: libarchive Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83 Security: CVE-2025-25724 PR: 290303 (exp-run) MFC after: 1 week contrib/libarchive/NEWS | 2 + contrib/libarchive/SECURITY.md | 2 +- .../github_actions/install-macos-dependencies.sh | 3 + contrib/libarchive/cat/bsdcat.c | 15 +- contrib/libarchive/cat/cmdline.c | 2 +- contrib/libarchive/cpio/cmdline.c | 2 +- contrib/libarchive/cpio/cpio.c | 14 +- contrib/libarchive/cpio/test/test_owner_parse.c | 2 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 23 +++ .../libarchive/libarchive/archive_check_magic.c | 9 +- contrib/libarchive/libarchive/archive_cryptor.c | 8 +- .../libarchive/archive_cryptor_private.h | 11 +- contrib/libarchive/libarchive/archive_entry.h | 2 +- .../libarchive/libarchive/archive_entry_paths.3 | 2 +- contrib/libarchive/libarchive/archive_entry_stat.c | 6 +- contrib/libarchive/libarchive/archive_parse_date.c | 4 +- contrib/libarchive/libarchive/archive_platform.h | 10 -- .../libarchive/libarchive/archive_platform_stat.h | 45 ++++++ contrib/libarchive/libarchive/archive_private.h | 1 + contrib/libarchive/libarchive/archive_read.c | 7 +- .../libarchive/archive_read_disk_entry_from_file.c | 12 +- .../libarchive/archive_read_disk_posix.c | 157 ++------------------- .../libarchive/libarchive/archive_read_open_fd.c | 23 +-- .../libarchive/libarchive/archive_read_open_file.c | 16 ++- .../libarchive/archive_read_open_filename.c | 31 ++-- .../libarchive/archive_read_set_format.c | 32 ++--- .../archive_read_support_filter_program.c | 7 +- .../libarchive/archive_read_support_format_7zip.c | 7 +- .../libarchive/archive_read_support_format_mtree.c | 23 ++- .../libarchive/archive_read_support_format_rar.c | 8 +- .../libarchive/archive_read_support_format_rar5.c | 66 +++++++-- .../libarchive/archive_read_support_format_tar.c | 70 ++++++--- .../libarchive/archive_read_support_format_warc.c | 2 +- .../libarchive/archive_read_support_format_xar.c | 2 +- .../libarchive/archive_read_support_format_zip.c | 4 +- contrib/libarchive/libarchive/archive_string.c | 5 +- .../libarchive/libarchive/archive_string_sprintf.c | 2 +- contrib/libarchive/libarchive/archive_util.c | 38 ++++- contrib/libarchive/libarchive/archive_write.c | 30 ++-- .../libarchive/archive_write_add_filter_bzip2.c | 4 + .../libarchive/archive_write_add_filter_gzip.c | 55 +++++--- .../libarchive/archive_write_add_filter_program.c | 11 +- .../libarchive/archive_write_add_filter_zstd.c | 2 + .../libarchive/archive_write_disk_posix.c | 16 ++- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 14 +- .../libarchive/archive_write_open_filename.c | 3 +- .../libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_mtree.c | 19 ++- .../libarchive/archive_write_set_format_xar.c | 6 +- .../libarchive/archive_write_set_format_zip.c | 25 +++- contrib/libarchive/libarchive/filter_fork_posix.c | 37 ++++- contrib/libarchive/libarchive/test/test_acl_nfs4.c | 7 + .../libarchive/libarchive/test/test_acl_posix1e.c | 5 + .../libarchive/test/test_archive_parse_date.c | 2 + .../test/test_archive_string_conversion.c | 10 ++ contrib/libarchive/libarchive/test/test_entry.c | 11 ++ .../test/test_read_filter_gzip_recursive.c | 4 +- .../libarchive/test/test_read_format_7zip.c | 81 +++++++---- .../libarchive/test/test_read_format_rar5.c | 66 +++++++++ .../test/test_read_format_rar5_dirdata.rar.uu | 6 + ...rmat_rar5_invalid_hash_valid_htime_exfld.rar.uu | 6 + .../test_read_format_rar5_only_crypt_exfld.rar.uu | 7 + .../test_read_format_rar5_unsupported_exfld.rar.uu | 6 + .../test/test_read_format_tar_V_negative_size.c | 48 +++++++ .../test_read_format_tar_V_negative_size.tar.uu | 20 +++ .../libarchive/test/test_read_set_format.c | 7 +- .../libarchive/test/test_write_filter_bzip2.c | 29 ++++ .../libarchive/test/test_write_filter_gzip.c | 12 +- .../test/test_write_filter_gzip_timestamp.c | 7 +- .../libarchive/libarchive_fe/{err.c => lafe_err.c} | 2 +- .../libarchive/libarchive_fe/{err.h => lafe_err.h} | 0 contrib/libarchive/libarchive_fe/line_reader.c | 2 +- contrib/libarchive/libarchive_fe/passphrase.c | 2 +- contrib/libarchive/tar/bsdtar.c | 7 +- contrib/libarchive/tar/bsdtar.h | 8 +- contrib/libarchive/tar/cmdline.c | 2 +- contrib/libarchive/tar/creation_set.c | 2 +- contrib/libarchive/tar/read.c | 2 +- contrib/libarchive/tar/subst.c | 2 +- contrib/libarchive/tar/test/test_crlf_mtree.c | 74 ++++++++++ .../libarchive/tar/test/test_option_safe_writes.c | 5 +- contrib/libarchive/tar/util.c | 7 +- contrib/libarchive/tar/write.c | 29 +++- contrib/libarchive/test_utils/test_common.h | 10 +- contrib/libarchive/test_utils/test_main.c | 156 +++++--------------- contrib/libarchive/unzip/bsdunzip.c | 15 +- contrib/libarchive/unzip/cmdline.c | 2 +- contrib/libarchive/unzip/test/test_C.c | 4 + contrib/libarchive/unzip/test/test_L.c | 4 + contrib/libarchive/unzip/test/test_P_encryption.c | 12 +- contrib/libarchive/unzip/test/test_basic.c | 4 + contrib/libarchive/unzip/test/test_d.c | 8 ++ contrib/libarchive/unzip/test/test_doubledash.c | 4 + contrib/libarchive/unzip/test/test_glob.c | 4 + contrib/libarchive/unzip/test/test_j.c | 4 + contrib/libarchive/unzip/test/test_n.c | 4 + contrib/libarchive/unzip/test/test_o.c | 4 + contrib/libarchive/unzip/test/test_p.c | 4 + contrib/libarchive/unzip/test/test_q.c | 4 + contrib/libarchive/unzip/test/test_singlefile.c | 4 + contrib/libarchive/unzip/test/test_t.c | 4 + contrib/libarchive/unzip/test/test_x.c | 12 ++ lib/libarchive/tests/Makefile | 6 + usr.bin/bsdcat/Makefile | 2 +- usr.bin/cpio/Makefile | 2 +- usr.bin/cpio/tests/Makefile | 2 +- usr.bin/tar/Makefile | 3 +- usr.bin/tar/tests/Makefile | 1 + usr.bin/unzip/Makefile | 2 +- usr.bin/unzip/tests/Makefile | 2 +- 112 files changed, 1120 insertions(+), 546 deletions(-) diff --cc contrib/libarchive/libarchive/archive_platform_stat.h index 000000000000,5432b2f6433a..5432b2f6433a mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/archive_platform_stat.h +++ b/contrib/libarchive/libarchive/archive_platform_stat.h diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu index 000000000000,c7928f344a80..c7928f344a80 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu index 000000000000,399acd814ae4..399acd814ae4 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu index 000000000000,4f9faf350c11..4f9faf350c11 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu index 000000000000,16b456bf4873..16b456bf4873 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c index 000000000000,d110553acfaf..d110553acfaf mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu index 000000000000,230d710c8f8f..230d710c8f8f mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu diff --cc contrib/libarchive/tar/test/test_crlf_mtree.c index 000000000000,5ef8811369c1..5ef8811369c1 mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_crlf_mtree.c +++ b/contrib/libarchive/tar/test/test_crlf_mtree.c diff --cc lib/libarchive/tests/Makefile index 07c5fe24dd30,000000000000..930250d974c5 mode 100644,000000..100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@@ -1,742 -1,0 +1,748 @@@ +.include + +PACKAGE= tests + +WARNS?= 3 + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +TEST_METADATA.functional_test+= timeout="600" + +BINDIR= ${TESTSDIR} + +PROGS+= libarchive_test + +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR} +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +CFLAGS.test_utils.c+= -Wno-cast-align + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +.PATH: ${_LIBARCHIVEDIR}/libarchive/test +TESTS_SRCS= \ + test_7zip_filename_encoding.c \ + test_acl_nfs4.c \ + test_acl_pax.c \ + test_acl_platform_nfs4.c \ + test_acl_platform_posix1e.c \ + test_acl_posix1e.c \ + test_acl_text.c \ + test_ar_mode.c \ + test_archive_api_feature.c \ + test_archive_clear_error.c \ + test_archive_cmdline.c \ + test_archive_digest.c \ + test_archive_match_time.c \ + test_archive_match_owner.c \ + test_archive_match_path.c \ + test_archive_pathmatch.c \ + test_archive_parse_date.c \ + test_archive_read.c \ + test_archive_read_add_passphrase.c \ + test_archive_read_close_twice.c \ + test_archive_read_close_twice_open_fd.c \ + test_archive_read_close_twice_open_filename.c \ + test_archive_read_multiple_data_objects.c \ + test_archive_read_next_header_empty.c \ + test_archive_read_next_header_raw.c \ + test_archive_read_open2.c \ + test_archive_read_set_filter_option.c \ + test_archive_read_set_format_option.c \ + test_archive_read_set_option.c \ + test_archive_read_set_options.c \ + test_archive_read_support.c \ + test_archive_set_error.c \ + test_archive_string.c \ + test_archive_string_conversion.c \ + test_archive_write_add_filter_by_name.c \ + test_archive_write_set_filter_option.c \ + test_archive_write_set_format_by_name.c \ + test_archive_write_set_format_filter_by_ext.c \ + test_archive_write_set_format_option.c \ + test_archive_write_set_option.c \ + test_archive_write_set_options.c \ + test_archive_write_set_passphrase.c \ + test_bad_fd.c \ + test_compat_bzip2.c \ + test_compat_cpio.c \ + test_compat_gtar.c \ + test_compat_gtar_large.c \ + test_compat_gzip.c \ + test_compat_lz4.c \ + test_compat_lzip.c \ + test_compat_lzma.c \ + test_compat_lzop.c \ + test_compat_mac.c \ + test_compat_perl_archive_tar.c \ + test_compat_plexus_archiver_tar.c \ + test_compat_solaris_tar_acl.c \ + test_compat_solaris_pax_sparse.c \ + test_compat_star_acl.c \ + test_compat_tar_directory.c \ + test_compat_tar_hardlink.c \ + test_compat_uudecode.c \ + test_compat_uudecode_large.c \ + test_compat_xz.c \ + test_compat_zip.c \ + test_compat_zstd.c \ + test_empty_write.c \ + test_entry.c \ + test_entry_strmode.c \ + test_extattr_freebsd.c \ + test_filter_count.c \ + test_gnutar_filename_encoding.c \ + test_link_resolver.c \ + test_open_fd.c \ + test_open_failure.c \ + test_open_file.c \ + test_open_filename.c \ + test_pax_filename_encoding.c \ + test_pax_xattr_header.c \ + test_read_data_large.c \ + test_read_disk.c \ + test_read_disk_directory_traversals.c \ + test_read_disk_entry_from_file.c \ + test_read_extract.c \ + test_read_file_nonexistent.c \ + test_read_filter_compress.c \ + test_read_filter_grzip.c \ + test_read_filter_gzip_recursive.c \ + test_read_filter_lrzip.c \ + test_read_filter_lzop.c \ + test_read_filter_lzop_multiple_parts.c \ + test_read_filter_program.c \ + test_read_filter_program_signature.c \ + test_read_filter_uudecode.c \ + test_read_filter_uudecode_raw.c \ + test_read_format_7zip.c \ + test_read_format_7zip_encryption_data.c \ + test_read_format_7zip_encryption_header.c \ + test_read_format_7zip_encryption_partially.c \ + test_read_format_7zip_malformed.c \ + test_read_format_7zip_packinfo_digests.c \ + test_read_format_ar.c \ + test_read_format_cab.c \ + test_read_format_cab_filename.c \ + test_read_format_cpio_afio.c \ + test_read_format_cpio_bin.c \ + test_read_format_cpio_bin_Z.c \ + test_read_format_cpio_bin_be.c \ + test_read_format_cpio_bin_bz2.c \ + test_read_format_cpio_bin_gz.c \ + test_read_format_cpio_bin_le.c \ + test_read_format_cpio_bin_lzip.c \ + test_read_format_cpio_bin_lzma.c \ + test_read_format_cpio_bin_xz.c \ + test_read_format_cpio_filename.c \ + test_read_format_cpio_odc.c \ + test_read_format_cpio_svr4_gzip.c \ + test_read_format_cpio_svr4c_Z.c \ + test_read_format_cpio_svr4_bzip2_rpm.c \ + test_read_format_cpio_svr4_gzip_rpm.c \ + test_read_format_empty.c \ + test_read_format_gtar_filename.c \ + test_read_format_gtar_gz.c \ + test_read_format_gtar_lzma.c \ + test_read_format_gtar_redundant_L.c \ + test_read_format_gtar_sparse.c \ + test_read_format_gtar_sparse_length.c \ + test_read_format_gtar_sparse_skip_entry.c \ + test_read_format_huge_rpm.c \ + test_read_format_iso_Z.c \ + test_read_format_iso_multi_extent.c \ + test_read_format_iso_xorriso.c \ + test_read_format_isorr_rr_moved.c \ + test_read_format_isojoliet_bz2.c \ + test_read_format_isojoliet_long.c \ + test_read_format_isojoliet_rr.c \ + test_read_format_isojoliet_versioned.c \ + test_read_format_isorr_bz2.c \ + test_read_format_isorr_ce.c \ + test_read_format_isorr_new_bz2.c \ + test_read_format_isozisofs_bz2.c \ + test_read_format_lha.c \ + test_read_format_lha_bugfix_0.c \ + test_read_format_lha_filename.c \ + test_read_format_lha_filename_utf16.c \ + test_read_format_mtree.c \ + test_read_format_mtree_crash747.c \ + test_read_format_pax_bz2.c \ + test_read_format_rar.c \ + test_read_format_rar5.c \ + test_read_format_rar_encryption.c \ + test_read_format_rar_encryption_data.c \ + test_read_format_rar_encryption_header.c \ + test_read_format_rar_encryption_partially.c \ + test_read_format_rar_filter.c \ + test_read_format_rar_invalid1.c \ + test_read_format_rar_overflow.c \ + test_read_format_raw.c \ + test_read_format_tar.c \ ++ test_read_format_tar_V_negative_size.c \ + test_read_format_tar_concatenated.c \ + test_read_format_tar_empty_filename.c \ + test_read_format_tar_empty_pax.c \ + test_read_format_tar_empty_with_gnulabel.c \ + test_read_format_tar_filename.c \ + test_read_format_tar_invalid_pax_size.c \ + test_read_format_tar_mac_metadata.c \ + test_read_format_tar_pax_g_large.c \ + test_read_format_tar_pax_large_attr.c \ + test_read_format_tar_pax_negative_time.c \ + test_read_format_tbz.c \ + test_read_format_tgz.c \ + test_read_format_tlz.c \ + test_read_format_txz.c \ + test_read_format_tz.c \ + test_read_format_ustar_filename.c \ + test_read_format_warc.c \ + test_read_format_xar.c \ + test_read_format_xar_doublelink.c \ + test_read_format_zip.c \ + test_read_format_zip_7075_utf8_paths.c \ + test_read_format_zip_comment_stored.c \ + test_read_format_zip_encryption_data.c \ + test_read_format_zip_encryption_header.c \ + test_read_format_zip_encryption_partially.c \ + test_read_format_zip_extra_padding.c \ + test_read_format_zip_filename.c \ + test_read_format_zip_high_compression.c \ + test_read_format_zip_jar.c \ + test_read_format_zip_mac_metadata.c \ + test_read_format_zip_malformed.c \ + test_read_format_zip_msdos.c \ + test_read_format_zip_nested.c \ + test_read_format_zip_nofiletype.c \ + test_read_format_zip_padded.c \ + test_read_format_zip_sfx.c \ + test_read_format_zip_traditional_encryption_data.c \ + test_read_format_zip_winzip_aes.c \ + test_read_format_zip_winzip_aes_large.c \ + test_read_format_zip_with_invalid_traditional_eocd.c \ + test_read_format_zip_zip64.c \ + test_read_large.c \ + test_read_pax_empty_val_no_nl.c \ + test_read_pax_xattr_rht_security_selinux.c \ + test_read_pax_xattr_schily.c \ + test_read_pax_truncated.c \ + test_read_position.c \ + test_read_set_format.c \ + test_read_too_many_filters.c \ + test_read_truncated.c \ + test_read_truncated_filter.c \ + test_short_writes.c \ + test_sparse_basic.c \ + test_tar_filenames.c \ + test_tar_large.c \ + test_warn_missing_hardlink_target.c \ + test_ustar_filenames.c \ + test_ustar_filename_encoding.c \ + test_write_disk.c \ + test_write_disk_appledouble.c \ + test_write_disk_failures.c \ + test_write_disk_fixup.c \ + test_write_disk_hardlink.c \ + test_write_disk_hfs_compression.c \ + test_write_disk_lookup.c \ + test_write_disk_mac_metadata.c \ + test_write_disk_no_hfs_compression.c \ + test_write_disk_perms.c \ + test_write_disk_secure.c \ + test_write_disk_secure_noabsolutepaths.c \ + test_write_disk_secure744.c \ + test_write_disk_secure745.c \ + test_write_disk_secure746.c \ + test_write_disk_sparse.c \ + test_write_disk_symlink.c \ + test_write_disk_times.c \ + test_write_filter_b64encode.c \ + test_write_filter_bzip2.c \ + test_write_filter_compress.c \ + test_write_filter_gzip.c \ + test_write_filter_gzip_timestamp.c \ + test_write_filter_lrzip.c \ + test_write_filter_lz4.c \ + test_write_filter_lzip.c \ + test_write_filter_lzma.c \ + test_write_filter_lzop.c \ + test_write_filter_program.c \ + test_write_filter_uuencode.c \ + test_write_filter_xz.c \ + test_write_filter_zstd.c \ + test_write_format_7zip.c \ + test_write_format_7zip_empty.c \ + test_write_format_7zip_large.c \ + test_write_format_ar.c \ + test_write_format_cpio.c \ + test_write_format_cpio_empty.c \ + test_write_format_cpio_newc.c \ + test_write_format_cpio_odc.c \ + test_write_format_gnutar.c \ + test_write_format_gnutar_filenames.c \ + test_write_format_iso9660.c \ + test_write_format_iso9660_boot.c \ + test_write_format_iso9660_empty.c \ + test_write_format_iso9660_filename.c \ + test_write_format_iso9660_zisofs.c \ + test_write_format_mtree.c \ + test_write_format_mtree_absolute_path.c \ + test_write_format_mtree_classic.c \ + test_write_format_mtree_classic_indent.c \ + test_write_format_mtree_fflags.c \ + test_write_format_mtree_no_separator.c \ + test_write_format_mtree_preset_digests.c \ + test_write_format_mtree_quoted_filename.c \ + test_write_format_pax.c \ + test_write_format_raw.c \ + test_write_format_raw_b64.c \ + test_write_format_shar_empty.c \ + test_write_format_tar.c \ + test_write_format_tar_empty.c \ + test_write_format_tar_sparse.c \ + test_write_format_tar_ustar.c \ + test_write_format_tar_v7tar.c \ + test_write_format_warc.c \ + test_write_format_warc_empty.c \ + test_write_format_xar.c \ + test_write_format_xar_empty.c \ + test_write_format_zip.c \ + test_write_format_zip_compression_store.c \ + test_write_format_zip_compression_zstd.c \ + test_write_format_zip_compression_bzip2.c \ + test_write_format_zip_compression_lzmaxz.c \ + test_write_format_zip_empty.c \ + test_write_format_zip_empty_zip64.c \ + test_write_format_zip_entry_size_unset.c \ + test_write_format_zip_file.c \ + test_write_format_zip_file_zip64.c \ + test_write_format_zip_large.c \ + test_write_format_zip_zip64.c \ + test_write_format_zip64_stream.c \ + test_write_format_zip_stream.c \ + test_write_format_zip_windows_path.c \ + test_write_open_memory.c \ + test_write_read_format_zip.c \ + test_xattr_platform.c \ + test_zip_filename_encoding.c + +# Deterministic failures: +# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago` +BROKEN_TESTS+= test_read_disk_directory_traversals + +.if 0 +# test_fuzz.c is not a real test, but rather a simple fuzz-test using random(). +# Since this is not a regression/unit test, we don't include it by default. +# If you would still like to include it, comment out the `.if 0`. +TEST_SCRCS+= test_fuzz.c +${PACKAGE}FILES+= test_fuzz.cab.uu +${PACKAGE}FILES+= test_fuzz.lzh.uu +${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu +# Non-deterministic failures: +# (Times out?) [and] crashes +BROKEN_TESTS+= test_fuzz_rar +.endif + +# Build the test program. +SRCS.libarchive_test= \ + ${TESTS_SRCS} \ + read_open_memory.c \ + list.h + +LIBADD.libarchive_test= archive + +.PATH: ${_LIBARCHIVEDIR}/test_utils +SRCS.libarchive_test+= test_main.c \ + test_utils.c + +# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines +list.h: ${TESTS_SRCS} Makefile + @(cd ${_LIBARCHIVEDIR}/libarchive/test && \ + grep -E -h ^DEFINE_TEST ${.ALLSRC:N*Makefile} | \ + egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANTESTS+= list.h list.h.tmp +${PACKAGE}FILES+= README +${PACKAGE}FILES+= test_acl_pax_posix1e.tar.uu +${PACKAGE}FILES+= test_acl_pax_nfs4.tar.uu +${PACKAGE}FILES+= test_archive_string_conversion.txt.Z.uu +${PACKAGE}FILES+= test_compat_bzip2_1.tbz.uu +${PACKAGE}FILES+= test_compat_bzip2_2.tbz.uu +${PACKAGE}FILES+= test_compat_cpio_1.cpio.uu +${PACKAGE}FILES+= test_compat_gtar_1.tar.uu +${PACKAGE}FILES+= test_compat_gtar_2.tar.uu +${PACKAGE}FILES+= test_compat_gzip_1.tgz.uu +${PACKAGE}FILES+= test_compat_gzip_2.tgz.uu +${PACKAGE}FILES+= test_compat_lz4_1.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_2.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_3.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4BDBX.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B5.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B5BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B6.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B6BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B7.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B7BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_3.lz.uu +${PACKAGE}FILES+= test_compat_lzip_4.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu +${PACKAGE}FILES+= test_compat_lzop_1.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_2.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_3.tar.lzo.uu +${PACKAGE}FILES+= test_compat_mac-1.tar.Z.uu +${PACKAGE}FILES+= test_compat_mac-2.tar.Z.uu +${PACKAGE}FILES+= test_compat_perl_archive_tar.tar.uu +${PACKAGE}FILES+= test_compat_plexus_archiver_tar.tar.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_tar_acl.tar.uu +${PACKAGE}FILES+= test_compat_star_acl_nfs4.tar.uu +${PACKAGE}FILES+= test_compat_star_acl_posix1e.tar.uu +${PACKAGE}FILES+= test_compat_tar_directory_1.tar.uu +${PACKAGE}FILES+= test_compat_tar_hardlink_1.tar.uu +${PACKAGE}FILES+= test_compat_uudecode_large.tar.Z.uu +${PACKAGE}FILES+= test_compat_xz_1.txz.uu +${PACKAGE}FILES+= test_compat_zip_1.zip.uu +${PACKAGE}FILES+= test_compat_zip_2.zip.uu +${PACKAGE}FILES+= test_compat_zip_3.zip.uu +${PACKAGE}FILES+= test_compat_zip_4.zip.uu +${PACKAGE}FILES+= test_compat_zip_5.zip.uu +${PACKAGE}FILES+= test_compat_zip_6.zip.uu +${PACKAGE}FILES+= test_compat_zip_7.xps.uu +${PACKAGE}FILES+= test_compat_zip_8.zip.uu +${PACKAGE}FILES+= test_compat_zstd_1.tar.zst.uu +${PACKAGE}FILES+= test_compat_zstd_2.tar.zst.uu +${PACKAGE}FILES+= test_pax_filename_encoding.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_all.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_libarchive.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_schily.tar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part4.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part5.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part6.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu +${PACKAGE}FILES+= test_read_filter_grzip.tar.grz.uu +${PACKAGE}FILES+= test_read_filter_gzip_recursive.gz.uu +${PACKAGE}FILES+= test_read_filter_lrzip.tar.lrz.uu +${PACKAGE}FILES+= test_read_filter_lzop.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_uudecode_base64_raw.uu +${PACKAGE}FILES+= test_read_filter_uudecode_raw.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate_arm64.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate_powerpc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_archive.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_file.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption_header.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption_partially.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_extract_second.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm64.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_powerpc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_riscv.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_sparc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_malformed.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_malformed2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_packinfo_digests.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_ppmd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_elf.elf.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_modified_pe.exe.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_pe.exe.uu +${PACKAGE}FILES+= test_read_format_7zip_solid_zstd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_symbolic_name.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_arm.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_bcj.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_nobcj.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_sparc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_win_attrib.7z.uu +${PACKAGE}FILES+= test_read_format_ar.ar.uu +${PACKAGE}FILES+= test_read_format_cab_1.cab.uu +${PACKAGE}FILES+= test_read_format_cab_2.cab.uu +${PACKAGE}FILES+= test_read_format_cab_3.cab.uu +${PACKAGE}FILES+= test_read_format_cab_filename_cp932.cab.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_be.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_le.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_cp866.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_eucjp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_koi8r.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_redundant_L.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_13.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_length.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu +${PACKAGE}FILES+= test_read_format_huge_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_iso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_2.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_3.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_long.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_multi_extent.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_new.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_xorriso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_zisofs.iso.Z.uu +${PACKAGE}FILES+= test_read_format_lha_bugfix_0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_filename_cp932.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_filename_utf16.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header1.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header2.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header3.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh6.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh7.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_withjunk.lzh.uu +${PACKAGE}FILES+= test_read_format_mtree.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_crash747.mtree.bz2.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic2.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic3.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_noprint.mtree.uu +${PACKAGE}FILES+= test_read_format_rar.rar.uu +${PACKAGE}FILES+= test_read_format_rar_binary_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_best.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_normal.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_header.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_partially.rar.uu +${PACKAGE}FILES+= test_read_format_rar_endarc_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_filter.rar.uu +${PACKAGE}FILES+= test_read_format_rar_invalid1.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0001.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0002.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0003.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0004.rar.uu +${PACKAGE}FILES+= test_read_format_rar_newsub_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_noeof.rar.uu +${PACKAGE}FILES+= test_read_format_rar_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free2.rar.uu +${PACKAGE}FILES+= test_read_format_rar_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu +${PACKAGE}FILES+= test_read_format_rar_symlink_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu +${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_arm.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_arm_filter_on_window_boundary.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_data_ready_pointer_leak.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_blake2.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_block_size_is_too_small.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_compressed.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_decode_number_out_of_bounds_read.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_solid_window_size.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_window_size.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_winsize_on_merge.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_dirdata.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_distance_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_extra_field_version.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_fileattr.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_hardlink.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_invalid_dict_reference.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_leftshift1.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_leftshift2.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part01.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part02.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part03.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part04.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part05.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part06.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part07.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part08.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part01.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part02.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part03.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part04.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiple_files.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiple_files_solid.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_nonempty_dir_stream.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_only_crypt_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_owner.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_readtables_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar5_solid.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_stored.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_stored_manyfiles.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_symlink.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_truncated_huff.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_unicode.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_unsupported_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_win32.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_window_buf_and_size_desync.rar.uu +${PACKAGE}FILES+= test_read_format_raw.bufr.uu +${PACKAGE}FILES+= test_read_format_raw.data.Z.uu +${PACKAGE}FILES+= test_read_format_raw.data.gz.uu +${PACKAGE}FILES+= test_read_format_raw.data.uu ++${PACKAGE}FILES+= test_read_format_tar_V_negative_size.tar.uu +${PACKAGE}FILES+= test_read_format_tar_concatenated.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_filename.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_with_gnulabel.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_pax.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_invalid_pax_size.tar.uu +${PACKAGE}FILES+= test_read_format_tar_mac_metadata_1.tar.uu +${PACKAGE}FILES+= test_read_format_tar_pax_g_large.tar.uu +${PACKAGE}FILES+= test_read_format_tar_pax_large_attr.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_pax_negative_time.tar.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_warc.warc.uu +${PACKAGE}FILES+= test_read_format_warc_incomplete.warc.uu +${PACKAGE}FILES+= test_read_format_xar_doublelink.xar.uu +${PACKAGE}FILES+= test_read_format_xar_duplicate_filename_node.xar.uu +${PACKAGE}FILES+= test_read_format_zip.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7075_utf8_paths.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7z_deflate.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7z_lzma.zip.uu +${PACKAGE}FILES+= test_read_format_zip_bz2_hang.zip.uu +${PACKAGE}FILES+= test_read_format_zip_bzip2.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_bzip2_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_data.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_header.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_partially.zip.uu +${PACKAGE}FILES+= test_read_format_zip_extra_padding.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp866.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp932.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_koi8r.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_jp.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_high_compression.zip.uu +${PACKAGE}FILES+= test_read_format_zip_jar.jar.uu +${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_alone_leak.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_stream_end.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu +${PACKAGE}FILES+= test_read_format_zip_malformed1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_msdos.zip.uu +${PACKAGE}FILES+= test_read_format_zip_nested.zip.uu +${PACKAGE}FILES+= test_read_format_zip_nofiletype.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded3.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_1.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_2.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_sfx.uu +${PACKAGE}FILES+= test_read_format_zip_symlink.zip.uu +${PACKAGE}FILES+= test_read_format_zip_traditional_encryption_data.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ux.zip.uu +${PACKAGE}FILES+= test_read_format_zip_with_invalid_traditional_eocd.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes128.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_large.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_stored.zip.uu +${PACKAGE}FILES+= test_read_format_zip_xz_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_zip64a.zip.uu +${PACKAGE}FILES+= test_read_format_zip_zip64b.zip.uu +${PACKAGE}FILES+= test_read_format_zip_zstd.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_zstd_multi.zipx.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ae.uu +${PACKAGE}FILES+= test_read_pax_empty_val_no_nl.tar.uu +${PACKAGE}FILES+= test_read_pax_xattr_rht_security_selinux.tar.uu +${PACKAGE}FILES+= test_read_pax_xattr_schily.tar.uu +${PACKAGE}FILES+= test_read_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_too_many_filters.gz.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_aa.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ab.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ac.uu +${PACKAGE}FILES+= test_write_disk_appledouble.cpio.gz.uu +${PACKAGE}FILES+= test_write_disk_appledouble_zip.zip.uu +${PACKAGE}FILES+= test_write_disk_hfs_compression.tgz.uu +${PACKAGE}FILES+= test_write_disk_mac_metadata.tar.gz.uu +${PACKAGE}FILES+= test_write_disk_no_hfs_compression.tgz.uu + +.include diff --cc usr.bin/bsdcat/Makefile index 032207217be6,000000000000..06081fc2b2f8 mode 100644,000000..100644 --- a/usr.bin/bsdcat/Makefile +++ b/usr.bin/bsdcat/Makefile @@@ -1,29 -1,0 +1,29 @@@ +.include + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive + +PROG= bsdcat +BSDCAT_VERSION_STRING!= sed -n '/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \ + ${_LIBARCHIVEDIR}/libarchive/archive.h + +.PATH: ${_LIBARCHIVEDIR}/cat +SRCS= bsdcat.c cmdline.c + +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe - SRCS+= err.c ++SRCS+= lafe_err.c + +CFLAGS+= -DBSDCAT_VERSION_STRING=\"${BSDCAT_VERSION_STRING}\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" +CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe + +LIBADD= archive + +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +.endif + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + +.include diff --cc usr.bin/cpio/Makefile *** 477 LINES SKIPPED *** From nobody Tue Oct 21 17:31:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crfVB0Jdkz6Cdhg; Tue, 21 Oct 2025 17:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crfV96tNzz3b53; Tue, 21 Oct 2025 17:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761067890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6yiIj6X/7itVoaAztqyJ0woIPbgswjP+7nLIq7z8HM=; b=ARFJN5QKdzoKBTnrErA7UELQEqxuHiUnKvKB8cu10wkwY7e7bFDhYpzT6Vg33DvYncVKTJ lhZGYt0eBVWrO8qkPQuwlfkg5ODAFg2vS+hC2AYKNNaTK9qv3L+Q1I2T749dXPPuBdP3sp xJTsLw/x09RAlsT7XjHGRFPktQ5E6pOg4/m0thlBrSYM5ibWAyKejsVLgF2Nbf9pQingfi qSa408Z3Y0PC54HX1xFNv7TYSgygAA2JynivPwsbfVFi0C4E+7zr+86XIkEm+xQbeje6nK 6UO4+n2UDA3qvSoCGhHnpmG6xt/993REib/cukk5Y4CZ3vlYP3d3S7DgpJ5cZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761067890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6yiIj6X/7itVoaAztqyJ0woIPbgswjP+7nLIq7z8HM=; b=exWzj6xccAVV3wxA3SAbGxUxOYKn/hEVz26SHVd2v1n+ER1O8ss1XTCOWhPCw3WCA7YyCR GmLVifpEVSfCIAUiRx4IiBOIXwV3ZQAkO1jbKz97IDct/cZgAJmWZvJd365VIxgZ8SvU17 ax7YasjlbBzigQoZ/jkOiXf8wAtoKMnrG0aHfPlYgnILSfL+oiCE/palsyK2ZpU/D616In Cx+bTsH/FW+JNYR+kC87lYKOISu88ui64eFIibOMxk7LAIDUkn2B0PHi/YlJkTpKEx5dVZ F7/62eiSgh5SGkvk6S4XrjH9mdd4uCQ3AcOXekH3lHRQDPK+POfi/DDWcUKQBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761067890; a=rsa-sha256; cv=none; b=j+zlg6CzVx7SJNNdh1UXjEpZDuotQ9hgQ04h06cuwqqpFgxKNcb8Kb6izMP/Pu4pxEk1KB OWnYoXKX+4vTaMBMAZfCo8RE8dZHzRXWrigEq+jaXNv+MpJRZ+1U2sTul3Cqiv6rjH2gZd x2+6wthM9/t6AS2ONZ0ksp8vKOFi8IkVL/8Ls5Jh3xdmsk7rVwyBF9b1DT4iL2wDINg03k Y0B67Dm08mBYfDWiRcCdfSrhguBqMFB68AHYJFYrclsP0S6LKh9LBXIHStG3uF/SadcYJV rr4a+3uHQm0igBoUYra1uA8PpZuwkC+AwAehakN4+Djv2H0YCdsoBrS4iHP/yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crfV969htz17r3; Tue, 21 Oct 2025 17:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LHVTAb005414; Tue, 21 Oct 2025 17:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHVTph005411; Tue, 21 Oct 2025 17:31:29 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:31:29 GMT Message-Id: <202510211731.59LHVTph005411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 05637c82243e - main - rc: Chase 052211e08c0e and bfb202c4554a, remove ifconfig down/up List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 05637c82243e681b5db5d7e9829e699515456524 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=05637c82243e681b5db5d7e9829e699515456524 commit 05637c82243e681b5db5d7e9829e699515456524 Author: Cy Schubert AuthorDate: 2025-10-21 17:28:39 +0000 Commit: Cy Schubert CommitDate: 2025-10-21 17:31:23 +0000 rc: Chase 052211e08c0e and bfb202c4554a, remove ifconfig down/up bfb202c4554a addresses the CTRL-EVENT-SCAN-FAILED. Upstream d807e289d caused FreeBSD regression in driver_bsd.c, which this rc.d patch worked around. As of bfb202c4554a this workaround is no longer needed. 052211e08c0e implemented this change for wpa_supplicant but not for hostapd. Reported by: avg MFC after: 3 days --- libexec/rc/rc.d/hostapd | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libexec/rc/rc.d/hostapd b/libexec/rc/rc.d/hostapd index 264cb4ef476b..15b20c95c488 100755 --- a/libexec/rc/rc.d/hostapd +++ b/libexec/rc/rc.d/hostapd @@ -11,15 +11,6 @@ name="hostapd" desc="Authenticator for IEEE 802.11 networks" command=${hostapd_program} -start_postcmd="hostapd_poststart" - -hostapd_poststart() { - if [ -n "$ifn" ]; then - ifconfig ${ifn} down - sleep 2 - ifconfig ${ifn} up - fi -} ifn="$2" if [ -z "$ifn" ]; then From nobody Tue Oct 21 17:49:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crftl0Yr0z6CgCg; Tue, 21 Oct 2025 17:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crftk6zDTz3d7B; Tue, 21 Oct 2025 17:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNC5od+BBSOw/hX/etMoe2of9MiesX8b0PxHXGyQVug=; b=G3npate9oPHP67NQ5/CoexTpUI7j72B1m87B/xkZpoTTYoODU7TdOtfaFqACZ6Tl9cpUoy euk9fL8VMVPYW0XayWWio2Sz58LFNY8qI6aMCDHzz6bwhslELjdIleHwyxCaOi9qgL09iD YZuXIIgUnvuao2eYGrMLWZP+CJxQq5uHU53K87by0/E10wJPSiwuVxH42wwYoYU43UH2ng hTD7F9nPjm23JSdlsybSNK4EDWMH70jhzCTLM1t6HjsxGhkIxb2Y4M9f04HrQjquZsYAo3 5KY6uzW47SYBNMKjHF5e2uZ6I3lkUcCqtwNZjjj/PY9//3C4gPZ7eFjA8KqRSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNC5od+BBSOw/hX/etMoe2of9MiesX8b0PxHXGyQVug=; b=qQbyMj2J/RHoyb6P0IcGIbSZ1qY3mlJ/ItID++wHk8yAys1CcjlqLgqdhgxFh+e1wJUeDn tfT1AD1+7iAEVTUFN1LQpaxHMb8y7IQ2pawgKQCCNpKH2YVMONPiv5xpBXaEgsHl+5tbGh gwNQZkEyXHXw0O2a1A9MBmE58z+1arQCkMkfseU9AphdNmsIhVG8XSy1ohwylUl27PqLA8 8UyFf7qJynZ7aVvLhfgPjLF0HWTrwcKZsHKBY1VXNdRdCWMa5B7+C2wUJ7inev/oAKs1eR u20fH3vVUCiA8++V/rneBmDMDZAzHCPHYuKu9dNYqpZcaRA4O3/dHEcRjjBbfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068959; a=rsa-sha256; cv=none; b=ArZXbF4Kq6S5AJrNbiTNLnubdO2gMjdUU9UADP+DkCOM03xDzoXrqGwwsFUdUA344G+iNT mLi+y0L2w/v0oXj9jW2V0TVZdQ6hhB2ujgtNxhH1qvr0+5y8YGPMzNn9ZM37z74oIa0Oj1 tpV+kx5qanR1o+JZvGxW50kphjM/olFlJ/Lw/Z8fIJN5jyZDKlNMYlKDTIUbjj+dla56hl ve7i14Kil1ryGfCWLI7v49QeSVxkzbG6WyEfTlVnx8HAeuvrw3hAA/G0GhflSRvnynyrjU unG/StEmNp5cTeonJOVW1pQpNyDaGB4UukaUmoYoD29DDKZqS9Ou/wwfm96YSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crftk6Z3Zz186S; Tue, 21 Oct 2025 17:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LHnIDS029304; Tue, 21 Oct 2025 17:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnIWY029301; Tue, 21 Oct 2025 17:49:18 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:18 GMT Message-Id: <202510211749.59LHnIWY029301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 14133abfe9c2 - main - vmm: Improve register get/set handling a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 14133abfe9c218b97e888edf04d2ec4a86e7ab4b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14133abfe9c218b97e888edf04d2ec4a86e7ab4b commit 14133abfe9c218b97e888edf04d2ec4a86e7ab4b Author: Mark Johnston AuthorDate: 2025-10-21 17:34:11 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:11 +0000 vmm: Improve register get/set handling a bit On non-amd64 platforms, check for negative register indices. This isn't required today since we match against individual register indices, but we might as well check it. On amd64, add a comment explaining why we permit negative register indices. Use mallocarray() for allocating register arrays in the ioctl layer. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53143 --- sys/amd64/vmm/vmm.c | 3 ++- sys/arm64/vmm/vmm.c | 5 ++--- sys/dev/vmm/vmm_dev.c | 16 ++++++++-------- sys/riscv/vmm/vmm.c | 5 ++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index f7c59847140b..473887240b9b 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -870,7 +870,7 @@ vm_assign_pptdev(struct vm *vm, int bus, int slot, int func) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); @@ -882,6 +882,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index bf52dc0fe916..14ea26c3668c 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -1279,8 +1279,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -1291,7 +1290,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_PC) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 4961b21180e1..27bd115a4fd3 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -656,10 +656,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) @@ -682,10 +682,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 4c9b1fa53f7a..24b4be89af48 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -954,8 +954,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -966,7 +965,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_SEPC) From nobody Tue Oct 21 17:49:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crftm1SBWz6CgJW; Tue, 21 Oct 2025 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crftm0pSKz3dCy; Tue, 21 Oct 2025 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nrYjhdvrbQLCU8/E4E6w1w+/89826jdHx//790z0JMU=; b=qGzsXL1Wp4FFn6MjIXrexNspkGI8panacG7IGYl3tl1psCsnYLDqVM6u62NszOf8qBe8ZA ZxkZRNbw3cNv+2TJ85RUGqIEb+fyuz9xEto0UA8cDWD1+YQjXaB8b7mkNKpcmjEOQmVhc+ PWxcwiyXjqAbH83KlfrBIB1fUn9Cwk96aDFoq6XKGVlW+nwGNc/dljWO71gPyNuJlQoo30 EJWpEwH9PxkZcNHy94ylB8H2vjLYNx6l2JRjvlgXSZifDknCP8KElgNsMj+VxbOOo4pppR L6ATTThIFGuMb1o2mLhZgIOi54jWTZLmZ0rjA0MiT0W4JVFn5xC2hqbNejQMaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nrYjhdvrbQLCU8/E4E6w1w+/89826jdHx//790z0JMU=; b=OSOF/j+vbEYIMmua5pXHAAi33UmGxRq9bog6Vxm27y0N4e2O5S23uF4zMwHddBO6PvfehY T4ighvpEMnOxK1x0pZZu4fwNMdYdsaxBAX+dG8TphVQYVoc7NG5vhjVOELXrNB2/iMSqma +UWj+NmIIhKUx/yxk9s6JAiUTsgLfVjcDwnBVhFpyxc/O2NQ/soY6GVia4CH0pIny8BQ86 4xR/FHrgpj7kcFqv4FCjENV6qeuBgD8cgaaiTFnN44zJpTv5Ir7DkBAGIvauGnLRce2fUd 7TvObezXjx48xDPTboN0Sw/m+xyWqf8AntQlyUXNE6E0lJFobm5L7NHGAHiu8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068960; a=rsa-sha256; cv=none; b=ba6t6D41CgJmh9JOQ/2UDXJ9tWmF8xU0XmNkMarwaX1VzGfgwRIwB0cMADlhtAR8xDmoUm tnepMttdSNeu0vB2tbP9hFWLgb7nTZGrxXR0+KO9sEMSmujedDYZnoxhkJyvGFlggajCxu dkNjw8x1HABfznIX8qG53NCR4dIGAHXKzdqAHVeY98C5ht8NjIzu4Nx4xWJfTICoKWORN7 rE62zyGJUG1OR+OVvZnGM89gE/4QWfP3c1ClAgujJGfyP572ewuWRMLrxY+XmPmheRjBxh HA2Eoqb8+aRxOVemm1HMZK2/qxt4aZXZkmD3PkFCrC4IbWzl70QpRkpD+sw97A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crftm0MGgz188r; Tue, 21 Oct 2025 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LHnJ4A029337; Tue, 21 Oct 2025 17:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnJ49029334; Tue, 21 Oct 2025 17:49:19 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:19 GMT Message-Id: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e11768e94787 - main - vmm: Add PRIV_DRIVER checks for passthru ioctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e11768e94787bef2866486ba8616353716a10447 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e11768e94787bef2866486ba8616353716a10447 commit e11768e94787bef2866486ba8616353716a10447 Author: Mark Johnston AuthorDate: 2025-10-21 17:34:29 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:29 +0000 vmm: Add PRIV_DRIVER checks for passthru ioctls In preparation for allowing non-root users to create and access bhyve VMs, add privilege checks for ioctls which operate on passthru devices. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53144 --- sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- sys/dev/vmm/vmm_dev.c | 7 +++++++ sys/dev/vmm/vmm_dev.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index dfebc9dcadbf..347f739d53ec 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -124,12 +124,16 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_SET_KERNEMU_DEV, VMMDEV_IOCTL_LOCK_ONE_VCPU), VMMDEV_IOCTL(VM_BIND_PPTDEV, - VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), VMMDEV_IOCTL(VM_UNBIND_PPTDEV, - VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), - VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS), - VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), #ifdef BHYVE_SNAPSHOT #ifdef COMPAT_FREEBSD13 VMMDEV_IOCTL(VM_SNAPSHOT_REQ_13, VMMDEV_IOCTL_LOCK_ALL_VCPUS), @@ -147,9 +151,9 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_LAPIC_LOCAL_IRQ, VMMDEV_IOCTL_MAYBE_ALLOC_VCPU), - VMMDEV_IOCTL(VM_PPTDEV_MSI, 0), - VMMDEV_IOCTL(VM_PPTDEV_MSIX, 0), - VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, 0), + VMMDEV_IOCTL(VM_PPTDEV_MSI, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), VMMDEV_IOCTL(VM_LAPIC_MSI, 0), VMMDEV_IOCTL(VM_IOAPIC_ASSERT_IRQ, 0), VMMDEV_IOCTL(VM_IOAPIC_DEASSERT_IRQ, 0), diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 27bd115a4fd3..ebbceb25b69e 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -470,6 +471,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, if (ioctl == NULL) return (ENOTTY); + if ((ioctl->flags & VMMDEV_IOCTL_PRIV_CHECK_DRIVER) != 0) { + error = priv_check(td, PRIV_DRIVER); + if (error != 0) + return (error); + } + if ((ioctl->flags & VMMDEV_IOCTL_XLOCK_MEMSEGS) != 0) vm_xlock_memsegs(sc->vm); else if ((ioctl->flags & VMMDEV_IOCTL_SLOCK_MEMSEGS) != 0) diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 410066c49cf2..2881a7063565 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -44,6 +44,7 @@ struct vmmdev_ioctl { #define VMMDEV_IOCTL_LOCK_ALL_VCPUS 0x08 #define VMMDEV_IOCTL_ALLOC_VCPU 0x10 #define VMMDEV_IOCTL_MAYBE_ALLOC_VCPU 0x20 +#define VMMDEV_IOCTL_PRIV_CHECK_DRIVER 0x40 int flags; }; From nobody Tue Oct 21 17:49:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crftn2qzVz6Cg4y; Tue, 21 Oct 2025 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crftn1Pb4z3d2p; Tue, 21 Oct 2025 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e17aPHSIW29iSMJqXM+yRMzcD5ULeLmptXr58ttegGQ=; b=gHot7mmJphJMWL7+lQIXU9ziLp7f95cgl5MT1nzoiA/twYjbZNXUv/UL8r5i7TMUKGpCGl Lcp/DhLQf08L1N+giIe1wTE51nsmK3rwI+ebLmbL6gXYTlBK8bXYU0VW9lklbPrw+5bXIS 8nQSfdENB9eFdaVkeZjf06zCzc22mu7GyWgyZk7UvuerCsN6B4B7ae9Mc3YfOJzhv650rd s7yq+j7XCTM2DkcApx4gmUFI36vU0+ZocG/CHLHV/Xql9tCStePRkldBcu13WYOCG9u04O kCRAYxrzNLLhR728quEcrkXgBYNzVkFTGMNtbbDq8R2ijra7tpO9d7OeAIrSiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e17aPHSIW29iSMJqXM+yRMzcD5ULeLmptXr58ttegGQ=; b=wqPyUvf4YF4taviuWZUWydgvql8O2smlk4/8+tzergGHy0RdrK63ZXuBHhyJpIZUO+n5gM SUKAsZ3+jlTtxk9FRFsyz8YYVcj8SbaI0stFXsgqx+wC6QYvB/Uf9GcVvxJm2LVohGzEqe xx6V749v6b7jVniysn8FDzs9HkN1wgob2G0+bFilsoEMplOVxu1rJCm7X3CvZEP64Hsk8Y uTZTo6TN0V37e3WZ+zIc8eXUrWxmplRHp1tog2HzHouhge9/i4h8rn8jcIEw9pnynz/tRB xY31tuB7LQZBgus6A9YC4cfo/jpXlpBmbBvdhAnRXv7UeGLI/j1lDGkrCZn73g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068961; a=rsa-sha256; cv=none; b=lYNa0/MEa/hDyo9MIIMVX9RtyQJgA3qjaqsHrbtObqMt36ktD6tXItJfEUqa9XIwK5SmpP /54MxfdkZTeAnX+nQWuZc4v7dRmZ0lGTykfpWa0RnyUx/qmfh5FObZY1Erk+oKSlHrKgc4 fMjewhygKrrV9K/B8FJJ6v3ONjFSgZ/L8A7kWKCWgkV6atr+C4HsUisfVNHS9PtXjY4ahj xDswGIFjhOL7VVwrBAk+Kvwn3RMIHSTP7IhTwPb6mGHqp8vaXe0oPJJFAbsc7IKrzZntVl NovXe7Id+egQoL8AEzoyY33ohWDfraVUJXlE68fHDf0qAnkdHsnyH6mGKQ3TOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crftn0lRDz18NQ; Tue, 21 Oct 2025 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LHnLgp029373; Tue, 21 Oct 2025 17:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnLOT029370; Tue, 21 Oct 2025 17:49:21 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:21 GMT Message-Id: <202510211749.59LHnLOT029370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0225c6d85d0d - main - vmm: Move local variables into ioctl handlers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0225c6d85d0d4250ed304b31e6ce855fc5d93f15 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0225c6d85d0d4250ed304b31e6ce855fc5d93f15 commit 0225c6d85d0d4250ed304b31e6ce855fc5d93f15 Author: Mark Johnston AuthorDate: 2025-10-21 17:34:48 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:48 +0000 vmm: Move local variables into ioctl handlers Make the ioctl handlers easy to read by moving local variables into per-ioctl blocks. No functional change intended. Reviewed by: corvink, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53145 --- sys/amd64/vmm/vmm_dev_machdep.c | 237 +++++++++++++++++++++++++--------------- sys/arm64/vmm/vmm_dev_machdep.c | 43 +++++--- sys/riscv/vmm/vmm_dev_machdep.c | 37 +++++-- 3 files changed, 205 insertions(+), 112 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index 347f739d53ec..b84be809ea24 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -176,40 +176,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_seg_desc *vmsegdesc; - struct vm_run *vmrun; -#ifdef COMPAT_FREEBSD13 - struct vm_run_13 *vmrun_13; -#endif - struct vm_exception *vmexc; - struct vm_lapic_irq *vmirq; - struct vm_lapic_msi *vmmsi; - struct vm_ioapic_irq *ioapic_irq; - struct vm_isa_irq *isa_irq; - struct vm_isa_irq_trigger *isa_irq_trigger; - struct vm_pptdev *pptdev; - struct vm_pptdev_mmio *pptmmio; - struct vm_pptdev_msi *pptmsi; - struct vm_pptdev_msix *pptmsix; - struct vm_x2apic *x2apic; - struct vm_gpa_pte *gpapte; - struct vm_gla2gpa *gg; - struct vm_intinfo *vmii; - struct vm_rtc_time *rtctime; - struct vm_rtc_data *rtcdata; - struct vm_readwrite_kernemu_device *kernemu; -#ifdef BHYVE_SNAPSHOT - struct vm_snapshot_meta *snapshot_meta; -#ifdef COMPAT_FREEBSD13 - struct vm_snapshot_meta_13 *snapshot_13; -#endif -#endif int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -247,6 +220,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, case VM_RUN_13: { struct vm_exit *vme; struct vm_exit_13 *vme_13; + struct vm_run_13 *vmrun_13; vmrun_13 = (struct vm_run_13 *)data; vme_13 = &vmrun_13->vm_exit; @@ -285,85 +259,123 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; } #endif - case VM_PPTDEV_MSI: + case VM_PPTDEV_MSI: { + struct vm_pptdev_msi *pptmsi; + pptmsi = (struct vm_pptdev_msi *)data; - error = ppt_setup_msi(vm, - pptmsi->bus, pptmsi->slot, pptmsi->func, - pptmsi->addr, pptmsi->msg, - pptmsi->numvec); + error = ppt_setup_msi(vm, pptmsi->bus, pptmsi->slot, + pptmsi->func, pptmsi->addr, pptmsi->msg, pptmsi->numvec); break; - case VM_PPTDEV_MSIX: + } + case VM_PPTDEV_MSIX: { + struct vm_pptdev_msix *pptmsix; + pptmsix = (struct vm_pptdev_msix *)data; - error = ppt_setup_msix(vm, - pptmsix->bus, pptmsix->slot, - pptmsix->func, pptmsix->idx, - pptmsix->addr, pptmsix->msg, - pptmsix->vector_control); + error = ppt_setup_msix(vm, pptmsix->bus, pptmsix->slot, + pptmsix->func, pptmsix->idx, pptmsix->addr, pptmsix->msg, + pptmsix->vector_control); break; - case VM_PPTDEV_DISABLE_MSIX: + } + case VM_PPTDEV_DISABLE_MSIX: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = ppt_disable_msix(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_MAP_PPTDEV_MMIO: + } + case VM_MAP_PPTDEV_MMIO: { + struct vm_pptdev_mmio *pptmmio; + pptmmio = (struct vm_pptdev_mmio *)data; error = ppt_map_mmio(vm, pptmmio->bus, pptmmio->slot, - pptmmio->func, pptmmio->gpa, pptmmio->len, - pptmmio->hpa); + pptmmio->func, pptmmio->gpa, pptmmio->len, pptmmio->hpa); break; - case VM_UNMAP_PPTDEV_MMIO: + } + case VM_UNMAP_PPTDEV_MMIO: { + struct vm_pptdev_mmio *pptmmio; + pptmmio = (struct vm_pptdev_mmio *)data; error = ppt_unmap_mmio(vm, pptmmio->bus, pptmmio->slot, - pptmmio->func, pptmmio->gpa, pptmmio->len); + pptmmio->func, pptmmio->gpa, pptmmio->len); break; - case VM_BIND_PPTDEV: + } + case VM_BIND_PPTDEV: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = vm_assign_pptdev(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_UNBIND_PPTDEV: + } + case VM_UNBIND_PPTDEV: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = vm_unassign_pptdev(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_INJECT_EXCEPTION: + } + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->vector, vmexc->error_code_valid, vmexc->error_code, vmexc->restart_instruction); break; + } case VM_INJECT_NMI: error = vm_inject_nmi(vcpu); break; - case VM_LAPIC_IRQ: + case VM_LAPIC_IRQ: { + struct vm_lapic_irq *vmirq; + vmirq = (struct vm_lapic_irq *)data; error = lapic_intr_edge(vcpu, vmirq->vector); break; - case VM_LAPIC_LOCAL_IRQ: + } + case VM_LAPIC_LOCAL_IRQ: { + struct vm_lapic_irq *vmirq; + vmirq = (struct vm_lapic_irq *)data; error = lapic_set_local_intr(vm, vcpu, vmirq->vector); break; - case VM_LAPIC_MSI: + } + case VM_LAPIC_MSI: { + struct vm_lapic_msi *vmmsi; + vmmsi = (struct vm_lapic_msi *)data; error = lapic_intr_msi(vm, vmmsi->addr, vmmsi->msg); break; - case VM_IOAPIC_ASSERT_IRQ: + } + case VM_IOAPIC_ASSERT_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_assert_irq(vm, ioapic_irq->irq); break; - case VM_IOAPIC_DEASSERT_IRQ: + } + case VM_IOAPIC_DEASSERT_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_deassert_irq(vm, ioapic_irq->irq); break; - case VM_IOAPIC_PULSE_IRQ: + } + case VM_IOAPIC_PULSE_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_pulse_irq(vm, ioapic_irq->irq); break; + } case VM_IOAPIC_PINCOUNT: *(int *)data = vioapic_pincount(vm); break; case VM_SET_KERNEMU_DEV: case VM_GET_KERNEMU_DEV: { + struct vm_readwrite_kernemu_device *kernemu; mem_region_write_t mwrite; mem_region_read_t mread; int size; @@ -400,60 +412,86 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, error = mread(vcpu, kernemu->gpa, &kernemu->value, size, &arg); break; - } - case VM_ISA_ASSERT_IRQ: + } + case VM_ISA_ASSERT_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_assert_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_assert_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_DEASSERT_IRQ: + } + case VM_ISA_DEASSERT_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_deassert_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_deassert_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_PULSE_IRQ: + } + case VM_ISA_PULSE_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_pulse_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_pulse_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_SET_IRQ_TRIGGER: + } + case VM_ISA_SET_IRQ_TRIGGER: { + struct vm_isa_irq_trigger *isa_irq_trigger; + isa_irq_trigger = (struct vm_isa_irq_trigger *)data; error = vatpic_set_irq_trigger(vm, isa_irq_trigger->atpic_irq, isa_irq_trigger->trigger); break; - case VM_SET_SEGMENT_DESCRIPTOR: + } + case VM_SET_SEGMENT_DESCRIPTOR: { + struct vm_seg_desc *vmsegdesc; + vmsegdesc = (struct vm_seg_desc *)data; - error = vm_set_seg_desc(vcpu, - vmsegdesc->regnum, - &vmsegdesc->desc); + error = vm_set_seg_desc(vcpu, vmsegdesc->regnum, + &vmsegdesc->desc); break; - case VM_GET_SEGMENT_DESCRIPTOR: + } + case VM_GET_SEGMENT_DESCRIPTOR: { + struct vm_seg_desc *vmsegdesc; + vmsegdesc = (struct vm_seg_desc *)data; - error = vm_get_seg_desc(vcpu, - vmsegdesc->regnum, - &vmsegdesc->desc); + error = vm_get_seg_desc(vcpu, vmsegdesc->regnum, + &vmsegdesc->desc); break; - case VM_SET_X2APIC_STATE: + } + case VM_SET_X2APIC_STATE: { + struct vm_x2apic *x2apic; + x2apic = (struct vm_x2apic *)data; error = vm_set_x2apic_state(vcpu, x2apic->state); break; - case VM_GET_X2APIC_STATE: + } + case VM_GET_X2APIC_STATE: { + struct vm_x2apic *x2apic; + x2apic = (struct vm_x2apic *)data; error = vm_get_x2apic_state(vcpu, &x2apic->state); break; - case VM_GET_GPA_PMAP: + } + case VM_GET_GPA_PMAP: { + struct vm_gpa_pte *gpapte; + gpapte = (struct vm_gpa_pte *)data; - pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), - gpapte->gpa, gpapte->pte, &gpapte->ptenum); - error = 0; + pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), gpapte->gpa, + gpapte->pte, &gpapte->ptenum); break; + } case VM_GET_HPET_CAPABILITIES: error = vhpet_getcap((struct vm_hpet_cap *)data); break; case VM_GLA2GPA: { + struct vm_gla2gpa *gg; + CTASSERT(PROT_READ == VM_PROT_READ); CTASSERT(PROT_WRITE == VM_PROT_WRITE); CTASSERT(PROT_EXEC == VM_PROT_EXECUTE); @@ -464,50 +502,76 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; } - case VM_GLA2GPA_NOFAULT: + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_SET_INTINFO: + } + case VM_SET_INTINFO: { + struct vm_intinfo *vmii; + vmii = (struct vm_intinfo *)data; error = vm_exit_intinfo(vcpu, vmii->info1); break; - case VM_GET_INTINFO: + } + case VM_GET_INTINFO: { + struct vm_intinfo *vmii; + vmii = (struct vm_intinfo *)data; error = vm_get_intinfo(vcpu, &vmii->info1, &vmii->info2); break; - case VM_RTC_WRITE: + } + case VM_RTC_WRITE: { + struct vm_rtc_data *rtcdata; + rtcdata = (struct vm_rtc_data *)data; error = vrtc_nvram_write(vm, rtcdata->offset, rtcdata->value); break; - case VM_RTC_READ: + } + case VM_RTC_READ: { + struct vm_rtc_data *rtcdata; + rtcdata = (struct vm_rtc_data *)data; error = vrtc_nvram_read(vm, rtcdata->offset, &rtcdata->value); break; - case VM_RTC_SETTIME: + } + case VM_RTC_SETTIME: { + struct vm_rtc_time *rtctime; + rtctime = (struct vm_rtc_time *)data; error = vrtc_set_time(vm, rtctime->secs); break; - case VM_RTC_GETTIME: - error = 0; + } + case VM_RTC_GETTIME: { + struct vm_rtc_time *rtctime; + rtctime = (struct vm_rtc_time *)data; rtctime->secs = vrtc_get_time(vm); break; + } case VM_RESTART_INSTRUCTION: error = vm_restart_instruction(vcpu); break; #ifdef BHYVE_SNAPSHOT - case VM_SNAPSHOT_REQ: + case VM_SNAPSHOT_REQ: { + struct vm_snapshot_meta *snapshot_meta; + snapshot_meta = (struct vm_snapshot_meta *)data; error = vm_snapshot_req(vm, snapshot_meta); break; + } #ifdef COMPAT_FREEBSD13 - case VM_SNAPSHOT_REQ_13: + case VM_SNAPSHOT_REQ_13: { + struct vm_snapshot_meta *snapshot_meta; + struct vm_snapshot_meta_13 *snapshot_13; + /* * The old structure just has an additional pointer at * the start that is ignored. @@ -517,6 +581,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, (struct vm_snapshot_meta *)&snapshot_13->dev_data; error = vm_snapshot_req(vm, snapshot_meta); break; + } #endif case VM_RESTORE_TIME: error = vm_restore_time(vm); diff --git a/sys/arm64/vmm/vmm_dev_machdep.c b/sys/arm64/vmm/vmm_dev_machdep.c index 926a74fa528b..29d14e1ba952 100644 --- a/sys/arm64/vmm/vmm_dev_machdep.c +++ b/sys/arm64/vmm/vmm_dev_machdep.c @@ -68,19 +68,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_run *vmrun; - struct vm_vgic_version *vgv; - struct vm_vgic_descr *vgic; - struct vm_irq *vi; - struct vm_exception *vmexc; - struct vm_gla2gpa *gg; - struct vm_msi *vmsi; int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -94,41 +88,62 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; break; } - case VM_INJECT_EXCEPTION: + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->esr, vmexc->far); break; - case VM_GLA2GPA_NOFAULT: + } + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_GET_VGIC_VERSION: + } + case VM_GET_VGIC_VERSION: { + struct vm_vgic_version *vgv; + vgv = (struct vm_vgic_version *)data; /* TODO: Query the vgic driver for this */ vgv->version = 3; vgv->flags = 0; error = 0; break; - case VM_ATTACH_VGIC: + } + case VM_ATTACH_VGIC: { + struct vm_vgic_descr *vgic; + vgic = (struct vm_vgic_descr *)data; error = vm_attach_vgic(vm, vgic); break; - case VM_RAISE_MSI: + } + case VM_RAISE_MSI: { + struct vm_msi *vmsi; + vmsi = (struct vm_msi *)data; error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus, vmsi->slot, vmsi->func); break; - case VM_ASSERT_IRQ: + } + case VM_ASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_assert_irq(vm, vi->irq); break; - case VM_DEASSERT_IRQ: + } + case VM_DEASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_deassert_irq(vm, vi->irq); break; + } default: error = ENOTTY; break; diff --git a/sys/riscv/vmm/vmm_dev_machdep.c b/sys/riscv/vmm/vmm_dev_machdep.c index ba15d8dcd79e..c736b10dc9c0 100644 --- a/sys/riscv/vmm/vmm_dev_machdep.c +++ b/sys/riscv/vmm/vmm_dev_machdep.c @@ -67,18 +67,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_run *vmrun; - struct vm_aplic_descr *aplic; - struct vm_irq *vi; - struct vm_exception *vmexc; - struct vm_gla2gpa *gg; - struct vm_msi *vmsi; int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -90,34 +85,52 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, error = copyout(vme, vmrun->vm_exit, sizeof(*vme)); break; } - case VM_INJECT_EXCEPTION: + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->scause); break; - case VM_GLA2GPA_NOFAULT: + } + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_ATTACH_APLIC: + } + case VM_ATTACH_APLIC: { + struct vm_aplic_descr *aplic; + aplic = (struct vm_aplic_descr *)data; error = vm_attach_aplic(vm, aplic); break; - case VM_RAISE_MSI: + } + case VM_RAISE_MSI: { + struct vm_msi *vmsi; + vmsi = (struct vm_msi *)data; error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus, vmsi->slot, vmsi->func); break; - case VM_ASSERT_IRQ: + } + case VM_ASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_assert_irq(vm, vi->irq); break; - case VM_DEASSERT_IRQ: + } + case VM_DEASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_deassert_irq(vm, vi->irq); break; + } default: error = ENOTTY; break; From nobody Tue Oct 21 18:31:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crgqV32whz6CkdB; Tue, 21 Oct 2025 18:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crgqV2VLVz3jr0; Tue, 21 Oct 2025 18:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761071494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bA1EaW539/56kWscYnVHnsOWXo7VMkotqlphMw/sgxM=; b=Np7WEbDaxOHkc7p+eLyRAt8/0aEVJmp7aW6QdstAcyVLXLeC94zZW2YlDOxHEak9G0CDtD 7GbpslMAiU77m9M43Ge7tTmU2+/MWhKRl4DsGLi/HlrsMneWSvY812L2MslXy3Zg6t94tW ocO7dtkMe3oCVq2MsbNVJ438kB7uDlssHoMSnj1Lt46+KFExbU4Q8DD+eXT+TIJcQ7FVmN vTZW3Inxx6WkMKHUQZ7HGkw3tP3zKLQNzBm287owcyxOH6jfYDV0/PPeSHrZppHXOKMkHB fzwznAdl9qvhhyTh3rA5sK6wRe43dFmM3FgBzaVwcjfm/gF4kC8C4tXW4Ds5Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761071494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bA1EaW539/56kWscYnVHnsOWXo7VMkotqlphMw/sgxM=; b=ww/7layRb8TEoLJm1PdPjcfRAbHMtNHPiNul3b9eMOMlfLtOw2pOEF8jx9OGGhUUnWxXDN MWoQbbuRLzLHw+KTw86xMz64fEhB2tS95pPX9UWNauM0WHsIwpDNB6lSD6qDkJ+Xkmkt/8 D0BDpwrg0XY/3slBFAG9dhgSuQFUkwRfzdj5oTUX7w2ONXZuP/0M8rejfGQpvAZywvZV3d AGbtJnoHEDah5xCn9iALGp2Qunl6tsuNnS6R9PH8z99cTYPbKFogveNz9swm/B59SOsvho 07rVpAN+i5C6ZR0Wv04d8ujhXscKWEd7ynHdwk22OCuG5vgbIZs9UY/0b4N5Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761071494; a=rsa-sha256; cv=none; b=kn0dn++Nr4wHSIhUNi4XZ+QRgxqpuWcYN+fCZpyo2HevJTSiLZtm2PMQ7dBTBvZnp9bdo5 S5Dz0/tpzveFudGYwj1B+EC37DtkbidB8IWQBac60ySS5DM5zdGxiwtjLPJhr54mLUw/lI 0wI81ZThBy23+k+Rcna0F1+g2xlnKS2GYLVlRZ6TWbWhy4l36RKXAL5PyE9mHC9ehqhOMb 39Zto7L8kR1FBrrFERZ1cxIChWA4ulvKVP+azVKgL0UUTTX3YrbZQyx8xARv/GgTKpvUPk 7jycMQMHC/GOtu8j5knUWaPzlKzr3tudLHt52dGiIOV4yCQkw0+p9gWDnuLI2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crgqV243Hz19Qg; Tue, 21 Oct 2025 18:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LIVYDE022298; Tue, 21 Oct 2025 18:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LIVY86022294; Tue, 21 Oct 2025 18:31:34 GMT (envelope-from git) Date: Tue, 21 Oct 2025 18:31:34 GMT Message-Id: <202510211831.59LIVY86022294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: d78da1ea01b2 - main - man9: Provide SYSCTL_BOOL & SYSCTL_ADD_BOOL man pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d78da1ea01b21f3be6011bea174f9ee3ece623ed Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=d78da1ea01b21f3be6011bea174f9ee3ece623ed commit d78da1ea01b21f3be6011bea174f9ee3ece623ed Author: David E. O'Brien AuthorDate: 2025-10-21 18:18:18 +0000 Commit: David E. O'Brien CommitDate: 2025-10-21 18:31:01 +0000 man9: Provide SYSCTL_BOOL & SYSCTL_ADD_BOOL man pages Updates: 84e717c4c & 9a593520 --- share/man/man9/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 3bccc92572d6..52ec9be3ae02 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -2207,6 +2207,7 @@ MLINKS+=syscall_helper_register.9 syscall_helper_unregister.9 \ syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT_F.9 \ syscall_helper_register.9 SYSCALL_INIT_HELPER_F.9 MLINKS+=sysctl.9 SYSCTL_DECL.9 \ + sysctl.9 SYSCTL_ADD_BOOL.9 \ sysctl.9 SYSCTL_ADD_CONST_STRING.9 \ sysctl.9 SYSCTL_ADD_INT.9 \ sysctl.9 SYSCTL_ADD_LONG.9 \ @@ -2233,6 +2234,7 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_ADD_UMA_CUR.9 \ sysctl.9 SYSCTL_ADD_UMA_MAX.9 \ sysctl.9 SYSCTL_ADD_UQUAD.9 \ + sysctl.9 SYSCTL_BOOL.9 \ sysctl.9 SYSCTL_CHILDREN.9 \ sysctl.9 SYSCTL_STATIC_CHILDREN.9 \ sysctl.9 SYSCTL_NODE_CHILDREN.9 \ From nobody Tue Oct 21 19:46:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crjVQ1TtDz6CsGl; Tue, 21 Oct 2025 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crjVQ0z42z3qKS; Tue, 21 Oct 2025 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVCFDYPVWiIHEaJRa3gWbUv6m3LlAbxCs6U7BWOPOX0=; b=dS9wsmBBwGhpSZd2aW0s/ZQf5V10clfcf2TjV+bqFpsnBpBYXH92gSWPoEcJlwrroeiN6k fJfngCk2Qh61W49BAC5gWNbXhUuvCHPeRuyFoPRnBiczbFGXfRLjbmVi/ZqvxFJan1LICr GLuzkeutASNw+Jx29tR5BjWFxjs8zTCE0JS20Whyh6xHGLqCaqdYXYX2CsBv8n65B+etLD sniy3CgUVf0/7ne3M3acvfgUhjWIS2SYcqRIvagM5YdozEt0oDUFoMyHMcLfa3m3J7Ep9o LNW523MRsjhJPSeIw4KgU7KOm8BMj3RNb6zrM5AF5NEyRwas5w3EMsvJ5A1gvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVCFDYPVWiIHEaJRa3gWbUv6m3LlAbxCs6U7BWOPOX0=; b=J6GmUqwAniZJis15KWcssb0Bvr3/wRuQB/+eHjKUw1Ruz5AxtEkUQOTj2WJ0sdA0FQ7Csp OWi9fPUlinIUIimRcWVCUCaiEfh0IRF3Fwqh0pw5WriPUt2jDPvV/RfsVDA4Hk5xH5n2eY WEo876UtWzJJduO0iPKM6Fyj2UmygLnByEDxvxj1S/KI9gKhYWbMy9C6AzLLoIidGd4fLc St7iRWOcnn/1bwh01H9qhtc2aPX5bTqVcHNHx8Y5Jkcw0TllLZKwGB2cErQcevQxNn756N zOf2jRxe/XcbHK+yXXUGI9pBSNrBPZikjeZyEo1SRA9YHqyEeeobe11lvlPtgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761076014; a=rsa-sha256; cv=none; b=xjrAAeunfxAPALByVQw1IvHBjxzupdRpVVPR8bGw/md+v9hiVUJySsx4z9l++zjOec3lIB gWGZE0nQobOxxuPxohx5g2SlooB+ZQx8KdH8Sm6q6cvy1sdI0eA29otnhFypvstymuowHP nC0r62S6ZYD78MBaQ+6DSR51QX7GIimxIBof+qmRwtatP1NMlsoXiM8dvjzu/wN+fUKa9k 6xKZq9QR4JZmeWGaExEaUOPleRdq067ojHMzgmwbNAL5VkUAnyFn32HLBUawwh9XRNUynx LJ94W2na2EsPsj8zjJZe68R+BCzSsQjSuPYggCgBUHWXu+WUWWw6vYKIg/gEtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crjVQ0J7kz1C5s; Tue, 21 Oct 2025 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LJkr27055617; Tue, 21 Oct 2025 19:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LJkrNa055614; Tue, 21 Oct 2025 19:46:53 GMT (envelope-from git) Date: Tue, 21 Oct 2025 19:46:53 GMT Message-Id: <202510211946.59LJkrNa055614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7648d2ebda22 - main - tests/sys/netpfil/pf/sctp: make use of required.kmods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7648d2ebda22fe21ed385cc7d76813a1a9c17c99 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7648d2ebda22fe21ed385cc7d76813a1a9c17c99 commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99 Author: Alan Somers AuthorDate: 2025-10-20 13:52:41 +0000 Commit: Alan Somers CommitDate: 2025-10-21 19:46:26 +0000 tests/sys/netpfil/pf/sctp: make use of required.kmods This greatly speeds up skipping a test that can't be run. MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D53215 --- tests/sys/netpfil/pf/sctp.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 78055f5a9dd2..47bf40181b1b 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -29,9 +29,6 @@ sctp_init() { pft_init - if ! kldstat -q -m sctp; then - atf_skip "This test requires SCTP" - fi } atf_test_case "basic_v4" "cleanup" @@ -39,6 +36,7 @@ basic_v4_head() { atf_set descr 'Basic SCTP connection over IPv4 passthrough' atf_set require.user root + atf_set require.kmods sctp } basic_v4_body() @@ -112,6 +110,7 @@ basic_v6_head() { atf_set descr 'Basic SCTP connection over IPv6' atf_set require.user root + atf_set require.kmods sctp } basic_v6_body() @@ -186,6 +185,7 @@ reuse_head() { atf_set descr 'Test handling dumb clients that reuse source ports' atf_set require.user root + atf_set require.kmods sctp } reuse_body() @@ -244,6 +244,7 @@ abort_v4_head() { atf_set descr 'Test sending ABORT messages' atf_set require.user root + atf_set require.kmods sctp } abort_v4_body() @@ -302,6 +303,7 @@ abort_v6_head() { atf_set descr 'Test sending ABORT messages over IPv6' atf_set require.user root + atf_set require.kmods sctp } abort_v6_body() @@ -360,6 +362,7 @@ nat_v4_head() { atf_set descr 'Test NAT-ing SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } nat_v4_body() @@ -412,6 +415,7 @@ nat_v6_head() { atf_set descr 'Test NAT-ing SCTP over IPv6' atf_set require.user root + atf_set require.kmods sctp } nat_v6_body() @@ -464,6 +468,7 @@ rdr_v4_head() { atf_set descr 'Test rdr SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } rdr_v4_body() @@ -531,6 +536,7 @@ pfsync_head() { atf_set descr 'Test pfsync-ing SCTP connections' atf_set require.user root + atf_set require.kmods carp sctp } pfsync_body() @@ -563,10 +569,6 @@ pfsync_body() sctp_init pfsynct_init vnet_init_bridge - if ! kldstat -q -m carp - then - atf_skip "This test requires carp" - fi j="sctp:pfsync" @@ -722,6 +724,7 @@ timeout_head() { atf_set descr 'Test setting and retrieving timeout values' atf_set require.user root + atf_set require.kmods sctp } timeout_body() @@ -753,6 +756,7 @@ related_icmp_head() { atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' atf_set require.user root + atf_set require.kmods sctp } related_icmp_body() From nobody Tue Oct 21 20:01:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crjpn6KkKz6CtvD; Tue, 21 Oct 2025 20: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crjpn5bs5z3rnF; Tue, 21 Oct 2025 20: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=1761076865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSXW8LtzuCwSuJnl5Zmvwjs1TofAITvSqwCiJ+U7MLA=; b=kANNC+wpJrcEa4atKQv9tLsYxflOj7/Q/u7cqztU1//U+h9FvbBVN5f2Xkhh+Aujtnq98C 7ETji9JrDJLEqt3Zu6DQRqRVG0VrRoiw6GQVaKLXehqPIWx5zo7t9BHRqvDy5u7TaYaMG7 qpleY50Q5L+QtHC5qqZCiA302qn0ea+gTbw9I+3KST5HyCxytqtpu2JFHFajtoqmkVJe6o MSwHUrcmBk2d/vk7NnPd9sEwfjiiAFgqrSFPMzPzGt+keYawSxFjS0CEoX6HNw7xf0hEGW zBGrOI5DZQMygh7OOn9kdGm2h7nl0j4HoDvRJFR6kGJacOkx+3ALarWQSRYiXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSXW8LtzuCwSuJnl5Zmvwjs1TofAITvSqwCiJ+U7MLA=; b=tf0eb6s2EUVHlJwdPUpqzicOGd9lE5WK78Vt7sLfYJRvI4MY+zSI8HXdATf3+kNMU6XSMk AKjlVEtb0R9EAEhhwT9Db/EWU6fR1F+0ca8lawmwX1hApEdkw/AfXaMZWmYZFg3dTDeJP9 /GwWFl51XXAR62LnbniMA/xukrtg0/WZNIJKIgYQ71i7Cu9vlhT9u3f19Pafobar97td9A QMg+BnubgRpLzEczkX0eMc4JLu82s1ADGRAF3WRxyzwga87zOAJtB+UbFXE2UZs5441ZiG 2Yklm2XSCMQIdkpVdQdSW17Cd++HmAIqM3gEQBZ+2F37MJ335qxy5PMUqD5cDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761076865; a=rsa-sha256; cv=none; b=EztsNp4Vz5CwItK+bkIFJXLserJo+VzfJwTVy2TO60+Ysq1ZaSU58KXu4am3uO1lFnGYpj lXjEmBr+FbFA6JuonZ6DaSnSE+CpZ9qcljn0PFLkJWEOIrcEJR4lBp+qkAK7UqGKJX4ZVP lrErXOz7XvVQKPEPW9TwPkJkxhBfJjQtVhH9NemW0MV/4BmONh4TlKFLdxa3kmjEO8NZlF ivkiSCo8s8TE11On1QuO7EJehE+5I2l7oJvWYmymU9WWNyOKglD1PUXqAXJn/RKUXiBEbC 8P7q4F+FdR+Jozue/UMP87jl7GJFhLZdSRGhU1rKlTR8Q2Obb9yNjpWHbee8Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crjpn587Dz1CQ1; Tue, 21 Oct 2025 20:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LK15DP084788; Tue, 21 Oct 2025 20:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LK15Zd084785; Tue, 21 Oct 2025 20:01:05 GMT (envelope-from git) Date: Tue, 21 Oct 2025 20:01:05 GMT Message-Id: <202510212001.59LK15Zd084785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1cc316727eba - main - if_vxlan: fix byteorder of source port List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 1cc316727ebae157b3d035d9fb1ad38310a80698 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc316727ebae157b3d035d9fb1ad38310a80698 commit 1cc316727ebae157b3d035d9fb1ad38310a80698 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-10-21 18:58:26 +0000 Commit: Kristof Provost CommitDate: 2025-10-21 20:00:27 +0000 if_vxlan: fix byteorder of source port Fix the htons byteorder of vxlan packets after `vxlan_pick_source_port` picks a source port during encapsulation. Reviewed by: zlei, kp, adrian Differential Revision: https://reviews.freebsd.org/D53022 --- sys/net/if_vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 03184c1fb678..f3a8410a2258 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2533,7 +2533,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = sc->vxl_src_addr.in4.sin_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = fvxlsa->in4.sin_addr; dstport = fvxlsa->in4.sin_port; @@ -2644,7 +2644,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = &sc->vxl_src_addr.in6.sin6_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = &fvxlsa->in6.sin6_addr; dstport = fvxlsa->in6.sin6_port; From nobody Tue Oct 21 21:02:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crlBS49Yxz6D0fY; Tue, 21 Oct 2025 21:03:12 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crlBS1qwdz42d7; Tue, 21 Oct 2025 21:03:12 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 8897BA64805; Tue, 21 Oct 2025 21:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1761080571; bh=yOiyWLlDQzKCfUGy9ZEwneVL7vQ8EXh5awZGgmuToEg=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=J8fRx9CpkN1ZOTAfxC9h+3wmCUh7J0wCQAmSmmYO2ZJiiNSTpnF3bFWCmXyBK8qsE z8hW2t5IvzWKugrAGt8fS+0aRIqFkIOjcz/SRZDh1gTgxu9tOfals2gfGBTqSQ9Eqn JfotlgzMyGd+I7SVb3xefUXPZaKpQP2Ze0TK/OhdM98yYBlj+IvDN7LjlCbPNQ+Wbn 2/XTEck48ttYvuBJ5fEybEngRVWVykQKosthwnPBGHzNB0Ladh5Wf616eDvy/gVoAx Wquazvi1Xd5wU8Bx+iQp8RhQYsd93DzVZrtXi0hsCdjNP5n4cUNCWGafxTLjVlqz6S 5ctXWsXwK82H7gcEZlylZnw+dOl3SZ5UUFNAYs24IqTi46eZ65ug+vi5G6eABzcxCM MdKwPe+vHmV/C3e8xUdlKfVsslnXScR/PcbhkmEMm2IHEYP6aZnrMGVf7kZz3po156 6SwIwh7I6rJDo8JRksyUv5bWvsYsHyMLYsttaeKEQ9tysjrr41pC2Qemd+49hfhDzC NW0R+BsBmLpeY2Z1hSgXisiG3yjpjd7XnYhQjeaI9xM9d++R3ziwqe0EfuHfxiZs5p yduMgIKkjnM1+xoPg8j2yVBt7525dHb1nDeZ9gwJKJlmppwdt5OwDto4ibJwary1rN OBL6ugdv48aluBeuAY16LHdg= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 66B2C2D029E6; Tue, 21 Oct 2025 21:03:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 4CJRKkTUYD6f; Tue, 21 Oct 2025 21:03:01 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 4C1852D029D8; Tue, 21 Oct 2025 21:03:01 +0000 (UTC) Date: Tue, 21 Oct 2025 21:02:59 +0000 (UTC) From: "Bjoern A. Zeeb" To: Mark Johnston cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: e11768e94787 - main - vmm: Add PRIV_DRIVER checks for passthru ioctls In-Reply-To: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> Message-ID: <5pr96847-3p44-6043-50o4-4np23n9022q3@mnoonqbm.arg> References: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4crlBS1qwdz42d7 On Tue, 21 Oct 2025, Mark Johnston wrote: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e11768e94787bef2866486ba8616353716a10447 > > commit e11768e94787bef2866486ba8616353716a10447 > Author: Mark Johnston > AuthorDate: 2025-10-21 17:34:29 +0000 > Commit: Mark Johnston > CommitDate: 2025-10-21 17:34:29 +0000 > > vmm: Add PRIV_DRIVER checks for passthru ioctls > > In preparation for allowing non-root users to create and access bhyve > VMs, add privilege checks for ioctls which operate on passthru devices. Does this mean we need to have a way to give a user a priveledge in order to also use pssthru (likely not easily possible currently; different longer topic I am happy to talk about as it came up elsewhere recently). That said if we go there I think DRIVER may be a dangerous priveledge but then again the user may need to setup interfaces for networking just as well which is kind of orthotognal to the system administration concept. Giving a user PRIV_DRIVER is likely never ever going to be a good idea given the catchall it is used as so we one day might need a more flexible, more finegrained system ... So in conclusion what your commit message is saying (if I understand it right): a user will be allowed to start bhyve but not be allowed to use certain features, like passthru? > Reviewed by: corvink > MFC after: 2 weeks > Sponsored by: The FreeBSD Foundation > Sponsored by: Klara, Inc. > Differential Revision: https://reviews.freebsd.org/D53144 > --- > sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- > sys/dev/vmm/vmm_dev.c | 7 +++++++ > sys/dev/vmm/vmm_dev.h | 1 + > 3 files changed, 19 insertions(+), 7 deletions(-) -- Bjoern A. Zeeb r15:7 From nobody Tue Oct 21 22:18:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crmsc6WYbz6D6Kr for ; Tue, 21 Oct 2025 22:18:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (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 4crmsc4VZpz3FFt for ; Tue, 21 Oct 2025 22:18:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-4e88cd19bc5so6671881cf.3 for ; Tue, 21 Oct 2025 15:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761085119; x=1761689919; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=wuXORG2bAoeV/UCX4A3LHwY2OsSKt5lEjCEc0FFrBQQ=; b=SjPSCDaZp4Zq2ON1ToDI3RxxnqUp6jlEZ62ih45CNsRGEmzAQt8CI30Q0SW/SVu2+y 92wPU/LZIw0KYgH5Jn76JwbtzZCy7Oi+KgoVgOQSjJBxcgX3qSuUxpV2B8JgDdXH84vA Cs9GEXqlbIFsedkfKthrDNhA/tfwAYLGKgfxwnESLDXDFsQAqlTBcLItzLHbqXSogVQH UAgy4cRP/RHMXPOx6Z3kG/aYfrBeteW7XuAfaKROER1BQi1JH9Bz7/iooPldSzSZvR+v GFYY9x6gmMGq7Rai3rQwF4OpHeDA7+sAuMyK5rmQovSFjLo38SMsMT1cTSLtT5o8S2ek NX8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761085119; x=1761689919; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wuXORG2bAoeV/UCX4A3LHwY2OsSKt5lEjCEc0FFrBQQ=; b=QG0r30x+N4gBSmHx48YhMP/mlt4uH27KeOHLAROGSZ7W2P7tZo5jmB92pjSzecck67 fYNKEuSqomUEBtPENoQlrylj5E6AEG3sorZLb1LfKTiOkKZQI5UfVRWmOc0o7BmBIhaX f4IzE9rnaUdP9tzm3gCZ7ByNLE2xZpjTKTkqxPtEr5DtHr4a+52EAOt15p0tQGdgxGqL c3op79Evt8Sz9w5sqp53dMnywZkdjl/Xna1cKGcvg4n2CnPAXMQtN6TaR7U57XVKxS4T COnoCOqhGirynr1O2g4nS9K94K0kn7MhS6B+gLPjXgcVEW9gOWVqvQ5VM2KaiTAC843A uiUQ== X-Forwarded-Encrypted: i=1; AJvYcCUGUOBGXuV5JgYKT+HcBaWvqvl02G9+0W/qtZ+yWFeLDgMy8PVcnttACwryk0ALEqRNW12nObOz2X0rzt8aGtn1f20A@freebsd.org X-Gm-Message-State: AOJu0YypFDDV+gdr6TReAXB+KkjN3J93tzMq2qaROaVv/l4Cv16OElCO loDcuXOC2M1HePgGPVvW5uR7lVWieiSIdBnjNJVOaOluKiHAoWOk48hg X-Gm-Gg: ASbGncu74U9fUN5dNlf+HKksx7y7l85Z9wn+ZZ9FPbCtfodaiMCvKKkY6V5hkcMvP42 ZpN/ifBRCiJDHVpeZHZI8mjTkZ4urqk2cA/nAglFwyQhZ+uuXns+Nu6AEP8/XFU1YuPNAOBFXxV 3dcYjl4Jqdu/zEGmUlkeMZTXVWN/7BNO/28IuioP2oOEH5gAMoOS24r0tw54YFeBCMFG8L3XeNk iOgVoPiOwQ/9M3HoVMycZGOuuNQUP1qHFEJcFQBhAnsZplxZUx38ZgsLKE+0nvkTApVB55fI5b1 kGigKQYaV2QQPTc2OviATXfB5n8ywqmbK9wV3pj/H3kF447HDLyRaw2umWUMF7W/b9/8y9gcJLx allf9Ssy+hsj4rMGJd9K8oL0CV1FXg7Fbd7mBU7NLfz8nXcDP9uvINBV2sEqnC1j/FEBq1xrB48 T9VDCTS2KN+WP5qPDjnw== X-Google-Smtp-Source: AGHT+IFm6vIF7dxAQRbzeaeBovGWt8Vts2kVLJbeK2QG2YEUP1ZIji5L9+NJ2FwaONI01i694KiHmA== X-Received: by 2002:ac8:5646:0:b0:4e8:9f18:6e5e with SMTP id d75a77b69052e-4e89f187138mr160277451cf.33.1761085118655; Tue, 21 Oct 2025 15:18:38 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4e8af0126a9sm77979121cf.12.2025.10.21.15.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 15:18:37 -0700 (PDT) Date: Tue, 21 Oct 2025 18:18:34 -0400 From: Mark Johnston To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e11768e94787 - main - vmm: Add PRIV_DRIVER checks for passthru ioctls Message-ID: References: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> <5pr96847-3p44-6043-50o4-4np23n9022q3@mnoonqbm.arg> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5pr96847-3p44-6043-50o4-4np23n9022q3@mnoonqbm.arg> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4crmsc4VZpz3FFt On Tue, Oct 21, 2025 at 09:02:59PM +0000, Bjoern A. Zeeb wrote: > On Tue, 21 Oct 2025, Mark Johnston wrote: > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=e11768e94787bef2866486ba8616353716a10447 > > > > commit e11768e94787bef2866486ba8616353716a10447 > > Author: Mark Johnston > > AuthorDate: 2025-10-21 17:34:29 +0000 > > Commit: Mark Johnston > > CommitDate: 2025-10-21 17:34:29 +0000 > > > > vmm: Add PRIV_DRIVER checks for passthru ioctls > > > > In preparation for allowing non-root users to create and access bhyve > > VMs, add privilege checks for ioctls which operate on passthru devices. > > Does this mean we need to have a way to give a user a priveledge in order > to also use pssthru (likely not easily possible currently; different longer > topic I am happy to talk about as it came up elsewhere recently). > > That said if we go there I think DRIVER may be a dangerous priveledge > but then again the user may need to setup interfaces for networking just > as well which is kind of orthotognal to the system administration concept. > > Giving a user PRIV_DRIVER is likely never ever going to be a good idea given > the catchall it is used as so we one day might need a more flexible, more > finegrained system ... > > > So in conclusion what your commit message is saying (if I understand it right): > a user will be allowed to start bhyve but not be allowed to use certain features, > like passthru? That's right. I'd like to make it possible to create and run bhyve VMs as an unprivileged user (provided that they belong to an as-yet uncreated "vmm" group), but passthru functionality will remain root-only. > > Reviewed by: corvink > > MFC after: 2 weeks > > Sponsored by: The FreeBSD Foundation > > Sponsored by: Klara, Inc. > > Differential Revision: https://reviews.freebsd.org/D53144 > > --- > > sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- > > sys/dev/vmm/vmm_dev.c | 7 +++++++ > > sys/dev/vmm/vmm_dev.h | 1 + > > 3 files changed, 19 insertions(+), 7 deletions(-) > > -- > Bjoern A. Zeeb r15:7 From nobody Wed Oct 22 03:06:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crvF66Cvfz6DVdd; Wed, 22 Oct 2025 03:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crvF65SL1z3pWV; Wed, 22 Oct 2025 03:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761102362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFwPD/XsmOwgzIn8TW4CkbELuUDrdC/fzj3KQj8lo1Y=; b=qxPYazVDan1VS0sPzN3R2nUZz5ypxfoNVm9To1fZ1JNhAVmavv3nS7PFF5RwhaDIFRB2cT 2mr6+fnajpa9z1g6ARUg0vt5eC6h1L9pB/o6PYbx8kFgyurSo/uwKMf/kQjySGpCaYzgJb L9zisf1bEzGnz8jg8Ys7wo4Y0IluneL2QOHoyEjldJczgeyGwibxIxL1qd+S0GqVCizY6U BO07b0WMmOJwg0Yu0Rm3pz4n1s4YfYsae3ceYgyd6wefxt+MUjeMdTwn5qfvCiKIRdWXa8 XnZa1IHMopngOmZ+iO/i/rF//MwPe3/cXGZENGGLeEeifaPj6NOO+LOHsSKDRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761102362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFwPD/XsmOwgzIn8TW4CkbELuUDrdC/fzj3KQj8lo1Y=; b=FtPkw4M7zARSomMLK1yBZlkoQFw/1RIs3OrehJ9CGdvPPYktaFEOYZQvmiKBlIISU56+k0 EWTCEqZEzbMLsDH7IKvVQS0iWcQElEWjWJofEXlYoqRiCEb41MgdXaagtMmhtgFECnvN03 +q2SoGZXpNPbpbpQbuIQcKPRLhp4hfSEEbyP3N+ap0IgGI92YKfDiDd3kNuqcqcHEJDpUq vd87UOTI1F1nbIR192gcL3hwfYOJM92GZBZMvIdWdbEJeNMgPsJIL8bgx83bxfn4AkWwP8 tj594ScO07vk282V0DPlRhQOwqi3NNyt2J7XYW+h/j7KzM+PB4kLCLHuf9WMPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761102362; a=rsa-sha256; cv=none; b=Md2d2ZeRh1q8Xm3Qd0WOrHcprPm22Isvo7A5GGjtVGxRpmP7zfpOlP79hi54EK6XqTEhjl teHGbaQhUIOBpSbWDI97U45rs5bBpGaNKVS5PhHrOoXxjFQZMSitX5nbvjw3PniXVqtwBW 4b5G6dVwI70mhRPY7PYMnfFUuRxlK6Pi4C2aoTkdLsevrFAOsWiArus57gfXjPhNjDSBdu ts4Kl8JUDIdQGUZSJVGknRoowntf2+YsVvNzCFs8jcHkSro6/lXYp2vQHrdwlIAllGFcrx BQBqeQt5QGjAqwiXLXzflDnlT8zuRNJEtO7039OkvcrgriOmLA9HYUtFe/EjwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crvF653xwz1QPp; Wed, 22 Oct 2025 03:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59M362N1085767; Wed, 22 Oct 2025 03:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M362l0085764; Wed, 22 Oct 2025 03:06:02 GMT (envelope-from git) Date: Wed, 22 Oct 2025 03:06:02 GMT Message-Id: <202510220306.59M362l0085764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: cdc199039308 - main - bsd-family-tree: add OpenBSD 7.8 release List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdc1990393084fb00a85abc7557f9a92a2059ea2 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=cdc1990393084fb00a85abc7557f9a92a2059ea2 commit cdc1990393084fb00a85abc7557f9a92a2059ea2 Author: Maxim Konovalov AuthorDate: 2025-10-22 03:05:23 +0000 Commit: Maxim Konovalov CommitDate: 2025-10-22 03:05:23 +0000 bsd-family-tree: add OpenBSD 7.8 release --- share/misc/bsd-family-tree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index b1614c7eb409..b0502dfc7925 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -479,7 +479,7 @@ FreeBSD 5.2 | | | | | | | | | DragonFly 6.4.1 | | | | | DragonFly 6.4.2 | FreeBSD | | | | - | 14.3 | | | | + | 14.3 | | OpenBSD 7.8 | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -925,6 +925,7 @@ OpenBSD 7.7 2025-04-28 [OBD] DragonFly 6.4.1 2025-04-30 [DFB] DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] +OpenBSD 7.8 2025-10-22 [OBD] Bibliography ------------------------ From nobody Wed Oct 22 05:15:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cry763HTcz6Dfxd; Wed, 22 Oct 2025 05:16:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cry762SHTz42Fy; Wed, 22 Oct 2025 05:16:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761110162; 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: in-reply-to:in-reply-to:references:references; bh=Ft2hCunLZtxDJ881mn9Vupq1/h/Mj5dH4Y+swu7gGBI=; b=qeoaxVKhKJfb1yNaAjYMbqYQ4vNcP4s084FkVqzz+0sP80xrGTvyWOIhf1HVDh1TLASoYo vTDB4jEJuu0orXChUyjEjtc15tYLV5Yb3VZkYrjeF3knYUC5Rs4r0HdvoA1U4/FOccQrMz uI8w9H9scyuM/9CoYchUamy/W2mXR3XVesr7Msn3jr7ZGmkz6kTcBUYO+I8GCivrQfv1ck 3cjJYxSDAK2fh8phGJi77/a59d/KMNLENis7ZLpCOSyQHoKnGh7QUN4uAh7cVqI9fKqYnj FJ5zkU3lrcIw+jKCiQ8allZpunRbN07hP0Nyh58bMKVGE2hvr7ZdbhMFG6VcBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761110162; 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: in-reply-to:in-reply-to:references:references; bh=Ft2hCunLZtxDJ881mn9Vupq1/h/Mj5dH4Y+swu7gGBI=; b=PJ8adEosI2mK598FmXtzrKPig9iAN4wlsogQLJArxc+Mpf+fS7spVZjgVNp4ZlNSdsZfak 3pVNGB6LzvN/mYQwzerEssGL9Ztivgj2NUYuRoOi3Nm6T53bGzMjqokgqSdj83wRxuXsw+ tT+3nVOlFm4hfNtKDjnOPP2VyAPuzaw6X/rFEUEeONRC1c0ikr1sWG9WH68DVrUdaHIk83 nis9oRcABds+KnRLqKnNstcrHR7J0cAJHmNch+IswVAiSYC4W+Zfb1Ebc3uikLrbg8bOIU Zb6wKyyVOTSNnzTYxzxISyf4+6c5OBCYaMb2yQToLXzpXYUEFpsEracqwMw/AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761110162; a=rsa-sha256; cv=none; b=X0goCxS+Accl5AGC75+j7obadJioYaPkR2vA/uM1HlNqDN0Hx5yspwjtNSMjBViIYyWRdQ E/7EuMCjJEgFZREFWOUsw25kUqwFJgryn1W5BhG4VjmMrqiHIRX4ty++/XzDhmp/is16xm hGq182EJ7l8XoyRcT1gEEJGJeHOM8dOZCpWwCZNSx6jo4C4Vb6XUrtk1OEpAKHAKR0fAoH qCzWa9INvdoaQulaH685zsPGiiwFAizP2TWZBVIXKAXhNdJJhB2eMkEG6VNx2ekryKi0Jr MwkobcLo5VnMEZt7x4CXQjfiIbf/exsL/VylDL4z1WNjoFZr2i8W73XF9Z/uEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cry7500lkz10MV; Wed, 22 Oct 2025 05:16:00 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv From: Zhenlei Huang In-Reply-To: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> Date: Wed, 22 Oct 2025 13:15:52 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> References: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> To: Mitchell Horne X-Mailer: Apple Mail (2.3696.120.41.1.10) Hi Mitchell, The riscv LINT kernel build fails with this change, ``` $ make buildkernel TARGET_ARCH=3Driscv64 KERNCONF=3DLINT =3D=3D=3D> allwinner/aw_sid (all) cc -target riscv64-unknown-freebsd16.0 = --sysroot=3D/usr/obj/home/zlei/freebsd-src/riscv.riscv64/tmp = -B/usr/obj/home/zlei/freebsd-src/riscv.riscv64/tmp/usr/bin -O2 -pipe = -fno-common -march=3Drv64imafdc -mabi=3Dlp64d -fno-strict-aliasing = -Werror -D_KERNEL -DKLD_MODULE -DKLD_TIED -nostdinc = -DHAVE_KERNEL_OPTION_HEADERS -include = /usr/obj/home/zlei/freebsd-src/riscv.riscv64/sys/LINT/opt_global.h -I. = -I/home/zlei/freebsd-src/sys = -I/home/zlei/freebsd-src/sys/contrib/ck/include -fno-common -g = -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fPIC = -fdebug-prefix-map=3D./machine=3D/home/zlei/freebsd-src/sys/riscv/include = -I/usr/obj/home/zlei/freebsd-src/riscv.riscv64/sys/LINT -fno-builtin = -MD -MF.depend.aw_sid.o -MTaw_sid.o -march=3Drv64imafdch -mabi=3Dlp64 = -mno-relax -ffreestanding -fwrapv -fstack-protector -gdwarf-4 -Wall = -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual = -Wundef -Wno-pointer-sign -D__printf__=3D__freebsd_kprintf__ = -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas = -Wswitch -Wno-error=3Dtautological-compare -Wno-error=3Dempty-body = -Wno-error=3Dparentheses-equality -Wno-error=3Dunused-function = -Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value = -Wno-address-of-packed-member -Wno-format-zero-length -mcmodel=3Dmedium = -std=3Dgnu17 -c /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c -o = aw_sid.o /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c:48:10: fatal error: = 'nvmem_if.h' file not found 48 | #include "nvmem_if.h" | ^~~~~~~~~~~~ 1 error generated. *** Error code 1 ``` Best regards, Zhenlei > On Oct 21, 2025, at 7:42 AM, Mitchell Horne = wrote: >=20 > The branch main has been updated by mhorne: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5522519731b74e7b56c710ec5ea4d340= 65f3ed32 >=20 > commit 5522519731b74e7b56c710ec5ea4d34065f3ed32 > Author: Mitchell Horne > AuthorDate: 2024-09-18 17:19:16 +0000 > Commit: Mitchell Horne > CommitDate: 2025-10-20 23:37:13 +0000 >=20 > modules: enable allwinner kmods on riscv >=20 > While here, standardize the place they are enabled in the Makefile. = For > armv7 the module subdirectory was added explicitly in the config = file, > but this is not idiomatic. >=20 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > --- > sys/arm/conf/GENERIC | 1 - > sys/arm/conf/NOTES | 1 - > sys/modules/Makefile | 2 +- > 3 files changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC > index 7394f3842d43..9607b16756ea 100644 > --- a/sys/arm/conf/GENERIC > +++ b/sys/arm/conf/GENERIC > @@ -272,5 +272,4 @@ makeoptions MODULES_EXTRA+=3D"dtb/rpi" > makeoptions MODULES_EXTRA+=3D"dtb/zynq" >=20 > # SOC-specific modules > -makeoptions MODULES_EXTRA+=3D"allwinner" > makeoptions MODULES_EXTRA+=3D"imx" > diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES > index 920d721dc3ba..0a5d34c3849a 100644 > --- a/sys/arm/conf/NOTES > +++ b/sys/arm/conf/NOTES > @@ -94,7 +94,6 @@ nodevice bnxt >=20 > # Build SOC-specific modules... >=20 > -makeoptions MODULES_EXTRA+=3D"allwinner" > makeoptions MODULES_EXTRA+=3D"imx" >=20 > # Build dtb files... > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 63a0b3260e6d..9ec7c33465f3 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile > @@ -680,6 +680,7 @@ _irdma=3D irdma > .if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D = "arm" || \ > ${MACHINE_CPUARCH} =3D=3D "riscv" > .if !empty(OPT_FDT) > +_allwinner=3D allwinner > _if_cgem=3D if_cgem > .endif > .endif > @@ -713,7 +714,6 @@ _hyperv=3D hyperv > _vf_i2c=3D vf_i2c >=20 > .if !empty(OPT_FDT) > -_allwinner=3D allwinner > _dwwdt=3D dwwdt > _enetc=3D enetc > _felix=3D felix From nobody Wed Oct 22 06:51:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs0Dj1lsfz6Dn6f; Wed, 22 Oct 2025 06:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs0Dj1786z4B19; Wed, 22 Oct 2025 06:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761115861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pyDx+FJGNl7C+I90e4jjHPilLfIp3GyBP8XooyNHfSw=; b=f5iovR3Mw21fWyfAFwYZr5CmpJYPGzTm06EhyoQ/PzZuBOT8An1rSfadqciXH6Pkdg7OWf kZYyDzA1WL6Sh6B3rLDs6C3ZiTNH+YnBcF9JZVMfyt++bt10hMryQkDwuRDsmcPryt6omL IJ2nacnnmaZNe6avfM6x8OiD+MK8apUkTFZU/svPDi9TWfD7wRTicMsA4oCM5MDzytnd/7 PHGNP0ipBBCWV4wiVdEyqFNVmB/lH3ogwVG8psefqJ6IQcYtBnB3Ll3fGW7jkYQwWwFpYs 84ZsPi3wey3zfTVTl/rKjnYHFWg4cVFr+qnYTsO4n2ICzvkzGcuJK7MhaXuhTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761115861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pyDx+FJGNl7C+I90e4jjHPilLfIp3GyBP8XooyNHfSw=; b=flpAeU2rc8dHgL14/0r4iTiULT/0kkTES8pIe+Rf+r8w7hzRc0yxGKcLhmHcyp/4x+yL+x exr+/vk99qGq83u/xhNqGWyCYd6+X/981csOlMqltRXFeDwVSL2GgWnAGvrxoybL2y0rvt WTp2JwGx5jWy3KL4UyM45aOJMhpoYhOkOxjkPNa0q7Oh8QrEJ6aYK62TJ5P59rQmC7c+th HIhmVA7F4v8civhkCZDNAm3/U6KmJtMCHDLdhnUUHRzUqsldZScHYD2dEIXWVy125YvoV4 FqXmtsYDOl/vGlxAtOPunBLcKx+kOhgsOIUCjPPleMfTSb8bhOKJtQsSoRIeag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761115861; a=rsa-sha256; cv=none; b=DVwBeDdv4a213SMXtRzxuKV3IjfTTy0ZHlvWyKnGbN66BxB07bc63+UyNwEkZ3A+CGBexT jcERAqqiT9zFvUbIgdZiOQheI2v/Z3ykw5ETqXi3w1CtiLPXOMNUqGkyysjRn9FbHUwSG9 BYjd5mWn3bB46DWG0TwPMzX0kFZsK0SCf65Yy/ujKOllii/vZFc7ZfyP9PvMGWZsPfhcc+ g3SjlHD/9LUNkiMAPT5IWvkh9Eq4SlBRxIv5teQnVX4WXFhJkx/1sKZ/Z0rSS+VbpgOc2P Gc4LgTVBCj32VkP5QK8WvV6QnxgpSymj6f4fG5U6nzUj4H5N1bt96P8m++Rmdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs0Dj0hFvz34j; Wed, 22 Oct 2025 06:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59M6p07D010169; Wed, 22 Oct 2025 06:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M6p0BY010166; Wed, 22 Oct 2025 06:51:00 GMT (envelope-from git) Date: Wed, 22 Oct 2025 06:51:00 GMT Message-Id: <202510220651.59M6p0BY010166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 962194df8333 - stable/15 - vmimage.subr: Fix when/where we fix up METALOG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 962194df8333124876a25926244864bd5d2d26d7 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=962194df8333124876a25926244864bd5d2d26d7 commit 962194df8333124876a25926244864bd5d2d26d7 Author: Colin Percival AuthorDate: 2025-10-19 00:27:07 +0000 Commit: Colin Percival CommitDate: 2025-10-22 06:50:48 +0000 vmimage.subr: Fix when/where we fix up METALOG We only need to check for unMETALOGed directories and sort the METALOG file if we're using it, i.e. if we're doing a NO_ROOT build. This non-NO_ROOT builds by no longer bogusly writing to /METALOG*. We only need to add databases (spwd.db etc) to METALOG if we're doing a pkgbase-enabled NO_ROOT build; but we should always do this before creating the filesystem, not only if we installed extra packages (in vm_extra_install_packages, where that code was erroneously placed). This fixes non-cloud VM images, which in 15.0-BETA2 shipped without password databases. Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53194 (cherry picked from commit 012014403bdcb2b3aa7ed3895079a0059204c35f) --- release/tools/vmimage.subr | 66 ++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 842a808c623e..99e1936296e1 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -213,16 +213,6 @@ vm_extra_install_packages() { install -y -r ${PKG_REPO_NAME} $pkg done metalog_add_data ./var/db/pkg/local.sqlite - - # Add some database files which are created by pkg triggers; - # at some point in the future the tools which create these - # files should probably learn how to record them in METALOG - # (which would simplify no-root installworld as well). - metalog_add_data ./etc/login.conf.db - metalog_add_data ./etc/passwd - metalog_add_data ./etc/pwd.db - metalog_add_data ./etc/spwd.db 600 - metalog_add_data ./var/db/services.db else if [ -n "${WITHOUT_QEMU}" ]; then return 0 @@ -290,28 +280,42 @@ buildfs() { cat ${DESTDIR}/METALOG.pkg >> ${DESTDIR}/METALOG fi - # Check for any directories in the staging tree which weren't - # recorded in METALOG, and record them now. This is a quick hack - # to avoid creating unusable VM images and should go away once - # the bugs which produce such unlogged directories are gone. - grep type=dir ${DESTDIR}/METALOG | - cut -f 1 -d ' ' | - sort -u > ${DESTDIR}/METALOG.dirs - ( cd ${DESTDIR} && find . -type d ) | - sort | - comm -23 - ${DESTDIR}/METALOG.dirs > ${DESTDIR}/METALOG.missingdirs - if [ -s ${DESTDIR}/METALOG.missingdirs ]; then - echo "WARNING: Directories exist but were not in METALOG" - cat ${DESTDIR}/METALOG.missingdirs + if [ -n "${NO_ROOT}" ]; then + # Check for any directories in the staging tree which weren't + # recorded in METALOG, and record them now. This is a quick hack + # to avoid creating unusable VM images and should go away once + # the bugs which produce such unlogged directories are gone. + grep type=dir ${DESTDIR}/METALOG | + cut -f 1 -d ' ' | + sort -u > ${DESTDIR}/METALOG.dirs + ( cd ${DESTDIR} && find . -type d ) | + sort | + comm -23 - ${DESTDIR}/METALOG.dirs > ${DESTDIR}/METALOG.missingdirs + if [ -s ${DESTDIR}/METALOG.missingdirs ]; then + echo "WARNING: Directories exist but were not in METALOG" + cat ${DESTDIR}/METALOG.missingdirs + fi + while read DIR; do + metalog_add_data ${DIR} + done < ${DESTDIR}/METALOG.missingdirs + + if [ -z "${NOPKGBASE}" ]; then + # Add some database files which are created by pkg triggers; + # at some point in the future the tools which create these + # files should probably learn how to record them in METALOG + # (which would simplify no-root installworld as well). + metalog_add_data ./etc/login.conf.db + metalog_add_data ./etc/passwd + metalog_add_data ./etc/pwd.db + metalog_add_data ./etc/spwd.db 600 + metalog_add_data ./var/db/services.db + fi + + # Sort METALOG file; makefs produces directories with 000 permissions + # if their contents are seen before the directories themselves. + env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted + mv ${DESTDIR}/METALOG.sorted ${DESTDIR}/METALOG fi - while read DIR; do - metalog_add_data ${DIR} - done < ${DESTDIR}/METALOG.missingdirs - - # Sort METALOG file; makefs produces directories with 000 permissions - # if their contents are seen before the directories themselves. - env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted - mv ${DESTDIR}/METALOG.sorted ${DESTDIR}/METALOG case "${VMFS}" in ufs) From nobody Wed Oct 22 07:07:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs0bN5gXNz6DpBY; Wed, 22 Oct 2025 07:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs0bN3R6bz3F3d; Wed, 22 Oct 2025 07:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761116832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHWOmqlYzdgTNaJ4blZdF8gxSNIEe5hTVfVbpQfZeao=; b=DmWr6Hc3J+q3TonTMuaF/NAruF3LFEsUGf9PoE8304N2ANBynuf7pNjvVbGRgrMw3VNrdp cYDJ4KTQlrFOobc+O723ftWfXCXaHWfX7B364P9TeWPU04Yw4iw9fEn4nEqi0ItlU5S6C1 Ta60bH1bFsfoPJgOfC7ogIM9bXTPtyndKjOT6o9IiqLSZhaw9D1Y3ufMV5AyUR0APUZIK3 VCGQCwRBggJlj/6rEI3ltj/wPE0wclcUxYuFNRx7tFlsvYJvVWyxuGH2M2nJc19Sc8BXm5 b3x03/rLFLzcnCkbFGd84d2JCUxDOlC/OaE+pCzkR3vMGXmmEyZl0mRI6o3EKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761116832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHWOmqlYzdgTNaJ4blZdF8gxSNIEe5hTVfVbpQfZeao=; b=NwS1rF28z7fnlLCfFGLVl/UWAfPW0fmUhGo8VP1m4nGIV1Yuu4XSrJMu9E6rXSp9OwpKvT 117yMCDvy1+IbDM4fSPi4rkkt7qWCioArPGx1W657kl+5+E+MGRELDAJKE9O7qIsodC07f HbpUcudv1YFXQ65AgXAYR5fHzlLVvRhSLHd2JwOR4SlvuzUtHqYfaR0Xk9pgnA1dvxA4Sq OHZZloj2ybKb/j/pFy8MyFvlBoj5b8wsPmMPbwXr6DaDyRxkE1U2mbSDR6yAlRCDwJzVej 0tjVMj6ZXDPTU7tUIT/FAlsVknx4mVOVJLTvGAmKNQyd7fOQki1nGueQ0WJsCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761116832; a=rsa-sha256; cv=none; b=rtbBIlQzHaTbGI/TJr5zRdVvTCCtjrEv4dkXnpirX5X/qSLdGyIPDkQTOsGYAylUYzBf9m W2usy5Cp4iwsjPSxbGsgLv5GHnftMwdBBNLt1xgpJZmL7OquJi+4+evUrkgkcUs1nFW4+N 2ltmSXAFQCWXEHCOOj8T9DNCCoSAObmRvj58t0L0z8hvSpt5vwyJcWNnkTnMZm6Tecf4RZ 3RUiEhLMp3zsrUaEMOHGgpiSj53tXZvMLrpTDXft5VQ7gdo8Ump6Gd1MSGVg2bNHQNjnIg RFPmG2h/qNqfzSXYeUgfqPqx0Mv6n/FsPuZlbQok4SbxZ4Mez19pAFUkqnaQyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs0bN2pFlz3nP; Wed, 22 Oct 2025 07:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59M77C9K038504; Wed, 22 Oct 2025 07:07:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M77CHp038501; Wed, 22 Oct 2025 07:07:12 GMT (envelope-from git) Date: Wed, 22 Oct 2025 07:07:12 GMT Message-Id: <202510220707.59M77CHp038501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 3a12982962ce - main - random: add RDSEED as a provably unique entropy source List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a12982962ce330c37c154bb2eb8ae0539fc6f48 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=3a12982962ce330c37c154bb2eb8ae0539fc6f48 commit 3a12982962ce330c37c154bb2eb8ae0539fc6f48 Author: David E. O'Brien AuthorDate: 2025-10-17 03:20:23 +0000 Commit: David E. O'Brien CommitDate: 2025-10-22 06:59:59 +0000 random: add RDSEED as a provably unique entropy source NIST SP800-90B allows for only a single entropy source to be claimed in a FIPS-140-3 certificate. In addition, only hardware sources that have a NIST Entropy Source Validation (ESV) certificate, backed by a SP800-90B Entropy Assessment Report, are usable. Intel has obtained ESV certificates for several of their processors, so RDSEED is a FIPS-140-3 suitable entropy source. However, even though RDRAND is seeded by RDSEED internally, RDRAND would need a RBG certificate and CAVP testing run on the DRBG in order to use it for FIPS-140-3 (SP800-90B) purposes. So we need to know down in the CSPRNG-subsystem which source the entropy came from. In light of the potential issues surrounding AMD Zen 5 CPU's RDSEED implementation[*], allow RDSEED to be disabled in loader.conf. [*] https://www.phoronix.com/news/AMD-EPYC-Turin-RDSEED-Bug Reviewed by: cem MFC after: 3 days Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53150 --- sys/conf/files.x86 | 1 + sys/dev/random/ivy.c | 69 +++++----------- sys/dev/random/random_harvestq.c | 1 + sys/dev/random/rdseed.c | 169 +++++++++++++++++++++++++++++++++++++++ sys/modules/Makefile | 2 + sys/modules/rdrand_rng/Makefile | 5 -- sys/modules/rdseed_rng/Makefile | 9 +++ sys/sys/random.h | 1 + 8 files changed, 202 insertions(+), 55 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 953da7dd1284..21a1b8046f12 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -311,6 +311,7 @@ dev/ntb/test/ntb_tool.c optional ntb_tool dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional rdrand_rng !random_loadable dev/random/nehemiah.c optional padlock_rng !random_loadable +dev/random/rdseed.c optional rdrand_rng !random_loadable dev/qat_c2xxx/qat.c optional qat_c2xxx dev/qat_c2xxx/qat_ae.c optional qat_c2xxx dev/qat_c2xxx/qat_c2xxx.c optional qat_c2xxx diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c index fa1e4831f1b9..3eb0f261e6dc 100644 --- a/sys/dev/random/ivy.c +++ b/sys/dev/random/ivy.c @@ -1,6 +1,6 @@ /*- + * Copyright (c) 2013, 2025, David E. O'Brien * Copyright (c) 2013 The FreeBSD Foundation - * Copyright (c) 2013 David E. O'Brien * Copyright (c) 2012 Konstantin Belousov * All rights reserved. * @@ -48,7 +48,6 @@ #define RETRY_COUNT 10 -static bool has_rdrand, has_rdseed; static u_int random_ivy_read(void *, u_int); static const struct random_source random_ivy = { @@ -57,13 +56,7 @@ static const struct random_source random_ivy = { .rs_read = random_ivy_read }; -SYSCTL_NODE(_kern_random, OID_AUTO, rdrand, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "rdrand (ivy) entropy source"); static bool acquire_independent_seed_samples = false; -SYSCTL_BOOL(_kern_random_rdrand, OID_AUTO, rdrand_independent_seed, - CTLFLAG_RWTUN, &acquire_independent_seed_samples, 0, - "If non-zero, use more expensive and slow, but safer, seeded samples " - "where RDSEED is not present."); static bool x86_rdrand_store(u_long *buf) @@ -99,45 +92,6 @@ x86_rdrand_store(u_long *buf) return (true); } -static bool -x86_rdseed_store(u_long *buf) -{ - u_long rndval; - int retry; - - retry = RETRY_COUNT; - __asm __volatile( - "1:\n\t" - "rdseed %1\n\t" /* read randomness into rndval */ - "jc 2f\n\t" /* CF is set on success, exit retry loop */ - "dec %0\n\t" /* otherwise, retry-- */ - "jne 1b\n\t" /* and loop if retries are not exhausted */ - "2:" - : "+r" (retry), "=r" (rndval) : : "cc"); - *buf = rndval; - return (retry != 0); -} - -static bool -x86_unimpl_store(u_long *buf __unused) -{ - - panic("%s called", __func__); -} - -DEFINE_IFUNC(static, bool, x86_rng_store, (u_long *buf)) -{ - has_rdrand = (cpu_feature2 & CPUID2_RDRAND); - has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); - - if (has_rdseed) - return (x86_rdseed_store); - else if (has_rdrand) - return (x86_rdrand_store); - else - return (x86_unimpl_store); -} - /* It is required that buf length is a multiple of sizeof(u_long). */ static u_int random_ivy_read(void *buf, u_int c) @@ -148,7 +102,7 @@ random_ivy_read(void *buf, u_int c) KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); b = buf; for (count = c; count > 0; count -= sizeof(*b)) { - if (!x86_rng_store(&rndval)) + if (!x86_rdrand_store(&rndval)) break; *b++ = rndval; } @@ -158,18 +112,33 @@ random_ivy_read(void *buf, u_int c) static int rdrand_modevent(module_t mod, int type, void *unused) { + struct sysctl_ctx_list ctx; + struct sysctl_oid *o; + bool has_rdrand, has_rdseed; int error = 0; + has_rdrand = (cpu_feature2 & CPUID2_RDRAND); + has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); + switch (type) { case MOD_LOAD: - if (has_rdrand || has_rdseed) { + if (has_rdrand && !has_rdseed) { + sysctl_ctx_init(&ctx); + o = SYSCTL_ADD_NODE(&ctx, SYSCTL_STATIC_CHILDREN(_kern_random), + OID_AUTO, "rdrand", CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "rdrand (ivy) entropy source"); + SYSCTL_ADD_BOOL(&ctx, SYSCTL_CHILDREN(o), OID_AUTO, + "rdrand_independent_seed", CTLFLAG_RDTUN, + &acquire_independent_seed_samples, 0, + "If non-zero, use more expensive and slow, but safer, seeded samples " + "where RDSEED is not present."); random_source_register(&random_ivy); printf("random: fast provider: \"%s\"\n", random_ivy.rs_ident); } break; case MOD_UNLOAD: - if (has_rdrand || has_rdseed) + if (has_rdrand && !has_rdseed) random_source_deregister(&random_ivy); break; diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 2d7af254c52c..96676e8694bf 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -666,6 +666,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", + [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", [RANDOM_PURE_RNDTEST] = "PURE_RNDTEST", [RANDOM_PURE_VIRTIO] = "PURE_VIRTIO", diff --git a/sys/dev/random/rdseed.c b/sys/dev/random/rdseed.c new file mode 100644 index 000000000000..af084aab4ed9 --- /dev/null +++ b/sys/dev/random/rdseed.c @@ -0,0 +1,169 @@ +/*- + * Copyright (c) 2013, 2025, David E. O'Brien + * Copyright (c) 2013 The FreeBSD Foundation + * Copyright (c) 2012 Konstantin Belousov + * All rights reserved. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#define RETRY_COUNT 10 + +static u_int random_rdseed_read(void *, u_int); + +static struct random_source random_rdseed = { + .rs_ident = "Intel Secure Key Seed", + .rs_source = RANDOM_PURE_RDSEED, + .rs_read = random_rdseed_read +}; + +SYSCTL_NODE(_kern_random, OID_AUTO, rdseed, CTLFLAG_RW, 0, + "rdseed (x86) entropy source"); +/* XXX: kern.random.rdseed.enabled=0 also disables RDRAND */ +static bool enabled = true; +SYSCTL_BOOL(_kern_random_rdseed, OID_AUTO, enabled, CTLFLAG_RDTUN, &enabled, 0, + "If zero, disable the use of RDSEED."); + +static bool +x86_rdseed_store(u_long *buf) +{ + u_long rndval; + int retry; + + retry = RETRY_COUNT; + __asm __volatile( + "1:\n\t" + "rdseed %1\n\t" /* read randomness into rndval */ + "jc 2f\n\t" /* CF is set on success, exit retry loop */ + "dec %0\n\t" /* otherwise, retry-- */ + "jne 1b\n\t" /* and loop if retries are not exhausted */ + "2:" + : "+r" (retry), "=r" (rndval) : : "cc"); + *buf = rndval; + return (retry != 0); +} + +/* It is required that buf length is a multiple of sizeof(u_long). */ +static u_int +random_rdseed_read(void *buf, u_int c) +{ + u_long *b, rndval; + u_int count; + + KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); + b = buf; + for (count = c; count > 0; count -= sizeof(*b)) { + if (!x86_rdseed_store(&rndval)) + break; + *b++ = rndval; + } + return (c - count); +} + +static int +rdseed_modevent(module_t mod, int type, void *unused) +{ + bool has_rdseed; + int error = 0; + + has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); + + switch (type) { + case MOD_LOAD: + if (has_rdseed && enabled) { + random_source_register(&random_rdseed); + printf("random: fast provider: \"%s\"\n", random_rdseed.rs_ident); + } + break; + + case MOD_UNLOAD: + if (has_rdseed) + random_source_deregister(&random_rdseed); + break; + + case MOD_SHUTDOWN: + break; + + default: + error = EOPNOTSUPP; + break; + + } + + return (error); +} + +static moduledata_t rdseed_mod = { + "rdseed", + rdseed_modevent, + 0 +}; + +DECLARE_MODULE(rdseed, rdseed_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH); +MODULE_VERSION(rdseed, 1); +MODULE_DEPEND(rdseed, random_harvestq, 1, 1, 1); + +/* + * Intel's RDSEED Entropy Assessment Report min-entropy claim is 0.6 Shannons + * per bit of data output. Rrefer to the following Entropy Source Validation + * (ESV) certificates: + * + * E#87: Junos OS Physical Entropy Source - Broadwell EP 10-Core Die + * Broadwell-EP-10 FCLGA2011 Intel(R) Xeon(R) E5-2620 V4 Processor + * https://csrc.nist.gov/projects/cryptographic-module-validation-program/entropy-validations/certificate/87 + * (URLs below omitted for brevity but follow same format.) + * + * E#121: Junos OS Physical Entropy Source - Intel Atom C3000 Series + * (Denverton) 16 Core Die with FCBGA1310 Package + * + * E#122: Junos OS Physical Entropy Source - Intel Xeon D-1500 Family + * (Broadwell) 8 Core Die with FCBGA1667 Package + * + * E#123: Junos OS Physical Entropy Source - Intel Xeon D-2100 Series + * (Skylake) 18 Core Die with FCBGA2518 Package + * + * E#141: Junos OS Physical Entropy Source - Intel Xeon D-10 Series + * (Ice Lake-D-10) Die with FCBGA2227 Package + * + * E#169: Junos OS Physical Entropy Source - Intel Xeon AWS-1000 v4 and + * E5 v4 (Broadwell EP) 15 Core Die with FCLGA2011 Package + */ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3086be864307..9bc743c0c6d1 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -347,6 +347,7 @@ SUBDIR= \ rc4 \ ${_rdma} \ ${_rdrand_rng} \ + ${_rdseed_rng} \ re \ rl \ ${_rockchip} \ @@ -820,6 +821,7 @@ _nvram= nvram _padlock= padlock _padlock_rng= padlock_rng _rdrand_rng= rdrand_rng +_rdseed_rng= rdseed_rng .endif _pchtherm = pchtherm _s3= s3 diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile index 7fa7a8bb8fb9..496fc863033f 100644 --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -6,9 +6,4 @@ SRCS+= bus_if.h device_if.h CFLAGS+= -I${SRCTOP}/sys -# ld.bfd doesn't support ifuncs invoked non-PIC -.if ${MACHINE_CPUARCH} == "i386" -CFLAGS.gcc= -fPIC -.endif - .include diff --git a/sys/modules/rdseed_rng/Makefile b/sys/modules/rdseed_rng/Makefile new file mode 100644 index 000000000000..6593505546dd --- /dev/null +++ b/sys/modules/rdseed_rng/Makefile @@ -0,0 +1,9 @@ +.PATH: ${SRCTOP}/sys/dev/random + +KMOD= rdseed_rng +SRCS= rdseed.c +SRCS+= bus_if.h device_if.h + +CFLAGS+= -I${SRCTOP}/sys + +.include diff --git a/sys/sys/random.h b/sys/sys/random.h index 2a68f0c99b6d..dca30dc8fde4 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -94,6 +94,7 @@ enum random_entropy_source { RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, + RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, RANDOM_PURE_RNDTEST, RANDOM_PURE_VIRTIO, From nobody Wed Oct 22 07:36:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs1FR6bQjz6DrJ1; Wed, 22 Oct 2025 07:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs1FR63DYz3HlD; Wed, 22 Oct 2025 07:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761118603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/387AhbtAqRReT+Y2+n4wDGyhn95MBtMlJFQQjfKwgQ=; b=BoxSocOcNH9NTLlbAblFdmymj3yy0iM4oLotV4HN/dcFYgL0Fsa1rdwoBPeUce3V9yHwGv TUtOsbvrujiqOrmG56BhDywec0GCTILoV8QDpp/ppld4mghdNW54DOGAmncXrecnPShdgf Tc60gUEdri1CiyRs5DMG3/LRtSpzmvRna/WN21QUcvXXwmrISiKxJSm7xkTEaWIt9o3qog LO2edMi5tqByNZ9oUvlvjYijZkcdpAKvKfIV5a53UIc1RiZOFEHeLXCfFnypMEmERLLWC2 4FwJ1FKeWq0NnkFRGxHNoPLpnVrQeYv8+uo/5fxyEpobdGLE77bF+wUlCsXcMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761118603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/387AhbtAqRReT+Y2+n4wDGyhn95MBtMlJFQQjfKwgQ=; b=yhlGV7OIMwBwPc80DTDWDImw2ch7p1xN6LrXGjF6kcpjeqB4p0U45r70Kmt+UcVtfOc1We sSvDyPwLEd7HClyaO2Jf+bpt+QaR3dpxWPQnJSPBCteKtDNu62ekSQXA4Q81DL2uBHDY+b siyQR623qts6+SSVJs2jPbi854HBxUkx8jztJ2nALbX46rOlQyZZdhrQYkT5YfY0EoIXH0 h+ZeSjIEWmLY41lPOLZk2EdskxM3RGQB4md/pjrwKAQQskSr5qq2qQj5+nNsJ9CHDaPXhr cwR0MwOF9ayyNL5NL541MVSkElMBLsLnlyKk5R+Ei4i39D1uPjkGanfEpwxHgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761118603; a=rsa-sha256; cv=none; b=tA9tW1IRij2x/QHf/XV2EGPyrioAN/dldcQglkaE1ZFRSfdPeYQjVdHlKCOYuWrILahVwk C7CBm+VHEcX8HJbv0sAYLRfahG3wYZEMgOWEuHUnYJt22anB+qfTmkphm7+HhjO5ObSp7h Tb7z6iXElkZ4111poXEfl2jktmIHF3GLP8hyzB2NU+yghA2oB0412UZb/C3SZHN2uPB9NK hzHWO1gG4cok/NG3VtwnXD/nE/zL7z07Sa5qHSvgMWuaNYXOqAS7cugfLxs6wPkK56b9XO HUYEZQqyM3WVGqqZWlfZSqAhsbfFEdpfqpAlvh5Hz3tIqwu8yO+3xfHKN59o6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs1FR5bbKz3m9; Wed, 22 Oct 2025 07:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59M7ahpl094546; Wed, 22 Oct 2025 07:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M7ahv9094543; Wed, 22 Oct 2025 07:36:43 GMT (envelope-from git) Date: Wed, 22 Oct 2025 07:36:43 GMT Message-Id: <202510220736.59M7ahv9094543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: daac364e6115 - main - tcp: fix typo in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: daac364e611532c7bfd4bb20f9fea8d365496aa1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=daac364e611532c7bfd4bb20f9fea8d365496aa1 commit daac364e611532c7bfd4bb20f9fea8d365496aa1 Author: Peter Lei AuthorDate: 2025-10-21 09:18:32 +0000 Commit: Michael Tuexen CommitDate: 2025-10-21 09:20:00 +0000 tcp: fix typo in comment Reviewed by: tuexen MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_syncache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index be20fb44a820..3cb538f7054d 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1168,7 +1168,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, /* * If listening socket requested TCP digests, check that * received ACK has signature and it is correct. - * If not, drop the ACK and leave sc entry in th cache, + * If not, drop the ACK and leave sc entry in the cache, * because SYN was received with correct signature. */ if (sc->sc_flags & SCF_SIGNATURE) { From nobody Wed Oct 22 08:17:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs2870hffz6Dtkp; Wed, 22 Oct 2025 08:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs2866v7Tz3LZj; Wed, 22 Oct 2025 08:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8zYRIvAC/MftKel7VOAZD1NwPhQXfCGHBYQBBYjaRfg=; b=iqmDPZZRMhEPBtaO0F4aPR2X2oynSNFdH4jj/YGlVIHNx7pRt3U8+FRGfSa1mg+NEWCCWK R1vxW+FGywj7AwXgc0cpzlr+z6eQR0NG0BZBP99DAdp6W2553Ycd65znMecIpHeHUBFmBY EOVVhJBkI3HgKuf6p/6AkPZ35Xy7wUA6OAGSh+Y7rMUk7TodKymTU0qJiiLG0QYzppHp3m vGq7mza4Ve/MvvW/CtrK4Hwe56VstvjuAo9AuBhFxfAc6r6EvqG+4WDqMHoxZdsrQ2KiT5 RdDjDvRJbLiguo2iNjFxc4qYZb8w5eeoOYyPZQQIfHiP97UqpbttikHIqb9hvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8zYRIvAC/MftKel7VOAZD1NwPhQXfCGHBYQBBYjaRfg=; b=l3rVjQO51xGoBp2pxMTysL9SCT9XSCwvR3UeYkNgD9XvS2YIOtrcM+xWELP0hOTfJFmknA p8FGC5zdCksTJCF0Y4FCwctIOYyq70EYZ95ji7UuSk/EmtGDEn9QEAiIK2z7chiW5TB4wP +zUtX7CLeEq2jLtgcAXaq4Ph8ZY6ILjW6rWgJBA1MT2zw+O2HF5GUUfrnVIP4lPa1QDkVC HEc10aIjCJW2GIitO6iIcNtM6YmdjXIemSfs4FHsMKGQDnBoraltJYIQVHrjdhpPm3vIau Dh1Oh6XuXVHF46BqfaxJD37Xjkv/SE9CRptamxAuxr6/te+3Z7hTZ5/AeU5spQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761121031; a=rsa-sha256; cv=none; b=Qqx+b1X3cdWEaDgoTJEuLzSvInM//H8nb8RgRkLUiexL+eby18E3JvUE0tDEROmgtrVZdh MB5w5Dzru6hQincoCZNoes3lQZDx/PHYRObGIVEE9LiFwdOp/Hy6ugPAa0IjN8sfg+YeSz mcEIPSaANB63Hm3XpToA3urTN7NAX6ulkFr8C9vxsd4Q1t3pG5m7knpISj4eua/o8Q6fFY Vaxrddvtn9shngIhPGJoK/oBVWGC8h1Aimq0zZA7TY7JdePD68DUimkTu28TDm2XXmQvHg QTfonq0Go8LY99Es7wTs4o6CxkZSwkQyEhojHSCVAYyZAn23x+TqV6G5/In/nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs28667kTz5QK; Wed, 22 Oct 2025 08:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59M8HA5S070211; Wed, 22 Oct 2025 08:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M8HA8k070208; Wed, 22 Oct 2025 08:17:10 GMT (envelope-from git) Date: Wed, 22 Oct 2025 08:17:10 GMT Message-Id: <202510220817.59M8HA8k070208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: e27e5b6b0177 - releng/15.0 - release: split up Oracle Cloudware tools List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e27e5b6b017734f65b7be0b503eb6aeac235fbf2 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=e27e5b6b017734f65b7be0b503eb6aeac235fbf2 commit e27e5b6b017734f65b7be0b503eb6aeac235fbf2 Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-22 08:17:01 +0000 release: split up Oracle Cloudware tools Sometimes one or the other but not both tools are present; this ensures that all cases are correctly handled. Reported by: cperciva Approved by: cperciva (re) Sponsored by: SkunkWerks, GmbH Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53186 MFC after: 2 days (cherry picked from commit 81d807a90611a4980cae843b404d99c27edc1893) --- release/Makefile.oracle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/release/Makefile.oracle b/release/Makefile.oracle index 3573f29b96c1..6d792cc9fd30 100644 --- a/release/Makefile.oracle +++ b/release/Makefile.oracle @@ -24,21 +24,28 @@ # Syncing to all sites should take 2-3 hours after this final step. ORACLE_BASENAME= ${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/} -ORACLE_PORTS_LIST= ftp/curl emulators/qemu@tools CLEANFILES+= cw-oracle-portinstall cw-oracle-portinstall: .PHONY -.if !exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img) -. if !exists(${PORTSDIR}/Makefile) -. if !exists(/usr/local/sbin/pkg-static) +.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile) +. if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf -. endif - env ASSUME_ALWAYS_YES=yes pkg install -y ${ORACLE_PORTS_LIST} +. endif +.endif +.if !exists(/usr/local/bin/curl) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl . else env UNAME_r=${UNAME_r} make -C \ ${PORTSDIR}/ftp/curl \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean +. endif +.endif +.if !exists(/usr/local/bin/qemu-img) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools +. else env UNAME_r=${UNAME_r} FLAVOR=tools make -C \ ${PORTSDIR}/emulators/qemu \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ From nobody Wed Oct 22 08:25:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs2KF09vwz6DtwR; Wed, 22 Oct 2025 08:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs2KD6mBcz3MrX; Wed, 22 Oct 2025 08:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cQQOrUY+eihlwBl6pFzDQTx7Dt6WNTjCj6+GPwU6hQ=; b=BMySUqYzEzswMcSXbwGPRqv3JYu7Q059TiBEjPYn18PS2lbKFFThx7E1JlPSxoR4wtvk4W agNNkaWiwT1HRr2N/0I+1e7sAj+vOE0LUF9UyFnnOgH2dDgNsEdqz1lC73rREk+Oy5ivM1 Ch+PEs0JmncI29EyLWYeupSGOutQUa6/9ABATB1SS/a51h3Al4Ftrm2Oao5/64cTzjqCZ5 FOaO2HR4V9gIUMDKXZXecRN4JXzWJ/uxmbFGCCO5WSL9CNasAzzD9ULA4j1god7lImEpFS 8xutKcYAbV8whGeWPfQi8o86UcOA6gOFbS01wqS9rqmTX98huJ8OOBqoRJoChw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761121504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cQQOrUY+eihlwBl6pFzDQTx7Dt6WNTjCj6+GPwU6hQ=; b=EtAdcinMVDCC7sy2r7wZPkod36iC1bpjpf45S6QuO+ZEE4pWYjVQ4LSRZZiOvOFXIgM41O fAFORWZJJUZDEUgtz6VnGqD7NYNzLn1QrDW1fIaJqA+XHQG21vonmw6SVLhSg2MjBxl3g2 b5MK5Ry4KodOehKV7fDNx5bYIRbaHeWTgurp9p/zLDU1YFogDki2jM/QEx6gJ5HSEu1bKX oqOMpL5hXW2WD5Rogl0KVZewDJbrHDP5CY9jTud8MyqYtw9H0cm7VQbZ7lhKqsNov9plG8 gbCQoSU5+2O1w4TNj6m6cniXnr/1RECQ6mY7IRSc9eKfuWTXzKPJki/30sdqfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761121504; a=rsa-sha256; cv=none; b=qMXbtzWiZqJzR9cLyam+E2hhATPEKGXBLtYT7tLA9/Rq+thUeTIjRZ+3EI5nRkRqWYCTyB 3eshAy2MKYzLGxl5rtYx7e6TMpjFuzZCvW5WW2vKAqkDxq++h5F1tYnbsdy+9NB5aiBQh5 aoLPpZJ6Fxtb8zh2NSm6Y01FXBedGrHqvJKsb95ooEX3Nsr0m9EY/SgCdd0nkYj5eBHAPY QwUkyhXn/FuS2nv6jRtL0ZrYNZKR6Xy8+RIzg0OVG5ZUhMEYmEV+7/vtPisIJTFn+S5NmK hX2WKC1z4VNwu3b07ymQKNXSSJ6jh/lhz0NbmT4DMmW40DULeDq/HnmjyyN2Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs2KD6N7Xz5kG; Wed, 22 Oct 2025 08:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59M8P4Qp088326; Wed, 22 Oct 2025 08:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M8P4dC088323; Wed, 22 Oct 2025 08:25:04 GMT (envelope-from git) Date: Wed, 22 Oct 2025 08:25:04 GMT Message-Id: <202510220825.59M8P4dC088323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: b6cde3ca5dbf - stable/15 - release: split up Oracle Cloudware tools List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d Auto-Submitted: auto-generated The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d commit b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-22 08:17:48 +0000 release: split up Oracle Cloudware tools Sometimes one or the other but not both tools are present; this ensures that all cases are correctly handled. Reported by: cperciva Approved by: cperciva (re) Sponsored by: SkunkWerks, GmbH Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53186 MFC after: 2 days (cherry picked from commit 81d807a90611a4980cae843b404d99c27edc1893) --- release/Makefile.oracle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/release/Makefile.oracle b/release/Makefile.oracle index 3573f29b96c1..6d792cc9fd30 100644 --- a/release/Makefile.oracle +++ b/release/Makefile.oracle @@ -24,21 +24,28 @@ # Syncing to all sites should take 2-3 hours after this final step. ORACLE_BASENAME= ${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/} -ORACLE_PORTS_LIST= ftp/curl emulators/qemu@tools CLEANFILES+= cw-oracle-portinstall cw-oracle-portinstall: .PHONY -.if !exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img) -. if !exists(${PORTSDIR}/Makefile) -. if !exists(/usr/local/sbin/pkg-static) +.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile) +. if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf -. endif - env ASSUME_ALWAYS_YES=yes pkg install -y ${ORACLE_PORTS_LIST} +. endif +.endif +.if !exists(/usr/local/bin/curl) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl . else env UNAME_r=${UNAME_r} make -C \ ${PORTSDIR}/ftp/curl \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean +. endif +.endif +.if !exists(/usr/local/bin/qemu-img) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools +. else env UNAME_r=${UNAME_r} FLAVOR=tools make -C \ ${PORTSDIR}/emulators/qemu \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ From nobody Wed Oct 22 11:51:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs6vT3xRjz6F98W; Wed, 22 Oct 2025 11:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs6vT3CxWz3dX0; Wed, 22 Oct 2025 11:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxuNO9vH7bdkMw4CJVOokWG3kE/da2c2MtzBG30faac=; b=gL4GoBq/dHcb8jbOfxoAZ5FezgwgMDTRJ76kcm819q6K2Wxy31KU4I7OV/rRxMO3bCYXW9 vASQ2e2IGe5XFTd0TW2MIpR4qKK+Uf+Uh5I1Q1pMaAkk3KpzE9pJC6Zx6JP99UzoP8DxgY SMdtgWUPrAL+ySJLDpzWfu3318udzm5MJFM+hBGNngn2SKpWvErDX7QXR0qwSllXmmiCcW eirr2/J2PxhBQfPf/SOe8wMnKuwQhDSknSG6kWKrc+yzIlgvDMjP8naAjYS253y0CXKS7S 7WhmZTIm0uH7r+38ctaIvYePXg3Iv5sedPnifatOrbY2aEkzbrHtp9jX9s1XTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxuNO9vH7bdkMw4CJVOokWG3kE/da2c2MtzBG30faac=; b=HV+fntSAVlmsYiEvPuaHpF5AV4PsdpWstTVlRoRJBlfPr/anJzbi0inR84XwFJtpEsNN36 84bw+JDgDNLSDqLv0sMZrpX1DHtKzI+jgmddTE6UB9kwdb3j8hMxmu+Mwg3kmRX3gu2dN5 bQuPxlhNDbrWT6uaFo9IUZpq4ZVyD8qyOA4u2TctBLhlS8Zx0AzYD828UMZObC47eESfYY fLk6XTvqi6TabSqm4i2se4zfEOISA81CU5zb0WO9aFHg4pBS2ei4xumeU6QaMgK+Q42Rny MN8VX9gFmpNwSEXfuBrzlbL1vUnC7CJSKDaXdU5/vgDtyXGiECrcAo8msUSIzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761133893; a=rsa-sha256; cv=none; b=S4HTT9LIlYsmrR9bkm4oiWBM9p4ZnL76f4ucZZPIVWz5wIJt65eTQZIdOVtkwFv/KRS41v pcpPLRTbSyqnR7hAg+nYyWSpjQ7oUvlUohb0OxppCTBxUvaWmDHC5ihK0/6l2phWxFftyv wxl1x67l548BDZn5FwtzS5tEhR9bh6svwUdeWpoax2d0ZhaE6JGl+y0Jyq84HNbGFg/XWl grbW6BwMyuk91dCc9Lrcvk+aqdY31MhD4u7x74MCVf55apCcKzSc84L3fI5JGrRZHxqQw3 24PHU4a0nwnIzUGpsxle2jhJ+LWs0PgVK7vu9L1mRjNHIW60F1U/mulDzPWDgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs6vT2mJgzCNg; Wed, 22 Oct 2025 11:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBpXdx075890; Wed, 22 Oct 2025 11:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBpXKT075887; Wed, 22 Oct 2025 11:51:33 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:51:33 GMT Message-Id: <202510221151.59MBpXKT075887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 70b34fbdbea1 - main - sndctl(8): Modify vchans only on supported directions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 70b34fbdbea13c006a724844caa53f59e0e53bd0 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=70b34fbdbea13c006a724844caa53f59e0e53bd0 commit 70b34fbdbea13c006a724844caa53f59e0e53bd0 Author: Christos Margiolis AuthorDate: 2025-10-22 11:50:55 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 11:50:55 +0000 sndctl(8): Modify vchans only on supported directions Currently mod_play_vchans() and mod_rec_vchans() run unconditionally, even if the direction (playback, recording) is not supported by the device. This results in the "autoconv" (see mod_autoconv()) control failing when run on simplex devices, because we'll be trying to modify vchans on an unsupported direction. Test whether the direction is supported and silently move on if it isn't. Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53233 --- usr.sbin/sndctl/sndctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 156c845481c5..6977f0ab0ebe 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -830,6 +830,8 @@ mod_play_vchans(struct snd_dev *dp, void *arg) if (dp->from_user) return (-1); + if (!dp->play.pchans) + return (0); snprintf(buf, sizeof(buf), "dev.pcm.%d.play.vchans", dp->unit); @@ -873,6 +875,8 @@ mod_rec_vchans(struct snd_dev *dp, void *arg) if (dp->from_user) return (-1); + if (!dp->rec.pchans) + return (0); snprintf(buf, sizeof(buf), "dev.pcm.%d.rec.vchans", dp->unit); From nobody Wed Oct 22 11:51:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs6vV5Npsz6F92F; Wed, 22 Oct 2025 11:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs6vV4Z1vz3f0j; Wed, 22 Oct 2025 11:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY9qaqM0nfbiRxa9lmdLCBkbZ1GVPDpDDzUnsEi/RSA=; b=wqhjTRP65VKZnTpUVaQfnqIV0V9m003AI4glYWtY4iBeVkt9DH3c387DAEuYhT+R+dXp3r VQNuQSpGLN6GcANa20hNNNJWl82evjGrutXfuO5TkMclBeeqIFebUhd+9fogVBg6KvS4WN VYxrcjVUDEA+HfA9b4c763IgSnC31+drC/bg5Mpij+RXdasLKsz4WwXOR84MVzYedN2AJC ISPqpAKdxOfnQYS+QBzc8pwNsiydgogCCn2df0QIdjk8Fnvll7S95pVAL/g68OTeQh+Z7Q 3iF6Ql8tR5kdadMCpA5GwTjxnzIAzfjP8nfKwDUjTdddRGYP4SaRU3SmIytH7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY9qaqM0nfbiRxa9lmdLCBkbZ1GVPDpDDzUnsEi/RSA=; b=dF0pxId9DhfYHs3tuX/4oGLIu6ktZHiKwbxJT5s48oWbUwhB07PTcZSDDFkM4I+EYFI9Cx 4TF2tmbi8EbuJ2N4Cwny/cdB1K5eBuzXPSzCHTvAH2m5+rn/om9v8iLwxm4NZd3qbhWsmA iYiFiyAIOL+TK3/4znZro+4TSavHLT1nHWaT15vXyeru+roIBaDSd7lmtPsEdj9g75gfQc SHBHHpkv7StlVL7Fk9wccDIbWSPe6+5oXlrMudrJCV89Q8wE5lNV7MqZd3uEygrpPJydG8 TZHhs3baRZjteI6VMxgamlcwnTphhH7mEariEH0LfVM+ngIkfh54qADIFl2ykA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761133894; a=rsa-sha256; cv=none; b=pZbOGatFu0ub7nbXhrzgYzGOoC5PwkMrIyVpIuODBWIAZwROEq7fXqPGCa3xXGqDaIlsQF ISacIkv8nCCi6YYaBhm11u9j56lnk5fYHe4jD1/s41rmGWHlRKddFAZU2FRFhB+j4hITiT PjJr4+kQICz/OkJmzKOTFWgZpUYsLeyJxn3XKxVLslTl7MBygVUs06Ls1X6IqKY7t2m/q3 +QP6y6RPZ//8kQS/K6lGvLwGEuVf2CKCU8UFCKEn0AbS7RxqHO5SCULCrvaU59e15bgCGX uHmXUqf/2B15Psqg265C/9uJpISEO+U2TUZKSWM99DZxOPVif3BiKoazG9R9ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs6vV41BxzBqs; Wed, 22 Oct 2025 11:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBpYtp075924; Wed, 22 Oct 2025 11:51:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBpYkF075921; Wed, 22 Oct 2025 11:51:34 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:51:34 GMT Message-Id: <202510221151.59MBpYkF075921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2693d6c7c9ca - main - snd_dummy: Create device alias List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2693d6c7c9cab28967de13233342fcf9281e5636 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2693d6c7c9cab28967de13233342fcf9281e5636 commit 2693d6c7c9cab28967de13233342fcf9281e5636 Author: Christos Margiolis AuthorDate: 2025-10-22 11:51:01 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 11:51:01 +0000 snd_dummy: Create device alias Sponsored by: The FreeBSD Foundation MFC after: 4 days Reviewed by: emaste, ziaee Differential Revision: https://reviews.freebsd.org/D53237 --- share/man/man4/snd_dummy.4 | 12 +++++++++++- sys/dev/sound/dummy.c | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/share/man/man4/snd_dummy.4 b/share/man/man4/snd_dummy.4 index 2b9d26d318ef..4ede8a806b6a 100644 --- a/share/man/man4/snd_dummy.4 +++ b/share/man/man4/snd_dummy.4 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 15, 2024 +.Dd October 22, 2025 .Dt SND_DUMMY 4 .Os .Sh NAME @@ -52,6 +52,16 @@ and one recording), as well as a mixer. .Pp Playback works by discarding all input, and recording by returning silence (zeros). +.Sh FILES +.Bl -tag -width "/dev/dsp.dummy" -compact +.It Pa /dev/dsp.dummy +Alias to the device's +.Pa /dev/dsp%d +file created by +.Xr sound 4 . +This makes it easy for tests to open the dummy devic when there are more +devices present in the system. +.El .Sh SEE ALSO .Xr sound 4 , .Xr loader.conf 5 , diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 4df5b112d3f4..1f2d69708eec 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -346,6 +346,12 @@ dummy_attach(device_t dev) return (ENXIO); mixer_init(dev, &dummy_mixer_class, sc); + /* + * Create an alias so that tests do not need to guess which one is the + * dummy device if there are more devices present in the system. + */ + make_dev_alias(sc->info.dsp_dev, "dsp.dummy"); + return (0); } From nobody Wed Oct 22 11:51:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs6vX1ndVz6F98c; Wed, 22 Oct 2025 11:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs6vW5sVVz3db6; Wed, 22 Oct 2025 11:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUUOZsq59HikM2DICjtUNofDAvAPOJDHrXMVsUfQ7TQ=; b=b3neXFd6FlZpf1kmZl06e7JV9t+yzwUSJ4SqDPQrB60pS+cM2c75/C41m53ButZn5vNcU/ u83nQ7WtSkKR3sWuRmjIvayh1ZAfFnmeMv2O6AUuMibim73Fubp/tFZ1K6qCChCZLkGRhO 9CZeu/83/1vB/znvVTa1w4FxZATG4g/N/YZepPSOLUZtd7rSwm5WqnEPn4dV8fpJxTJA2S v+l3S9SEY90SsetLoh9ZZmpVIsyjG4FvopqVc727GKVjGrV2dPjk7yRtBphX3r+MM6AINj uIYIufQaKxvWGZwdUrs27/3vY82YJuCEyH/6RbphP7waNOp6Npnpu+U8+RGn5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUUOZsq59HikM2DICjtUNofDAvAPOJDHrXMVsUfQ7TQ=; b=dnlLnioMxjv2EdMJBD0cmCSYiRvsw3NCvt0tJ6tb9Kw59yZeld8mRGx3HgjlyIWSTtkmQI ktEIcLoFYZ+2P8t1sePfNGzyrYMTfrGOaLlQYx7via1hAETMXMxuWTU4CWNRZ4w2VFpEAz 3bYl4CEHcsyVyxFzo3934hpSqVO83VYFpU+qSCBedo6EcDYdav6oDCQDan03OLL0P4tW0F mUABMuPxjbt/Uichj8FzkdKaLPf+UbE8rQgGRpPwkYh4XGIyxRHF7zqrMUgyVNWX8U+eCD rPvh4ecrUb5tpz5z2eprWrXq38BgcgW872oCU9fCFnYdU6ufbAYugCoDdKJ5VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761133895; a=rsa-sha256; cv=none; b=HoObbCfJj4Js9t8yJ4jAGq2Lcb7hK4Aftdjpfvoy3z6/MhprS/jYBIzmQ3XqLjAR9yDvPi /PJWOgHqwLP4sn2kCHN1Mym7qrRFs0oFsIDXHk1drCWbBpptfs7bTN3ciCh1jI8hJcubxJ ACVAqyTeiLjlu9JxOZZmVykvY1l5MGJuwIVXx+qF0OVm60RpN6bjDMINbm51mq9n4/8zyo 3jJUcYd6vL3Faw5QV7s8hUvr4/EBhBGHbOfw58CRWQuERfXBgpfjdGw6CJ+wBp5WM8bE+X 04fr4wQ4ZPMyw1Bl7zz/ksP3WtYmEPvw1jhk3iYW+u2SaYy1j3d7fnks4zTX0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs6vW4wmFzCNh; Wed, 22 Oct 2025 11:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBpZtY075958; Wed, 22 Oct 2025 11:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBpZ0j075955; Wed, 22 Oct 2025 11:51:35 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:51:35 GMT Message-Id: <202510221151.59MBpZ0j075955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d6432907f612 - main - snd_dummy.4: Use sound(4) instead of PCM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d6432907f6120ff4993de7352ca62f6986fb910c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d6432907f6120ff4993de7352ca62f6986fb910c commit d6432907f6120ff4993de7352ca62f6986fb910c Author: Christos Margiolis AuthorDate: 2025-10-22 11:51:15 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 11:51:15 +0000 snd_dummy.4: Use sound(4) instead of PCM Sponsored by: The FreeBSD Foundation MFC after: 4 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53257 --- share/man/man4/snd_dummy.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man4/snd_dummy.4 b/share/man/man4/snd_dummy.4 index 4ede8a806b6a..172b8ed70729 100644 --- a/share/man/man4/snd_dummy.4 +++ b/share/man/man4/snd_dummy.4 @@ -47,8 +47,9 @@ physical sound card. It is intended for testing, so that test programs do not need to rely on hardware being present in the machine in order to run. .Pp -The driver attaches as a regular PCM device, with two channels (one playback -and one recording), as well as a mixer. +The driver attaches as a regular +.Xr sound 4 +device, with two channels (one playback and one recording), as well as a mixer. .Pp Playback works by discarding all input, and recording by returning silence (zeros). From nobody Wed Oct 22 11:58:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs73N26KTz6F9wC; Wed, 22 Oct 2025 11:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs73N0RWgz3fpd; Wed, 22 Oct 2025 11:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U881iaFlBAuUZE1UhdwN1X6UVrtozYdR0ggJcd3ZvPE=; b=Yw0GRQi8gubL3CgX6AU2Es1j44zVbPm9QyZIHkeE9qQIrNcYnW8xSs6FvzD/cLx8yi1l4o nc8EeV/tP01++n1jxbPBqCYUPdybWHcvdVU76YP+e65itM1wRwH5pV4wvGUdY2NETNASrh jpiL1EIMV6o47V4bZK/enPsDDIWxjRtuKc53Z3jQNcCx3Bb03nUnA3TGJzr6wN9BBdDB58 7C1cmPoSQjI926A8VQxYEQzkHd5uSsej7fdP7IDX/E/Y2Qp+zE3EhyVkEI5ya3G7dtrhj4 OsFJWmNhnUuH+ADDk1Jn53xrypjXd20aSHkhxk3kN2DW+dtE4Ei1ry25fbdWUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U881iaFlBAuUZE1UhdwN1X6UVrtozYdR0ggJcd3ZvPE=; b=ZYpM5DOU1yczD4c209Aubm8RWMZ4dkouz5RfppP7VHjtWS0gqwNXgahv1rQpUTOWND2SDb DaUGndh2i+5NsMvJdYa5SPbEH3LOZV6FcYhsk9jD1r8LT6320/JIPlLevbtFdc4S67WwYb aKaOCtI7SQBKEX6d0JpVIC9DCTTf5n2u1cIRtPA7VOrK9N4bXb5+Yt0DsMdomVnHtT86yW v7CQnxY8IGhWWcRNqU1eEhEJMQ2hDFfbKcq1kNehQzjwQGVNeovk5A8w9IwHSWUuVjRAdh 4BzTbEVSejML/ZESwKJFc3p1425/mYwQbiXvFsR1NWKyOhxt3CPyCh2nR/ZRDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761134304; a=rsa-sha256; cv=none; b=rCeGF853CBy7YCel1D6T16UAHyEFn4/FVmOrglV0KBmp36D+HtFo/sUh0fmk3E2xUqQKTi UJt5wa0/F9C6SvhmJFCTHTPBsWXpTrvfwKNEPPW/w45/G+w0kNbnjljyMfYNsPV2+Qlo8M bBER7cn1m0bqJlApRZsIc3bsCk9GPCBsV+pxGzUkR6F/LyVSF0V/UQ95o/aSM/a20CZOWT waH8ktcQQTkQYyhru8PpNs6Tr5Yk/0bxIorEpgjWr9PxYbfpJNxhlEXFAiFdzk7Y7268q9 MoN7Na2RdhXQGv4LtMw2AWaSuspgsupbz9bXNxNDgK+PjTpqHueQW5yhn2kuKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs73M6yZtzC5X; Wed, 22 Oct 2025 11:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBwNw7084481; Wed, 22 Oct 2025 11:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBwNCK084477; Wed, 22 Oct 2025 11:58:23 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:58:23 GMT Message-Id: <202510221158.59MBwNCK084477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 0a53e6d8bc0b - main - kdb: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0a53e6d8bc0b3a6332e228993d040fbf38f652fb Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0a53e6d8bc0b3a6332e228993d040fbf38f652fb commit 0a53e6d8bc0b3a6332e228993d040fbf38f652fb Author: Gordon Bergling AuthorDate: 2025-10-22 11:57:57 +0000 Commit: Gordon Bergling CommitDate: 2025-10-22 11:57:57 +0000 kdb: Fix a typo in a source code comment - s/th/the/ MFC after: 3 days --- sys/kern/subr_kdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index 56264a96c9fa..909dd10a6e69 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -330,7 +330,7 @@ kdb_reboot(void) #define KEY_CRTLP 16 /* ^P */ #define KEY_CRTLR 18 /* ^R */ -/* States of th KDB "alternate break sequence" detecting state machine. */ +/* States of the KDB "alternate break sequence" detecting state machine. */ enum { KDB_ALT_BREAK_SEEN_NONE, KDB_ALT_BREAK_SEEN_CR, From nobody Wed Oct 22 11:59:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs74g3vjLz6F9yK; Wed, 22 Oct 2025 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs74g3CfNz3gKp; Wed, 22 Oct 2025 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yn1bEll4/+mU56wRU4ET9268/hOB6jsaC+mBz0AzXHQ=; b=jXZLRDuBb2KDE1ZdQEp2Tiba9rSbRA8EzJG3WaYZ1NWkHHEdfruOAyoShgYDSKZA8eqhpN JO0mSksLF8pmm7T81Lm1VdZ4UU5g3wp0SejDfcF3mIDJ3639OUj4uTlWs8LEfeJUQqoQjs nmsj2CmxODCbEStH4Y7GEyHf6LAzdX3aUPWqJZR57gt8+yAldgqfNcCjxyTdSVxxc0GSdd 7OmgiXeGEnnQHW/IyCLN8mSqfL1sE5K0Pi3NIOufrZ85CfSiX+hmPaTpsROlk1r6lALvF0 zDAbA7VghfCDB9ddmSALFrmCd6FHR3gqySK7TK5g9va36SzZosq4r+w+S6di/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yn1bEll4/+mU56wRU4ET9268/hOB6jsaC+mBz0AzXHQ=; b=izQZ4dYy1Q72IOI4T7nt2qRFJULs0uPd5oJqpvkA9b5NGax7zAl+5p9teBClOJaFpFpRz1 bZzTDm5PhgLv/BMXVHsQ23SywYEE3vP4uqpy9/0Gz8RyM0f/WMHy3Ny739rIadJu7kvnmg uaMug6V6oyHABl4N8QJ12PXmq4eLVpXlypOlgdxVkuyVMRsXc0pnJXelp0R85Av9ZEsejU iQtWHjhZNZRgkF65Hz5P3Ucy4Stv8tiOTz9gLdMYXctZF9wtYvk0BAkFK9rXBat+w/nlMO 5y7tTeIu9Y5OMEizhkNInpsQ14kkWLTwWz2CfJA9O1efI5tLduERvy/m/BLINQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761134371; a=rsa-sha256; cv=none; b=yCZlqRczRL+y8haRwGgjCjbQafcYK1HfSEF36fZk0Nco8weAZ3GZFKre58cCNRrRnPuuRA 29pdqpxzQjD9fzNlcM1aJfscHQOIxyN8tNV39kpw/6GqN4dDDht9hCkdJzMgVD8mKCSdk6 TA5zrMDv1pPvPp6udr4G7ElqYI+h8P/qhNe36m0AmUc2gDxEzBAExPAhGIgXBgJKRWG8i7 PMz5/4JTPsfwc6mNCXLRGplzH521oL4GS0ROqF91hWfLqnXvjE80NGnjwebLyh5WadPdDW WzLsAg1QxCar64U1wc2+fu1PIUJ8/OvU8UJNMHB4mTA0mOmbQCjezHR/Stnsdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs74g2cjgzC7g; Wed, 22 Oct 2025 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBxVPP084914; Wed, 22 Oct 2025 11:59:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBxV1Y084911; Wed, 22 Oct 2025 11:59:31 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:59:31 GMT Message-Id: <202510221159.59MBxV1Y084911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 2b2a4f02e087 - main - pmcstat(8): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2b2a4f02e0872065c63baec8bf0069e3b677def7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2b2a4f02e0872065c63baec8bf0069e3b677def7 commit 2b2a4f02e0872065c63baec8bf0069e3b677def7 Author: Gordon Bergling AuthorDate: 2025-10-22 11:59:13 +0000 Commit: Gordon Bergling CommitDate: 2025-10-22 11:59:13 +0000 pmcstat(8): Fix a typo in a source code comment - s/th/the/ MFC after: 3 days --- usr.sbin/pmcstat/pmcpl_callgraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c index ade99464a4a3..63684f800bdc 100644 --- a/usr.sbin/pmcstat/pmcpl_callgraph.c +++ b/usr.sbin/pmcstat/pmcpl_callgraph.c @@ -362,7 +362,7 @@ pmcpl_cg_process(struct pmcstat_process *pp, struct pmcstat_pmcrecord *pmcr, * - Find the function that overlaps the return address. * - If found: use the start address of the function. * If not found (say an object's symbol table is not present or - * is incomplete), round down to th gprof bucket granularity. + * is incomplete), round down to the gprof bucket granularity. * - Convert return virtual address to an offset in the image. * - Look for a child with the same {offset,image} tuple, * inserting one if needed. From nobody Wed Oct 22 12:28:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs7jn5fsjz6FCkx; Wed, 22 Oct 2025 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs7jn53RSz3k3m; Wed, 22 Oct 2025 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7JAMISd9piME7nwpMyNBZRnsuIWfK7ZyVNBMkB4m+U=; b=iuaECCeMLv7kzVX//0B06MlV4BG+ocUkYjs/BBPfzvylFBHqW3OTLvAlqFzca0GauukPiW 0EXmdiI2gyoLTNrFn4fK5PJ1pjml9QeU3QEKln9yXlsGSboflbfj/dsyBwe/gVi7I5W0yB alWS4p8w0HSuaj7AgGRHstcLMgaFRwbmocnWVeqha5GblsUYS3NWPVtFO++ftqDbBwBSCP qJ7Udiwqlgp5JYNeA/E2tbXuEdOWl/rOjgHMLCH831J8C1XdiCHjMszu8FFKvmabgoZR51 SNH+gCeiAdU5BBRHalfy+vwvp41ECJFMYATxBzfQ/kBbFcs4P7KSszPzUimU6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7JAMISd9piME7nwpMyNBZRnsuIWfK7ZyVNBMkB4m+U=; b=L06X7vV3bfn/Es3eZ+gY3WN8NBf9scKEyhQYfESy+0ZM2VLkwkjbyLqoNxSmr/YE0vDhvQ WxGTJRjczOBrJenjfBDhmlpCnUN5pxGONJ8TqI5v6ABExp0c3Wi0Epl+4JJHHaZGY+1dQM vb/S0IBrozW03gCo59b2ud7GR1QZxWXgx4IbPbjyLrVdUYc3u3+X3SFIs8qE4shXRMH0pt 7iZfOtEvUdg3i2CPPYbQPEWfc9xWt/m57gf0CmwIrKMcHLPI1j0ekJJwI0eK+IJlCJtLfJ lxocPOpnCPMluZ7gW+zLhfilZ64Hg1Fb3d+7bgVp8JBTVOiDY44vqSEGwL/B2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761136093; a=rsa-sha256; cv=none; b=qbGvkcqijeS7ZKJIQQbzxoTxc92GPBrc+JOscayadoJVsWsBBEvNoGU2uySfHgAHKZq8+u tJmDI7gnWu1NPBkvMRaqGRCrmeVJGpuM30XlUPwA4fmfQ96fvbFnWc27Z2WbNyD0c6Nj5P UQ2fKrhDzhFriaGdERd2NE/+qZHyboN4VN187c0h7j3Wfh/VZQOuDnoOoUz8p5nlalSiEF ESLj22+9/oyiW5NlH/hsSH1ZMIgcaTZv05nou5eBKTHWowmSMCD2MR0zDAsXCYqmX7rlye BqZPr+iM1OTh3CkurvO00r4lfLaSenNddtSc8ageIqr4WVAQQQN3501njmcCrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs7jn4WBDzD8d; Wed, 22 Oct 2025 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCSDAr041264; Wed, 22 Oct 2025 12:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCSDIs041261; Wed, 22 Oct 2025 12:28:13 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:28:13 GMT Message-Id: <202510221228.59MCSDIs041261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 1ca09538d942 - main - sys/arm64: fix COMPAT_FREEBSD32 __syscall() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 1ca09538d94273601dac08204c1d0b3ca9115864 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=1ca09538d94273601dac08204c1d0b3ca9115864 commit 1ca09538d94273601dac08204c1d0b3ca9115864 Author: Robert Clausecker AuthorDate: 2025-10-21 21:35:24 +0000 Commit: Robert Clausecker CommitDate: 2025-10-22 12:24:41 +0000 sys/arm64: fix COMPAT_FREEBSD32 __syscall() It seems like _QUAD_LOWWORD was incorrectly expanded into 1, which is correct for big endian but not little endian. This means we always grab the padding word for the syscall number, which is usually 0, causing SIGSYS to be delivered to the caller. Reintroduce _QUAD_LOWWORD to fix the syscall. PR: 290411 MFC after: 1 week Discussed with: jrtc27 Reviewed by: cognet, emaste Approved by: markj (mentor) Fixes: 8c9c3144ccfa3061879b8cec015ee7d1010e4766 Differential Revision: https://reviews.freebsd.org/D53250 --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 8f8a934ad520..4cb8ee5f57ef 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -210,7 +210,7 @@ freebsd32_fetch_syscall_args(struct thread *td) sa->code = *ap++; nap--; } else if (sa->code == SYS___syscall) { - sa->code = ap[1]; + sa->code = ap[_QUAD_LOWWORD]; nap -= 2; ap += 2; } From nobody Wed Oct 22 12:31:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs7ng129Rz6FCjh; Wed, 22 Oct 2025 12:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs7ng0PwFz3kgG; Wed, 22 Oct 2025 12:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XpD3/J+grdWh5moHiR2aSKh2v8AYB4R8Q5980gTbIE=; b=WJmQ6HSUohDkHjQxjmsI0gD11NJ/v5KOW9qiYAfyIhtaDFdgKZCKdnQhZX2EMuAyHV6Pw/ A4LBXF83Hig7A2bwaWCuc1NZ96eFlAsyJZEI3PHIQktUxk0BuyQRYxwf4SUzkXx+o1BnPZ PQXGkwWvMyWXFT4Fwil6F0pm2PX/CdAnvk9iohU0ZfSj/d0BoQhE3uyKkESv5LcmFH9cJU pNrqIkQy6Ys232puTQtf647Gqw3/kouCoE7vAY58ZHb7/6y70XVssAMqNf68fCH2FYZowZ a6y47j6wdLuN25mTTmctDnJV8PDhd0XLGWXeKGnt+mYlcj2tfMim49aGpILA7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XpD3/J+grdWh5moHiR2aSKh2v8AYB4R8Q5980gTbIE=; b=NV5xP38eZXLdW8rDsLfPD9ZTZjiBSOypOdgpw3amKSYIID/aSUIb9k6O3n/+ITWseX/ttQ 24XTGs4RAU+ekRtmIIkrZk0tXOtQcgi3OyRvAAgR80dJwN1hM2uKqsj3HjGOYYLmmpFtQQ DRWI/tsn0Xa6W2Cq7sJ5FJnXjsABpdGUREIrZzNC7ikgEA6tJ41DOBZaj49SStMuLJ+ZBQ TMpb1kBsX9s4JvGvAmqpZf0CCzKvPt5fpoU0JvHfEaB38NheKNkrl5zWpeJY3sW/XW9Ku5 PeN55lrHlcdqCh5m8Xu8KbesdqZeF0+iQdIyGeSD+9VMQiNnZ3+juQUEX+wJiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761136295; a=rsa-sha256; cv=none; b=xxEWFCeq8q3ZIRGpp7CAqgIVPv/KmvmkPxVg7jDfVdCgDb3lqASkYcQ/AoOWZ6jot8WC2R 0WXA1jLXA7Xhg7h/kggyhDI3ZlCL7Z7dWX4//ZpE304O3+YYl/47r6DbQ3bE7ovqk+pJey fXM+al5ySgRsl0znzXhfAcupNL13ijwUgM26xzsb07Ps6UtUrrsCpUe5Mp+sgVrhAq5l91 DBY/+EMEYa910AY1Nb9O8AM7N8vqwo3b3dJEuCNrQwvKOrZICcX4Ia6ZFx4lVncf3q2qxl mqQTSzxKzxcgnn83f3KzRsqRXrGjBeI9Sju4vnjFNYQgBK79AvtIl/sXZL8+VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs7nf72SMzCn7; Wed, 22 Oct 2025 12:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCVY44052337; Wed, 22 Oct 2025 12:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCVYAZ052334; Wed, 22 Oct 2025 12:31:34 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:31:34 GMT Message-Id: <202510221231.59MCVYAZ052334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4bab868a122b - main - sound: Improve dsp_cdevsw style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4bab868a122b9c853865c8d89886d9354d0f242b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4bab868a122b9c853865c8d89886d9354d0f242b commit 4bab868a122b9c853865c8d89886d9354d0f242b Author: Christos Margiolis AuthorDate: 2025-10-22 12:31:16 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 12:31:16 +0000 sound: Improve dsp_cdevsw style Sponsored by: The FreeBSD Foundation MFC after: 4 days --- sys/dev/sound/pcm/dsp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index fe5576baf017..27d5b740b90b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -83,15 +83,15 @@ static d_mmap_t dsp_mmap; static d_mmap_single_t dsp_mmap_single; struct cdevsw dsp_cdevsw = { - .d_version = D_VERSION, - .d_open = dsp_open, - .d_read = dsp_read, - .d_write = dsp_write, - .d_ioctl = dsp_ioctl, - .d_poll = dsp_poll, - .d_mmap = dsp_mmap, - .d_mmap_single = dsp_mmap_single, - .d_name = "dsp", + .d_version = D_VERSION, + .d_open = dsp_open, + .d_read = dsp_read, + .d_write = dsp_write, + .d_ioctl = dsp_ioctl, + .d_poll = dsp_poll, + .d_mmap = dsp_mmap, + .d_mmap_single = dsp_mmap_single, + .d_name = "dsp", }; static eventhandler_tag dsp_ehtag = NULL; From nobody Wed Oct 22 12:40:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs80N6TBBz6FDJT; Wed, 22 Oct 2025 12:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs80N55n2z3l8c; Wed, 22 Oct 2025 12:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fy2yPKjquDRF+xx0FqLuZLtAyIHdQjGxnun4RdO3W10=; b=pO4yMt1gx4DbozNJdnCBQ66MZCpRwtX1yZmwhV+yBy6I+2jnckj1ocLhWs4D1PLY71gReC qqqHdlR0w+6lcfwEdvuWMPAQgcQWKsBCHmjZ/0e6ohPH/moPnFzH0Bc1nYOZPq0yzyUnbH eyspuG1qLJlNi4brrPwJHxXgoDfbrucJo8Cok0jKxKtKZKivKNU4UYq8amLPPdKpflaO+W dInrZpGsUTOS+rzvZ8YImrgQCbrQJSLLZwF3QHnYNSJLNxImoZ8+FQbWVFgUZP9F35Vxyz ib0nouCbvxAEQoW3YsBX64QIaF7aQ+YHllOZJ9wXBnyDO7RzTPO26DSZiI4ThA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fy2yPKjquDRF+xx0FqLuZLtAyIHdQjGxnun4RdO3W10=; b=arbhUFS+apgoetrLPitlMypYCpI2MxdPMIOiq6Tvf0Xf5Oq8zPT4p2V7jv/PyCvrOF8hj9 Y9O6LDOPPln1MdV2bHqyp7Xamwbo42jLERufBPWFp2m/GUL62sMHu+PLG/96rwSzZr/f0t Ekht3TCUQxYUDcj7cOO4J5JJ421hUVqy5BGL2ziIJ3zVPPO0Yke925QwIdGT1xW2yU+LsN owlNnzcePNmttibVQQHEEwczq4h5cL0SW/iTmMYz1f5SBC0b7NYzu0/lEsM5f9ka82WpQr 1QLyHnrwwe2XTmj/NvMUzeT9mOspxE19+eNfoGxxiFiWycoa+fGs+45Ml4EUYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761136852; a=rsa-sha256; cv=none; b=iQC28sRlwtuF3Eis5wJuKu88ZgcmW4YfjrIQcvf26CHgOGP/JjSq6tDbPd3YajpcywwdbU PAZmkWfZ0yR0crLujFbxfuOksgutH+ew4NbHrX6SteuzITxFqeTzgUYAqUfrou01R62+J3 yB/G3uuFLSXs1QPq26W9QkmJOtSeS7tmImTu2BMMa0u8dEaq5llOQCqyExgCg8mDNw6eI9 9AiNOGe27YjVwsWocIS71hx69t14ADk/fnkBxQxkaHN9ro+SGJzi6v9A9xpwerNdQojd7I wDETSLIVBVjsqcZ8WPkxTI1MVOEUKts3LzoStUTxxZpWOdar49JRVd8V0FbWJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs80N4f0GzDWb; Wed, 22 Oct 2025 12:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCeqaJ070161; Wed, 22 Oct 2025 12:40:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCeqvT070158; Wed, 22 Oct 2025 12:40:52 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:40:52 GMT Message-Id: <202510221240.59MCeqvT070158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 604b6458f3f3 - stable/15 - bsdinstall: Use pkgbase release URL for BETA/RC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 604b6458f3f327206a56da7ba80c2df7965a0761 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=604b6458f3f327206a56da7ba80c2df7965a0761 commit 604b6458f3f327206a56da7ba80c2df7965a0761 Author: Ed Maste AuthorDate: 2025-10-20 12:38:03 +0000 Commit: Ed Maste CommitDate: 2025-10-22 12:40:21 +0000 bsdinstall: Use pkgbase release URL for BETA/RC PR: 290238 Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53214 --- usr.sbin/bsdinstall/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index e5bb3197fa05..5d7be97ed7cf 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -22,7 +22,8 @@ REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE SUBURL= base_latest -.elif ${BRANCH} == RELEASE +.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC SUBURL= base_release_${REVISION:C/[0-9]+\.//} .else .warning Invalid branch "${BRANCH}" From nobody Wed Oct 22 12:52:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Fw4dlFz6FDpc; Wed, 22 Oct 2025 12:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Fw452Dz3mfl; Wed, 22 Oct 2025 12:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9hdKUQFdFS1dBlVj1Oti5redms8qxaX93qXGLRI90M=; b=iLWQUWPE0ROAIwu1j33Kr1Mvdzyz8nCDp8Sf1ULqCmgYZQ7KPRSnH7uZg0sKavxT1M+am7 c5fxAIc89bKwShbU/4/zbSLlW/XUFpgurtbKP7lfDKF4eNsIBKxvhdPRmzYJpYDjtWXmBP nJ70kMhp8Q//lBBXbRWdeqxF1JzuWlz38fH5iRNTKmiVdbgEHe5K9wtG5wKJiuvAIZT8Rc kZxCtjKbjK5mGb6n7kM8pfOCJ8lATG7tvumCCQjifOuFCTW5qoxjN08lV4jbfwD7z1lbaI LDA00yiBlo783rnZ7QfEGirgJ42HUmn3F747AvxoMOcajuBiEhujFB5ucZEk6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9hdKUQFdFS1dBlVj1Oti5redms8qxaX93qXGLRI90M=; b=UflIEL/dyyvyChkbM8/DHoEAKYl3Kmh/cBcgrXFiy1+CYs+lmk/BV6SdkhTFuomUDGh6U7 r0vyRMoqCMS91ERpz2lSOfw+HaM4ooVzCjDsTidMGYVZ5DqEBt0vAqGwCuWogHx55TKNzt 8VX35LxPA8iH7TUoJdbNrk6XPqkP5U543QvRvWan/E7uWyHyKIBjPI+FXwPPLqb+Z3r3vA 5bq7yJrJy0yF5+YJDjeGWk4Xng1K0KRERCuvqEWFA4EoQpLDV9PjVe3qnKQ2g2uhIgxbaX 5uJGCu6PveJ79gH/9VfGmbP5gYy1Zq8DAiLdfZ5ReU7kVSj6kyHmlrN8Io6xYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137556; a=rsa-sha256; cv=none; b=ROENQUTlu0jbE+uwiEPgUsvFq86x4usFvIr8K+ol0SOYIktVWXOxypEYPeOlR1wgQcvzgI AXS6V3vXTK/fs5LPcQUozB0y17w7iMV7PRiE6qf2T+5nuuEGf4+QnXpSupk95+wpYBgH9/ eUCs1/5f7Xal18FCnP8VXnY2ibBWSATGPs6fKFk6iJrja9u3RoqKv6oJKSihymb5fh4try 5Z37d28A/8+lEimD2rqaXajLNmbx93LYlcHL1tYjf3HWZ4Aat4W5jHz7MTWI3564k1BD3J 4/Zw/RUrVQr2nT4SmmkUyh0vA88vI1NLdVI2lKD4ev4aAbFR9A/AJfaNqEgT6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Fw3R1rzTkc; Wed, 22 Oct 2025 12:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCqa7k096102; Wed, 22 Oct 2025 12:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqak8096099; Wed, 22 Oct 2025 12:52:36 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:36 GMT Message-Id: <202510221252.59MCqak8096099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6a5f0dc705c4 - stable/15 - exec: Check for errors when mapping the shared object List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6a5f0dc705c4401454d4fcd61e7301b992bfea13 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5f0dc705c4401454d4fcd61e7301b992bfea13 commit 6a5f0dc705c4401454d4fcd61e7301b992bfea13 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:33 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:51:59 +0000 exec: Check for errors when mapping the shared object In the non-ASLR case, there is no check for an error from vm_map_fixed(). Restore it, it was dropped in commit 939f0b6323e0a. This bug could result in a refcount leak of the object used to map the VDSO page. Reviewed by: kib Reported by: Ilja Van Sprundel MFC after: 1 week Fixes: 939f0b6323e0 ("Implement shared page address randomization") Differential Revision: https://reviews.freebsd.org/D53065 (cherry picked from commit 7117c86fcb7ebee4483097cefa9b143de8d78ee0) --- sys/kern/kern_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 0fc2d0e7f1bc..b2c09b47f103 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1314,7 +1314,7 @@ exec_map_stack(struct image_params *imgp) MAP_INHERIT_SHARE | MAP_ACC_NO_CHARGE); } else { sharedpage_addr = sv->sv_shared_page_base; - vm_map_fixed(map, obj, 0, + error = vm_map_fixed(map, obj, 0, sharedpage_addr, sv->sv_shared_page_len, VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_READ | VM_PROT_EXECUTE, From nobody Wed Oct 22 12:52:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Fx5Jmqz6FF9G; Wed, 22 Oct 2025 12:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Fx4cPrz3mWR; Wed, 22 Oct 2025 12:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV8UONL7KChXBoUYt6hvtZU5LzZO5RNNaLkGyHO9HOk=; b=bXTrN0jr/LAvXU0y+RhUEC2ss2qIhSrPUBbYdojzgxVnF5bWghFMH5+2BVKn1Y0BTmoNHg OjwTAXLFA/rETTvyWHctEVqx5xqfR2Y0qlmBIpg9HiauhSuXCyqd14Os0feX3cbVdkPyk3 rCnIAmujh8z1IP2AcRTcmKS/KpldpFps9E/DjATdQmm55zmdtMfYDgPmARsRIG8CT5AiN7 WbwHlP/r9GwZtWmzhC2fK9BQasSAzZ9j/2ohOkEGdyn1mca6MfTdcbjPDZY4sPVglCJCpW JvY19t3Yc6W7XNd5L3PL4u9H7z88f5o/1N10LXThWkcPpwb2ftwSuj1rRSMrJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV8UONL7KChXBoUYt6hvtZU5LzZO5RNNaLkGyHO9HOk=; b=mb9No9hVX/v9Ak5H94OnDdFIn0Uxwdk0+YsyX3GOkdlb85Z+Y1Oci93f4YXVQ+AzzzDvGQ 3YThiCzjo6mOqMprZvFmU55wU2Xz1zd9eb8ZlqtHzTwLamQUdSV4v2GhcoiGl1Kt6bASUj bABqGUDxrfgpYoN10seUZcceryI3Ey2jYzPmJSSsy3uGycwHZzgJ03plkQ0074cBS96LGz lDfvTmQrTi5fFc1xTzQSELZrxUP5L5qN/o1B3GSZEFavNAhh6f9jhc88+qoIUNdvTMR0vC XCNM5NrD+EOZpWUMLR97Quy79zUXQicsbLQpJOZRko9NfZeCMrUp/EVXlsIS8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137557; a=rsa-sha256; cv=none; b=uX3oXWQQxJEmykqGAal5Da/542P5aOWVM9gi8AZX1e2TMcL6hzuG8nA85dBOsXTFRO/axS tncWwY8HCgMyn4mZ6ZAO6kqd8VFnGsbpQ/cbokE2va8PlekBGad6PAYwYFCKD3gHj5YzWl zYzHavuWOjH2IqGNbn/2kfl09YP/0MBhn5WIyV6PXRcV3dCaMxTW7kOQfiFeqHRDN8Tnb+ 5w1o3O8EYLn8SHbTLyZC9xcE9Isw9mp5hHwCPN3o+TqWGg+a5pmOqzvzs0nGAysDw+jpTl 1hRH6XHfgtOGj07qhIupM4FSJUHnfgpULt/JaIhMPGDXieezDOqVSFMxaPo9tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Fx48HYzTb8; Wed, 22 Oct 2025 12:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCqb92096136; Wed, 22 Oct 2025 12:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqbBu096133; Wed, 22 Oct 2025 12:52:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:37 GMT Message-Id: <202510221252.59MCqbBu096133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 302c4c540e44 - stable/15 - ipfw: Check for errors from sooptcopyin() and sooptcopyout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 302c4c540e449e3fec02e27742f7572039347f66 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=302c4c540e449e3fec02e27742f7572039347f66 commit 302c4c540e449e3fec02e27742f7572039347f66 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:51:59 +0000 ipfw: Check for errors from sooptcopyin() and sooptcopyout() Note, it looks like this code may be unused since commit 4a77657cbc01 ("ipfw: migrate ipfw to 32-bit size rule numbers"). In particular, it looks like the ipfw_nat_*_ptr pointers are unused now. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) --- sys/netpfil/ipfw/ip_fw_nat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 1e2ff1bca290..19393d5b8444 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -999,9 +999,11 @@ ipfw_nat_del(struct sockopt *sopt) { struct cfg_nat *ptr; struct ip_fw_chain *chain = &V_layer3_chain; - int i; + int error, i; - sooptcopyin(sopt, &i, sizeof i, sizeof i); + error = sooptcopyin(sopt, &i, sizeof i, sizeof i); + if (error != 0) + return (error); /* XXX validate i */ IPFW_UH_WLOCK(chain); ptr = lookup_nat(&chain->nat, i); @@ -1104,7 +1106,7 @@ ipfw_nat_get_log(struct sockopt *sopt) { uint8_t *data; struct cfg_nat *ptr; - int i, size; + int error, i, size; struct ip_fw_chain *chain; IPFW_RLOCK_TRACKER; @@ -1134,9 +1136,9 @@ ipfw_nat_get_log(struct sockopt *sopt) i += LIBALIAS_BUF_SIZE; } IPFW_RUNLOCK(chain); - sooptcopyout(sopt, data, size); + error = sooptcopyout(sopt, data, size); free(data, M_IPFW); - return(0); + return (error); } static int From nobody Wed Oct 22 12:52:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Fy6hC8z6FDg5; Wed, 22 Oct 2025 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Fy5YSRz3mr3; Wed, 22 Oct 2025 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QtAGSMD3Fn5NhL23rcQ+akC8w2uoVHj1fIarn3u65iY=; b=TEiVLnVjjO7Ap16W4TmCIOHP4RYdqH3uogG6AaT2xgdC7ZSnMGQkbjysgpTmEc7vN4IxUL /LMmysTXka4eT/Zop7m2QJQFUVuNC4YIVCoebL9SISk4HKnZVB+Eic6AVPw8Gj/mYsrPB/ hLq/Fv6xZdZDDq5Jt7KkdWeBriHVAgJyT/9gEbyusS142yUKEZH/Ow0wacDMooBoPmlCJC 1gRydCRneDE7f6CgAtTvQ28Tk32MMly3W87D5VNx/5zR52qU83ZlS5lIC7var6ztnlggKB vcUfIFe573PXx34msEK7pOoAw2gVH61EI5tVdtj42EGeyXX7YlQA2sFFle7iSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QtAGSMD3Fn5NhL23rcQ+akC8w2uoVHj1fIarn3u65iY=; b=hyW8r9F8bYUAostiAHGDg/RHzGWESLOb9/e8IDHe2zTdZAQCEzUZz+gffVsE4Retb1B/VK 9duqJKSdWog10yqg1iFnrqwUz6Db3ORU6QOGzIW9kJ7SmUGEPHb72d79UOM9tZTvNKErSh k5R+gl4jHfVwmM2pXfeJT6+nR1eXYSwnCMVM1YtZbiJ8IOixTXkZfsIGRAJQSNUxXr1v45 +up8oqsvt6Q3xvUYkfpx8W2OGJ8A8r2ucZrRN17ayY3xAp0PGr3Flq7z4d8x5XQnDHCS57 7Bbmjl7xPpfCuT8Y33D/W4qVCVTojwBzsVZa65ye3s7ngJu+VuSqAsenEtHsXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137558; a=rsa-sha256; cv=none; b=FV9OQp2CTyWwRgA9mcLxkMaTmNkrhp2AhvQW6lJTActhJqcV0if9T+CSPwgS4s9nZ/ogHY LAg4t67gxm7Cp1bSU3vYXMStKgth201mVYzX0bYXG/tn87TJlnISWotsqOCqPg5bbuHeEC PUPfTug3pC1sbWRGsoTg9Y1NhrMwsdDBtfLvRsxchvC+FSz0tg4DCDFzV+5SeeXrsGd8k+ v7BQ2S7TL2Zs97epQuoo0JkOpOeMAn98nA/ObkAM6d6oRjj9lEQ33naDBxbZjyerkkL0X8 MG5talJfbvMi31Elh4JxCWr8sNfSTKG7ub0iSyC2u7NwNq7CrR9ab6iPYhyvuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Fy4t1JzTh6; Wed, 22 Oct 2025 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCqcQf096170; Wed, 22 Oct 2025 12:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqc6l096167; Wed, 22 Oct 2025 12:52:38 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:38 GMT Message-Id: <202510221252.59MCqc6l096167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c47f9af4771b - stable/15 - libnv: Fix a length check in nvpair_unpack_string_array() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c commit c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:51:59 +0000 libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) --- sys/contrib/libnv/bsd_nvpair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index c73bc2189121..b884dd260b84 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -985,13 +985,13 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, size = nvp->nvp_datasize; tmp = (const char *)ptr; for (ii = 0; ii < nvp->nvp_nitems; ii++) { - len = strnlen(tmp, size - 1) + 1; - size -= len; - if (tmp[len - 1] != '\0') { + if (size <= 0) { ERRNO_SET(EINVAL); return (NULL); } - if (size < 0) { + len = strnlen(tmp, size - 1) + 1; + size -= len; + if (tmp[len - 1] != '\0') { ERRNO_SET(EINVAL); return (NULL); } From nobody Wed Oct 22 12:52:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8G014fnz6FDrQ; Wed, 22 Oct 2025 12:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Fz5tGJz3n2Q; Wed, 22 Oct 2025 12:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VlK1BEKRylYWHKORZjsYRFQFZGd1AQIv4RvHGkh3D2Q=; b=D7dNgGsx1KOC0A6sF7igGxmxINUEH4zkiNrsklCosKBTlRCykxuj+v1H6v9H7cFfYR+2eK 5XuNzNuq8TAahY8R1Wp18EoZFby/Lj3kdvJURNOAe4Hr4GIZigq7OtVGfKlbIMX4sv+l3P RoDcxVl/40/57L2Bqkl8R5hfpOiP5Gmtj1QcrT0xcXO2sSau9n2zUwAuPs58SS4ghcsRU/ 7b6LBWVQDwwMTv8JoSJM107jPT4iQZqzckE0Hwsx+qa176DW8/R8SMPLXASZ/qdVoXjT02 X8tStyYDrMEsM2p8L687L//+7uv87zur4DnLWe8pL+Zm0csI8kx5zLfXpE3dLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VlK1BEKRylYWHKORZjsYRFQFZGd1AQIv4RvHGkh3D2Q=; b=WEBghRKB3GAwaAB/f/WptDsR5L8sy9vmzMFaxrsAFdRxyMJrInjWubs4eC17OypdrNzHxb Nz8qCBoiSJpqg+l0UnI2dp1y8YlecKpt5EvTEkIm7/T1EiFUx03yBazSkfL31U70vbIReR 4m1Rhcu4hcjHK8AOYyCcfWl8sddk++Cdw/fhsVx2Fn/i9B4WFaZPM4apsg/i1LN35PklF1 BIt7oYZYZH1782UkLgPRK+xReZiaBi1HIem6QTpSjixUY4pc2wCHyju3bKx+4tlfijqKK+ 80KzkHvwTYqQJqG5Se9vHK7XZWiX4FcThirekF/j+1XdxUebwNJEzJUnx0gxZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137559; a=rsa-sha256; cv=none; b=RTyiFroJpHyBs0BqcUEvsIrg+tG4ZlS8l2k73VL6o6CxC3BH/uBR+S+/kaDSj/gEeAt6Dq jCbVSiF3UzbThY1qI8LjZlSf+jXWBpNnj+7yjiNW4jS0H3HEGQXXCuoIsN75BuECVqhFSR CjG3G5gp5LWIFQOt2E85S0s4ua4ebvVs3p9xfcXujMa/+RGeRmd7F+caakjxQ5foXh3grv p0XRwEFuukPkEfRLm2gDsew8UeLSfxigrdUJ2pEa9bY0KsbSbmRS/bAP9irYoj8DslDHtw cOOily9vLpZRshUumCq1UmMVt4Iu5D814ofKAl1gqtKyvF3AEACSIFEwLFGigw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Fz5PgCzVF6; Wed, 22 Oct 2025 12:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCqdsS096204; Wed, 22 Oct 2025 12:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqd3L096201; Wed, 22 Oct 2025 12:52:39 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:39 GMT Message-Id: <202510221252.59MCqd3L096201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 09ae918e1f00 - stable/15 - imgact_elf: Check note body sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 09ae918e1f00572f9045283c281cf2d210ece491 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09ae918e1f00572f9045283c281cf2d210ece491 commit 09ae918e1f00572f9045283c281cf2d210ece491 Author: Mark Johnston AuthorDate: 2025-10-15 20:14:36 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:52:00 +0000 imgact_elf: Check note body sizes In parse_notes we validate that the note name fits within the note buffer, but we do not do the same for the note data, so there is some potential for an OOB read in the note handler. Add a bounds check. Reported by: Ilja Van Sprundel Reviewed by: kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53063 (cherry picked from commit c86af2cc4cd12fb0174843b22d737c3b5b5d55d0) --- sys/kern/imgact_elf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 1bc2491a1a12..bc4fcad6c61b 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2831,7 +2831,7 @@ __elfN(parse_notes)(const struct image_params *imgp, const Elf_Note *checknote, } if ((const char *)note_end - (const char *)note < sizeof(Elf_Note)) { - uprintf("ELF note to short\n"); + uprintf("ELF note too short\n"); goto retf; } if (note->n_namesz != checknote->n_namesz || @@ -2839,9 +2839,9 @@ __elfN(parse_notes)(const struct image_params *imgp, const Elf_Note *checknote, note->n_type != checknote->n_type) goto nextnote; note_name = (const char *)(note + 1); - if (note_name + checknote->n_namesz >= - (const char *)note_end || strncmp(note_vendor, - note_name, checknote->n_namesz) != 0) + if (note_name + roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) + + note->n_descsz >= (const char *)note_end || + strncmp(note_vendor, note_name, checknote->n_namesz) != 0) goto nextnote; if (cb(note, cb_arg, &res)) From nobody Wed Oct 22 12:52:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8G1308Cz6FFGD; Wed, 22 Oct 2025 12:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8G06ym1z3n4j; Wed, 22 Oct 2025 12:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JWsSzGKlCm90ydSBIIXzVTW/3LkEV1PqW3LY48dUSI8=; b=QTpO8VjdX+C5hSwupJlWKv6Ros3XC+mks4tz373c0NY7nDgEekSZD5MSqVoji6hMMkLD0u RtkZJSSO4nbbYSws7C8Vin04pUqp4OVUsPL0eg6q06Do2k0cz26iNBeXC6Kb2X5kTRMqyr Q3JIT8vQWkpCMb7uROmItsHCLJ+fZWf94E7h/RKvR1k0FYdOYduwgPLchEe3ttvGZ/HPnI 5avrlJYjuetKiFJUXA/szuijn+CyNaA4Q/YeaYQbeucFC+EIg9JQ3Fxir8Drz/vhn3AOH6 iR2/TLawWR1CciQ6rBnziGiDwJnvX7lHbd3L+2o0iK42ygcQQUXgqBuswrczcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JWsSzGKlCm90ydSBIIXzVTW/3LkEV1PqW3LY48dUSI8=; b=cbHB9/H6cBxVj6y4ZkNA7HClrsVzc1Pr+DbaevtiKgYts4DVDvIQHpPSFRas9DOiWUv141 v7Xg09o0wl8o6IMXGA11VH9A8vjWmiKuj3gTGBovXsq/maFxHrIDuUkXARTHbk3Fr7c8Zu fTuzXgyotfBXXQS8bSnqiHWlKOa+YxoCRuyBYCEHN1VpX143EljZAiNWLGJp4GrjVdScTL o41lXT4PXJK7f8skdoVK9HLmuahpQpqolHRjAAOG6TxYYrKDZWTS3kDTtmx7po/6F9trRl p/nQxj8GkjtqkDbiMH9um01DvH/4MJLi1GiV5v2mEI35ss6IzH37RoNIb7gVPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137561; a=rsa-sha256; cv=none; b=lEEiq7XPzarQFlqfcAgRoDGhJHM8cFUY3IcZPLzm0ovgrjX0GjqEy7YgNeaeMgeU6Mx881 V1nDV6eyw2+ZFqI9Xs/4ZC3Q0TlB177E7LeKBgMIyXGd8NNW1aVVEd0Q8IA59am+ktXIYK cTTGV3sfH7QpU4nnuw3GX0Jk+WCXjKy06bh3e25LMIoRJVUzrhakLZRj6TPPNYE6qN7VYF 1XQU0OK4rpA38EDCpbZ98i19ymDia8LYWc7IDxiBmMEmNVlOZx0okgommJ0f6SksRyS+H3 AF0iZrSOMxBkb4gZX3HOzeDUB4TQm+Cer1xlFBmE3OWzod9xp9/eV5g3sHAlKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8G06QBwzTh7; Wed, 22 Oct 2025 12:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCqeB9096238; Wed, 22 Oct 2025 12:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqe1j096235; Wed, 22 Oct 2025 12:52:40 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:40 GMT Message-Id: <202510221252.59MCqe1j096235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8028cb0b3cf5 - stable/15 - rc tests: Add a test to check for warnings from rcorder List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8028cb0b3cf586236240d4941337bc27b6950ec9 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8028cb0b3cf586236240d4941337bc27b6950ec9 commit 8028cb0b3cf586236240d4941337bc27b6950ec9 Author: Mark Johnston AuthorDate: 2025-10-08 12:51:16 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:52:00 +0000 rc tests: Add a test to check for warnings from rcorder Reviewed by: des MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52954 (cherry picked from commit 04d47c7cde54cc325cca3f47113976f5500dc58f) --- libexec/rc/tests/rc_subr_test.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index fe6d3b8264c9..9ddd13b61a7c 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -26,6 +26,17 @@ # SUCH DAMAGE. # +atf_test_case no_cycles +no_cycles_head() +{ + atf_set "descr" "Verify that /etc/rc.d/* contains no cycles" +} + +no_cycles_body() +{ + atf_check -e empty -o ignore rcorder /etc/rc.d/* +} + atf_test_case oomprotect_all oomprotect_all_head() { @@ -130,6 +141,7 @@ EOF atf_init_test_cases() { + atf_add_test_case no_cycles atf_add_test_case oomprotect_all atf_add_test_case oomprotect_yes atf_add_test_case wait_for_pids_progress From nobody Wed Oct 22 13:01:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Rt34x1z6FFwr; Wed, 22 Oct 2025 13:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Rt0Nqdz3pnp; Wed, 22 Oct 2025 13:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUzY5O6PL74p8npIh2p3xKAdm9RPiwMbsUssAJUW/Wk=; b=Mk6ZRTfbyElOdZI/eH8Le0zZtBvEdC9MNxrR/m6f+ElzzFFNNJhuhb5DQuam6tTplpDLGd wY6KHf/nLtu6oMxkAy3VykAKzT8lsXemsBtv4H/FNwuS2qYZNNkMIDjsF8ApBXNkxL/V4z 7WJRHeXMqEYkGsOsRrEHKN165q1lNZkPvXf8sCsf+FB06/65GVCU3khRfQGB0Ccpc/9Cl5 UiEl5i97EkYw6jXj64Hwu9ioNqHQyFY8PypWQ3gOz2dfKmZLer9V28b50XczVJU3V8zWKx uV+qOYzUq+chTB5SEeq2N6i9Gn+VZn+iMDdRGTCvM9lbmLFiaIUylljpesN+Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUzY5O6PL74p8npIh2p3xKAdm9RPiwMbsUssAJUW/Wk=; b=chBp1m4a4VCgvGB1OdyyViQSXabiOj3sTAdd5uKNJMNIJanMtlZIKNm9xuSqlOH5uMDEBz JHkVudzTwOolKCc+S593+kVbe56EI1AW1uDnOQ15xNjKJU8Ci2nzizMxuqwn7jiAI0mSF1 /Cvinh4moX6VfQA5b1tBgt+FVhl410zUAa6EdNdGaSQfV1JPX0ZsxviCYoBItAZr6rfZfn 9Is59ICdjS056DfR62xdyf2hANQ9v1wAwcBR6ZNwdz7R/Pgq1BHZ4L8dOut1JvzEEmQWf8 vciccGJ7jwLUDKjkUA8SK2tEjcq9qUhA+jgudepvlTMxuYnGLM1Nu/MBntbWNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138074; a=rsa-sha256; cv=none; b=A4BEgLKRbnE7NA0P6Ys40v9OapO7GEvFbwuiPdGfma58TZAGZQGiiRs5YsWxLFYEYzQajI eafZJZ6qJxgpPODzFFLAb47azDP22E7mzRudaPaP2Pno7S4w+V7uSfgNjfk8NkB+Srait/ xHxh6SiG9n7xXiuF52aRR+D1RCgW5mMJnN+ITYkhOrXXW0NmAq+nm5FS7ctMs9Gxwdt6Di n4mMaybmWIdZJHCoqoSy09KnrAT+e7Nu8VTeN4rw6rPAh7BMfN+0H3Fywl0S9D0Mw6sVIr en9JwTZmuCneKIkg9pUOp4HU5bnUX91u8raHHn+mBrDEIZK2nVr7XxO2iY0Hxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Rs6wC1zTbK; Wed, 22 Oct 2025 13:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD1DsA009729; Wed, 22 Oct 2025 13:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1D0A009726; Wed, 22 Oct 2025 13:01:13 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:13 GMT Message-Id: <202510221301.59MD1D0A009726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2078f67215e9 - stable/14 - exec: Check for errors when mapping the shared object List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2078f67215e934cb9c43b93586ba79fd6fbcee8e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2078f67215e934cb9c43b93586ba79fd6fbcee8e commit 2078f67215e934cb9c43b93586ba79fd6fbcee8e Author: Mark Johnston AuthorDate: 2025-10-14 13:33:33 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 13:12:16 +0000 exec: Check for errors when mapping the shared object In the non-ASLR case, there is no check for an error from vm_map_fixed(). Restore it, it was dropped in commit 939f0b6323e0a. This bug could result in a refcount leak of the object used to map the VDSO page. Reviewed by: kib Reported by: Ilja Van Sprundel MFC after: 1 week Fixes: 939f0b6323e0 ("Implement shared page address randomization") Differential Revision: https://reviews.freebsd.org/D53065 (cherry picked from commit 7117c86fcb7ebee4483097cefa9b143de8d78ee0) --- sys/kern/kern_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index f4197609a700..7f6d9a85c6bc 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1284,7 +1284,7 @@ exec_map_stack(struct image_params *imgp) MAP_INHERIT_SHARE | MAP_ACC_NO_CHARGE); } else { sharedpage_addr = sv->sv_shared_page_base; - vm_map_fixed(map, obj, 0, + error = vm_map_fixed(map, obj, 0, sharedpage_addr, sv->sv_shared_page_len, VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_READ | VM_PROT_EXECUTE, From nobody Wed Oct 22 13:01:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Rv3J9lz6FFXt; Wed, 22 Oct 2025 13:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Rv1Zn0z3phk; Wed, 22 Oct 2025 13:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=seOPkIW8JICEHkXShF6BLopBVC0up58gXJ5NHh8NeaY=; b=Z+wwP+LiK80UNe4i4PPsVPmgiWvya5pbISrJtNIw8ir48v0BrwFFMQfbEQTgTrrxOdklqG sqQ95cXIg70CoFfa0qtekktIn+gH97s6giA74dv8O0FrkPuwApAfeKJXc3lA1Xd3IH6rXE UZb+xpdBp1cwBx8dWxdI0GxU+hmD/8b1B0jJF6cTxckoNSEbKg7ovVfFroqT4J0Na9oDmZ a7pmgBblaE4RYWVcIypEvN/hnjaAYFfMHdhKPfR97Eaqgl3p9V3HXm2iSBgqLsp8S/MuAR 8lHZLtCM7nhKD28WfK0ukBTAL6fp7CqqDb72L14XEXJdyNQ7HZhsEdN7Jffo9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=seOPkIW8JICEHkXShF6BLopBVC0up58gXJ5NHh8NeaY=; b=qbOd0qFjCgs9u3BzfBs3Cx9Gp3JeoLD0jiL1Hhx7dWrFp79UQAVveYgrI1pQwiVkjG2yvf Pzn8oetOfolHUjD4wkrS/QJuwIeajf24qFLGwSgB/Tj4Rk1vJNo8tT74sv2+TZNob6L/iJ MvUw5rJapkEbsUOi6boJS+XQgK71rJtmPUcMwSwXv3w5OGK2qXTLi/EFKLKW9pJTQRNTjk 6pdQDhLWhil4HX08kDb8vuPNJhpJFu5DDi+70gE5WX5NwT4GY4jUTP8o2fTqaPuS9N70V0 YYbcYBkwswPhCTyvWuvyKH49tenfx27gj1ABqffQJ6GpC/PkVI3xrjDjStKlyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138075; a=rsa-sha256; cv=none; b=mpC/06hlQoZIT6OQtAMGQqG8/AkaMrUxI74AzCQ3Lb17uAPco+G3w6kOEcySJKTDtwcVFO LoW8iOXBPQ4Q/jl53xN9IRGciBEXrL41XMxmxUezLwVqXTHmf1eIk7o7VWEjHoAUBZHGqo ydMxZyTELvgvRbUggzOtOz4kwTiNNgJ2T8eQyWEfKsfs4tKysO1ajrlJAqBRoPHFLMEqiD 3oCLf81qcu3hq48oPzXuSvk9gbXa2EcpyGZE6nUj3a4/Epc8/3rVa4MF8vcHJg3W7XiBcq 9uxRBFsGVoaI4MZRegV/SnneLv0X2yVBMtv83gtiPaMlKIUsbxGSyQl+0Ff+Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Rv10vxzTbL; Wed, 22 Oct 2025 13:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD1Fdk009764; Wed, 22 Oct 2025 13:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1Flf009761; Wed, 22 Oct 2025 13:01:15 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:15 GMT Message-Id: <202510221301.59MD1Flf009761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6dfca589ea75 - stable/14 - ipfw: Check for errors from sooptcopyin() and sooptcopyout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6dfca589ea75b9350af783c0b58eb632b0c752b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6dfca589ea75b9350af783c0b58eb632b0c752b5 commit 6dfca589ea75b9350af783c0b58eb632b0c752b5 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 13:12:57 +0000 ipfw: Check for errors from sooptcopyin() and sooptcopyout() Note, it looks like this code may be unused since commit 4a77657cbc01 ("ipfw: migrate ipfw to 32-bit size rule numbers"). In particular, it looks like the ipfw_nat_*_ptr pointers are unused now. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) --- sys/netpfil/ipfw/ip_fw_nat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 4c83c91cf918..c97bf4bf80a9 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -1000,9 +1000,11 @@ ipfw_nat_del(struct sockopt *sopt) { struct cfg_nat *ptr; struct ip_fw_chain *chain = &V_layer3_chain; - int i; + int error, i; - sooptcopyin(sopt, &i, sizeof i, sizeof i); + error = sooptcopyin(sopt, &i, sizeof i, sizeof i); + if (error != 0) + return (error); /* XXX validate i */ IPFW_UH_WLOCK(chain); ptr = lookup_nat(&chain->nat, i); @@ -1105,7 +1107,7 @@ ipfw_nat_get_log(struct sockopt *sopt) { uint8_t *data; struct cfg_nat *ptr; - int i, size; + int error, i, size; struct ip_fw_chain *chain; IPFW_RLOCK_TRACKER; @@ -1135,9 +1137,9 @@ ipfw_nat_get_log(struct sockopt *sopt) i += LIBALIAS_BUF_SIZE; } IPFW_RUNLOCK(chain); - sooptcopyout(sopt, data, size); + error = sooptcopyout(sopt, data, size); free(data, M_IPFW); - return(0); + return (error); } static int From nobody Wed Oct 22 13:01:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Rw5j7fz6FFgm; Wed, 22 Oct 2025 13:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Rw237sz3pfc; Wed, 22 Oct 2025 13:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPKh9w+ivQO0iGicrojntFJSDavKBKP/BVEsaNc6wB8=; b=X/Ou6Crfe1QyQQUc8009mpVssxvzGC5CnPbbqc4SosUDT7or4y4GTXALJ+c0e/tegHisPd dajuaINzP9txzOkDZw5ixTKdWk8Ij32Q1Wrfk7yX7c/xc/M9lAZd6yF+Tb3JWgL6PIoxjr Uf4nS+koHgkysJakVfuDujxiK4jlCp+d+oCSQXMnTJXl7b4esyVbVqYE5G5AOjmeiXtc2v ZCp27ZYj2MkZaFjVs5MCUOrX3noefSc6f7WXKULGiFD24LHbNbM2CTx2Yw2rBmOd0aIhL4 pVobfl6pLDrIHZueryjilsZ2U4xgGJso/FvdvCjblKcU+Lxbh0XFwPq2UOPzpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPKh9w+ivQO0iGicrojntFJSDavKBKP/BVEsaNc6wB8=; b=hAOSE5ZUD6Wm0MYQX5z1erx+QhKPY7NChQBmoS7EQLFNXEgXc1BDOQ4Y95qGJvCAfCfJ7r lq3T0kmLkEwtQeu44fhWq4lHM1b0NhQpFXiYNBmoeup0rMlcLbkRMplf7ls6QwijP9Do/f ZC767s2aDWGOFnuM5EQThHXPS+fTyAS2m6p3wWrVvG+9brwwF2+9wsF3inmPnalOEHYkXq up3nXgan4eQAFhIDVYpgw70tbKwBVBpo5DyepM7rgv2PcNk9RVtY1fks3P6OfQGisiV6Us mngeEdZTNq8uoxKXn+GFKEaBxUdRzezvdnBGxjxoAeX+EowyGtU9y4k+EQALbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138076; a=rsa-sha256; cv=none; b=uR/FcXjEaSG6D2BmWgH7PaXW5rr9ZgVNZOKODoe3LKfskBfWGMjvonHQTPpI8C1H01U7S1 ni0JNs7eDVeKPHyDFitvQRvAic3mK/xc4DNiC/6jfQCa26DnnAQlAQY/avkwlFPVtYT9Lw fZyjDPmrRLppo4gpO8+F6ZNQnKATB91RxiG1mRkn2zbOFyw+/kWHgoXAlKL3PKuihMJgTH ymH+NGh89ueiLQjewEOEYc4ETz+m+MkVKtOI27NWc7GR3ApXqaNAg0ztQf5ktop2WwQDzF cagZvQWSK/r2DHvMUcG3ivjfFqjjpCVDut3l6cUVtAPI/VJ5dp/SjPdFZJPeqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Rw1g00zThQ; Wed, 22 Oct 2025 13:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD1Gi6009796; Wed, 22 Oct 2025 13:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1Gc3009793; Wed, 22 Oct 2025 13:01:16 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:16 GMT Message-Id: <202510221301.59MD1Gc3009793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b951c7fd7799 - stable/14 - libnv: Fix a length check in nvpair_unpack_string_array() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b951c7fd7799710141cde2066f2ed4d36e093a22 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b951c7fd7799710141cde2066f2ed4d36e093a22 commit b951c7fd7799710141cde2066f2ed4d36e093a22 Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:33:44 +0000 libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) --- sys/contrib/libnv/bsd_nvpair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index a977d7941aa3..f6686a66affa 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -986,13 +986,13 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, size = nvp->nvp_datasize; tmp = (const char *)ptr; for (ii = 0; ii < nvp->nvp_nitems; ii++) { - len = strnlen(tmp, size - 1) + 1; - size -= len; - if (tmp[len - 1] != '\0') { + if (size <= 0) { ERRNO_SET(EINVAL); return (NULL); } - if (size < 0) { + len = strnlen(tmp, size - 1) + 1; + size -= len; + if (tmp[len - 1] != '\0') { ERRNO_SET(EINVAL); return (NULL); } From nobody Wed Oct 22 13:01:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Rx6n0Fz6FFgp; Wed, 22 Oct 2025 13:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Rx3G8rz3pX2; Wed, 22 Oct 2025 13:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6RhGAdh923eMPNbxf4bfS78rSWDdD/JiNJG+uwrfso=; b=OkIS/RqnM6fMpJWyMt66rKpxPBYX0Ex8HPrWov7ZRbfkfoztpVz+uP/Gz4ErjQgZXeW8kk iS5AHmc9lekXyfMtcVTEFDAGHVb04V+Mdj4SyJXtcNkKdjfseVLncEpxnTMm2OIBny/1rg EJ6TKusi4Nil0v48zk7nz0wnzxIVuHm8AQz8xsUwDbS7rduSj+CWC04yxb51Br5bdfYh+k gRzM2iLMjnU78OONygfNabrXoCHy0fMDN4ALmLkT+ycQcY2wA0Ko4ImYDNP4+Kgo1KRacX IL2L51SyXnJBPt0pn4ZnMKqOfVBkijBIKGsqTtGmELotl8UcbCT4uIu+HY4hpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6RhGAdh923eMPNbxf4bfS78rSWDdD/JiNJG+uwrfso=; b=rCEL92RCEl+uMnoPUk6qbvEExTsuzZh71bZjmNF+7h8POmMHhirOCwLmJ9CvzCkLiIxl41 swb+zqmkUT8MLnmEBcyf35EgTL6+UbTICJ5gD+HTO1q6woAiudZXgixck0dIaVvC4Tx0Q1 akDjCaIoBc1AlDy6W3FIqgEHg/cYvBuqxUdvInI6CWZweCJA/OGlqWsmLl0gPSStsV/Vog o5WXrvFqu9tn1v8eNVLv1j1BtTghmJj8U0AsiWosJbEKH+h1YzXD+hJ18wnLMrgiKtx+M2 0m/dQyL3LcPkqcHUtd3XdWuTGFwOLOTiGsq2dyHRgd3zYja5BMSNqv6T6/cdDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138077; a=rsa-sha256; cv=none; b=PU5QNTvFW05xNNfUREgEUp679+FWeSH1EcJSXhWqNUlaJR9eZsQKNnx7V1ADWHFVBMUN0g lROfgVSMzqSBglo/5Y/ZZIWnASpwM27AONfAeaJFOJil0VznYfEwO9XowYE7hMN0Ope/a0 OfFT+WcAWwhadvJxeBx7C0AY2Lx4ITcWa/HROUfgdzVbPQhKq8IOEEEE5oJvRRHL53v0Yd ROega3HbiJPLUxyPeJPzZADF5EmdRxfup7qUYvN4WLzhBxqiGl7FF+IDzOPlavpGV5z0Zl L8fofmFPiFumj7G1m2Wu8rO/WmcffwDAEm+2ME0TYg1EEP97zWpvI5epJwO9RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Rx2ZnqzTkt; Wed, 22 Oct 2025 13:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD1HY9009828; Wed, 22 Oct 2025 13:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1HPp009825; Wed, 22 Oct 2025 13:01:17 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:17 GMT Message-Id: <202510221301.59MD1HPp009825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1508441e71f1 - stable/14 - imgact_elf: Check note body sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 1508441e71f13b3d66c854677216a4a8c8ca5e03 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1508441e71f13b3d66c854677216a4a8c8ca5e03 commit 1508441e71f13b3d66c854677216a4a8c8ca5e03 Author: Mark Johnston AuthorDate: 2025-10-15 20:14:36 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:34:04 +0000 imgact_elf: Check note body sizes In parse_notes we validate that the note name fits within the note buffer, but we do not do the same for the note data, so there is some potential for an OOB read in the note handler. Add a bounds check. Reported by: Ilja Van Sprundel Reviewed by: kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53063 (cherry picked from commit c86af2cc4cd12fb0174843b22d737c3b5b5d55d0) --- sys/kern/imgact_elf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 0a09bb9e3891..f73fd997594d 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2802,7 +2802,7 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, } if ((const char *)note_end - (const char *)note < sizeof(Elf_Note)) { - uprintf("ELF note to short\n"); + uprintf("ELF note too short\n"); goto retf; } if (note->n_namesz != checknote->n_namesz || @@ -2810,9 +2810,9 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, note->n_type != checknote->n_type) goto nextnote; note_name = (const char *)(note + 1); - if (note_name + checknote->n_namesz >= - (const char *)note_end || strncmp(note_vendor, - note_name, checknote->n_namesz) != 0) + if (note_name + roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) + + note->n_descsz >= (const char *)note_end || + strncmp(note_vendor, note_name, checknote->n_namesz) != 0) goto nextnote; if (cb(note, cb_arg, &res)) From nobody Wed Oct 22 13:01:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Ry56JZz6FFSF; Wed, 22 Oct 2025 13:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Ry3tWqz3pXK; Wed, 22 Oct 2025 13:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6MqZBKHbRnvxIh8zWy1ZTE46IfQyg0eQeQKdGyGhag=; b=bBZ9KCSyNDZ8vINPagdnfJXl8hegWR5kY5LZaaKQ7yV12EpGH+jcGpEeeBu4KL2zW9lMfV f0LGrThY/WAPFm9AZBC1IcGKzU0+YMgeZ/HGfESfCJwx8+pDjkFt+sux2Cz6nhKJxvHOe/ NxpqTZFJ43UioMKsmqaxkqshbEmUH4FyAOtHhyIx4W+4b5bNbF4KVjioxmd49KCW0i5A/n NgpxCP6+/Cl9G+NY8qYwLmu+WY94MLxDoFqhMaF3zJ//scfY+r1FiNumASGty+OiSbJoft HaMG8B8f3cEnSNvx0RUFhUDtFlJbJQvqMY25RdHtacRe4D5Cfd1ettRPal6/FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6MqZBKHbRnvxIh8zWy1ZTE46IfQyg0eQeQKdGyGhag=; b=K+4x9TNyH0GGIciG6CKD4jgAQ6JMmkpy48Js5s4oR9w9sfqvKq9eiQwbiE+89NXxn7/JBg qCT9GCBEUUoxZu9G4mYfYocv1jh0n/cF6AEK7EThA9s8RI/r2mHZjCAejJzmnVHARu/dfS VLSlqVGDUrvE3HK5wJ3VhSwnpvrzQqEdWw0DZdPJk2CW4063xBzDU+XXLtcPHdr8hQ/c8Z LpXtXTi17/qd5375VA1IpYXjHX8Ld7AUdeFj9PYJ25PPeEzPd8TKUaguKfuWulbZGI0Van I7OAZ9rcKjDbH3Mt4JoMe4IH70HPqQk7+QXUR4l+XpsW/UZqCBqNL4N+0lgIoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138078; a=rsa-sha256; cv=none; b=McLJLieTX1NbJgC8/SdHYki51V+YFeyyasPBFvOngfKkoTxTy2RcsB+3OxjrjeuQ0Oo0tt 8J9/YncR9+w+VZcnUURPq1TktoXbgcD5yhloscGzdwP5CtrVS5iSp64X8n7pQZM61AiaBH 8JUGLPNwdCHim2y2/OvGqDJB/W2ooCZJblzeXuR92UYW3TRM5rwQmrdJcvuQ2hrjFLwis3 ETtreZeD8B+Z5aHRW4Ue5x0ceS4YkApPITv97J4TP/cd5/pgzK2I7mkP8BbfGpO+ao3VZD 3oxvCw08M9NcTn2jlcvSZ164VThxDzp4BZHfGvYs0JIjYrBYG1Eai0fk6xUrPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Ry3Q13zTbM; Wed, 22 Oct 2025 13:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD1IZb009863; Wed, 22 Oct 2025 13:01:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1IPE009860; Wed, 22 Oct 2025 13:01:18 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:18 GMT Message-Id: <202510221301.59MD1IPE009860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2f744885ea09 - stable/14 - rc tests: Add a test to check for warnings from rcorder List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2f744885ea09b7d44c7955aaaf740cb024e4312e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2f744885ea09b7d44c7955aaaf740cb024e4312e commit 2f744885ea09b7d44c7955aaaf740cb024e4312e Author: Mark Johnston AuthorDate: 2025-10-08 12:51:16 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:34:24 +0000 rc tests: Add a test to check for warnings from rcorder Reviewed by: des MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52954 (cherry picked from commit 04d47c7cde54cc325cca3f47113976f5500dc58f) --- libexec/rc/tests/rc_subr_test.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index e8398c8d9b12..d453338a7ea3 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -28,6 +28,17 @@ # SUCH DAMAGE. # +atf_test_case no_cycles +no_cycles_head() +{ + atf_set "descr" "Verify that /etc/rc.d/* contains no cycles" +} + +no_cycles_body() +{ + atf_check -e empty -o ignore rcorder /etc/rc.d/* +} + atf_test_case oomprotect_all oomprotect_all_head() { @@ -132,6 +143,7 @@ EOF atf_init_test_cases() { + atf_add_test_case no_cycles atf_add_test_case oomprotect_all atf_add_test_case oomprotect_yes atf_add_test_case wait_for_pids_progress From nobody Wed Oct 22 13:02:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Sm4Z5dz6FFYD; Wed, 22 Oct 2025 13:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Sm33lzz3r7N; Wed, 22 Oct 2025 13:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPa3/2sT6GY/M92rib61Bo+Of1N4KxF0rlO4OLHBhkk=; b=FZxqdiM+1iglvif6Bx8vBLhoHNso6NgQowJSTRGdpJKjtwVe4ohp8NhZ1LSXxqqf+nxJA8 lLPXZqeuN5W0giDNNeImc0PLwgyb9m2ZEOnCf+1FdXLgKYyQ8C6QmXh8eeQmhbEc9aTMbM //ZiyC9/CBlHuVA6egkmj+lbP00kMZa+CTmY+1BMBXmsXlHnWEEFtkGHLeFw3EPmlK4A1b dbAL/DI+nCUYsKdxJcDL+q8cXr567mnNKRlM8h/y3dzh9VJ2DRYRFzikN4vkstUodYd9ro rXnTaBFaChP1KTRxjcOyyxG3qjs1kZTn6LuZpctFarXY9cYyk01KAKtPP1B4jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPa3/2sT6GY/M92rib61Bo+Of1N4KxF0rlO4OLHBhkk=; b=EsSi8Ex9uZ6zTYKQ525apOlkStup/O86L1z1ZoAxHGOUbbvxWLVv0xwEEdJ5fKYyt9xHtu aJ6jaX3XBGYNWG7GC5tTLYohtEw9MZHv8+6777baMg2oE0GvyDvTVxu3ogIzERXbNZlfym uiRLphDiNGkD4QJDlX0j21KOSeglCqyZzXU3Rh6yK1RgTVNegIM0o2VYcd6pXDnOBPAoaY CtB9dJvIvFVnl0mQ7xebbFjzqJ4x/snOQ+hU0l2Gmfk/lchZsrFcwP1lQElT7wY2bq7ZQm 5L+yXQM0FmSCmKrYKUDyWWvvfKhQzETLxuPyY/AHI6EAXwT41mqK08J547iZbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138120; a=rsa-sha256; cv=none; b=CMGHa02RSmoYCLpWgRkUTDJp+ULXboO36KV528OJP5GR5dRXH0kHsXqhHfoDdxZyzkpi/E 0cxmCxiBR3koin436E6IC0thx9TG0eWUDXeydWwyr7nWA5Mx0IVMpsfCrrX90QYl3kaXPK mQrXcc9MjttHIcpzmXoMTM0ahFyxt+ikTxFYysM1YUXZ0ias+5crkLeXX4TJ4VPHQbKiJ+ je1UVkxAk7laH784MdZbMLJSL64LPHzgfl/rwQ+/FIlZfZQh5kRkJ+xRhxppj7Im44dU/T LjIa5mDcE/Rbjzvghg0yTfm7FtsgE25nmCydLxG9zWjQnlwfxl/E+VZU1sKHCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Sm2Xq5zVTF; Wed, 22 Oct 2025 13:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD20de011290; Wed, 22 Oct 2025 13:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD20Bx011287; Wed, 22 Oct 2025 13:02:00 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:02:00 GMT Message-Id: <202510221302.59MD20Bx011287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c839eecec5e2 - stable/13 - ipfw: Check for errors from sooptcopyin() and sooptcopyout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: c839eecec5e25c7a998a274107ab073444fc5d6a Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c839eecec5e25c7a998a274107ab073444fc5d6a commit c839eecec5e25c7a998a274107ab073444fc5d6a Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 13:13:03 +0000 ipfw: Check for errors from sooptcopyin() and sooptcopyout() Note, it looks like this code may be unused since commit 4a77657cbc01 ("ipfw: migrate ipfw to 32-bit size rule numbers"). In particular, it looks like the ipfw_nat_*_ptr pointers are unused now. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) --- sys/netpfil/ipfw/ip_fw_nat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 8920e8d3e713..bd33d73ed013 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -999,9 +999,11 @@ ipfw_nat_del(struct sockopt *sopt) { struct cfg_nat *ptr; struct ip_fw_chain *chain = &V_layer3_chain; - int i; + int error, i; - sooptcopyin(sopt, &i, sizeof i, sizeof i); + error = sooptcopyin(sopt, &i, sizeof i, sizeof i); + if (error != 0) + return (error); /* XXX validate i */ IPFW_UH_WLOCK(chain); ptr = lookup_nat(&chain->nat, i); @@ -1104,7 +1106,7 @@ ipfw_nat_get_log(struct sockopt *sopt) { uint8_t *data; struct cfg_nat *ptr; - int i, size; + int error, i, size; struct ip_fw_chain *chain; IPFW_RLOCK_TRACKER; @@ -1134,9 +1136,9 @@ ipfw_nat_get_log(struct sockopt *sopt) i += LIBALIAS_BUF_SIZE; } IPFW_RUNLOCK(chain); - sooptcopyout(sopt, data, size); + error = sooptcopyout(sopt, data, size); free(data, M_IPFW); - return(0); + return (error); } static int From nobody Wed Oct 22 13:02:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Sn3MMjz6FFkC; Wed, 22 Oct 2025 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Sn2fDCz3r1N; Wed, 22 Oct 2025 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djgK8BwR6Sb5zAoaXEkXANhEKiz+L9XJJeD/qEaCc0w=; b=A+8xSlW8g2W8iZsrVkfh2BVDOs7LuLB33m3fpJ8dlZYbLoJ5xQtVEeYnZ2m7MzqDcE6WZN ro7nNCwUPgGyuis1Ux3U4N28PdFlZuW99iiq+xiE7NYBEpI0UfskPrTUZyNhcCkJLV4vD7 SFC0rsjdWeF2fvnBkTQxUGEaTpkXeXH41EBIf2FGO41H/J6ffcOiwoARWYVfpYG1hWvk7g KsVwtvIHNWBb9j+2aeHqjjVWcyqSjfliEWbcCkax8Jn1ue6WNWs2R94IecE0qKNTS5kl+H UAZLYjE1zcjnhhiavKSME5Uy3eIoPd0/MW3AizFOwIdgGX2iZq9HUi4tn7AW1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djgK8BwR6Sb5zAoaXEkXANhEKiz+L9XJJeD/qEaCc0w=; b=A837Z9icUddFTFnvc2O2SBNU322Fh0nexlYOwDPlOJwdfAxfOJoinD75u2sPrWmjH/8PXO b0lE9KmP+b3/IFN0TKlu0RBDDnSQsrIvTkxzB9DJFRY3ZyOvhQpEgZNj/yRXj4injFBNL6 /uKhcD9VbFT5apDf33cjrP9zVwkFp8vZZX2nfrEG568F4JMJlD3raqWjjvVha6e75XwtLq jH1xcNWiGgOHSyKRZpj2Jn0cGLWtl+uTRy+QCJJsNd2Df5yuZkJevyhwfelLnbnpDqo9wj Kv53YbPjbVY/KuvoesUWOZ4qTZdpRsfkeYwgT9duQFfSBQ163W+8qgrQrt7ExA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138121; a=rsa-sha256; cv=none; b=OfVDl0oFtRe5l+3/8lokhK/mN0U2qw4QmUdTT4R6mcq+XJlbqTbbWKZdFvi0H3gUhlcQHM o+zJ7pFE+7HJ8/edAzmNqLNkUdE6q4J0eb0AkdOxOGHqHllVobWGjWZLg34Q85XOaaNuaX iGyMwsa3EhGLV3hp2vFqkCMM5UeUnjVe7teXRHbdrY5RpRq6SzL+7vFqdg8rThb5fifu37 EQ0khAnJ+49nzJZ7lzNKK/JolJyIoWC5cIVxzqFAhY046KlC58IUKNnXiINRcDngQwzEjt zQ2NGVedzXN1YgmC39MUylcrO8aiLckg+w8eBPU85dZFS8ZBy8wj4Tdsat8zmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Sn21fnzVTY; Wed, 22 Oct 2025 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD21KD011324; Wed, 22 Oct 2025 13:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD215q011321; Wed, 22 Oct 2025 13:02:01 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:02:01 GMT Message-Id: <202510221302.59MD215q011321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 43bf0f4cd2c8 - stable/13 - libnv: Fix a length check in nvpair_unpack_string_array() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a commit 43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:33:48 +0000 libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) --- sys/contrib/libnv/bsd_nvpair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index cfe168c38026..826b1c35cd26 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -984,13 +984,13 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, size = nvp->nvp_datasize; tmp = (const char *)ptr; for (ii = 0; ii < nvp->nvp_nitems; ii++) { - len = strnlen(tmp, size - 1) + 1; - size -= len; - if (tmp[len - 1] != '\0') { + if (size <= 0) { ERRNO_SET(EINVAL); return (NULL); } - if (size < 0) { + len = strnlen(tmp, size - 1) + 1; + size -= len; + if (tmp[len - 1] != '\0') { ERRNO_SET(EINVAL); return (NULL); } From nobody Wed Oct 22 13:02:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs8Sp4Mvqz6FFmm; Wed, 22 Oct 2025 13:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs8Sp3Bqwz3r7B; Wed, 22 Oct 2025 13:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qs52kzNeZDDKAwsSFrtsz81CtovvMoQDjz66+NG26Ts=; b=CWLMEpiE+kGGn4DO+KNdjcL/RT8MW6fcuNwMh3EIyYu6/mjDISd2wFJ6Lic+Je6bhCb74n fDI3Hn7HbOAac8YZqPydWQXycElFhXcI3l67CWm1FXQtZuVNPahvJTP1Vqm9qoVyuhQs3e wdcn5HbQxwbajuCBh5BgCFPj6z4xnRT8E62b7+mr1OM0EgJicZqYgWrj7u6oWtGyoAdsdq ttLd+K707BRyLu3ZwtA9NMkqCcSTyMFA7I4EKDpDcSQ06cNVfvLbtoVS8s2zHpaFMvbtFP QHMfxdakUevfEoIvJLt3KuTbMBwvjiahXYNFT+SG40PpKol6Jt75Cj0WUaJebA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qs52kzNeZDDKAwsSFrtsz81CtovvMoQDjz66+NG26Ts=; b=vVUq3T0ILCrmxXv7QuZj6AjstLho4AOlRjh/siQINGyjxCnRKahTsig9Ich63oBuNMLPLw dgoDXHwvN1r3wM5AkSmhwsukftxXoLO3WMv7LbXRxrnmSsBzLEHFfbWvOlgDygp4mzOQx2 mrjd/P3WXmbKTb+IhkcGBy7rH62Ofp7LS/nhoBdvOkwMkaeZjTkbNa9WPv5eJeoFZ1P7pd HOxqY3e65VJIrP33WHrP7Sa7evCf3yax1fcuUIKjTdGMvbeXuE4mHfwzZdpRJ4u83CV0Af /ENBCIKq6pJg8bsdqSDOwsAHGJzchUI3qJspq7aeJDA0GyqkUHnLJq8cjeECkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138122; a=rsa-sha256; cv=none; b=fg6zEcPKLWn/lBmEo+DtSkjqAVZls+HDRFMTrE0W3zaW2AQlEz4vzCAOodwD4MDWdBjc2j qJvn3rbUUDZA8IL5hqQ/7SQ7iSPIVW8bsSti+nq1FKN2tY+Dg0IK5i8XNwqrAcvCDn+cCn 9gJDBWder2s8rsUCYD7PakDJafraY5H1S89X8vYx9LPItH2K7bJ+Gn6VLm8BxB7/T7NsPZ nlcgDY2NUygQryx4N4Ajcqfjyt53nuz5Lrz+Q/u2mzY0KMhnlq5WRtVKsraQKHUCC/CBvz 3iSpps0VHpLPXpDUI+bPh/lHOg1JR1EKJnfULjnymGaHTWODnG/MtbSSqgx05A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs8Sp2fMszVTN; Wed, 22 Oct 2025 13:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MD22Ja011362; Wed, 22 Oct 2025 13:02:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD226S011359; Wed, 22 Oct 2025 13:02:02 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:02:02 GMT Message-Id: <202510221302.59MD226S011359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6e4767672a21 - stable/13 - imgact_elf: Check note body sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 6e4767672a21f89c070d351d62a8d75629fd077d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e4767672a21f89c070d351d62a8d75629fd077d commit 6e4767672a21f89c070d351d62a8d75629fd077d Author: Mark Johnston AuthorDate: 2025-10-15 20:14:36 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:34:07 +0000 imgact_elf: Check note body sizes In parse_notes we validate that the note name fits within the note buffer, but we do not do the same for the note data, so there is some potential for an OOB read in the note handler. Add a bounds check. Reported by: Ilja Van Sprundel Reviewed by: kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53063 (cherry picked from commit c86af2cc4cd12fb0174843b22d737c3b5b5d55d0) --- sys/kern/imgact_elf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index b27129a555c4..cda86cf48001 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2750,7 +2750,7 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, } if ((const char *)note_end - (const char *)note < sizeof(Elf_Note)) { - uprintf("ELF note to short\n"); + uprintf("ELF note too short\n"); goto retf; } if (note->n_namesz != checknote->n_namesz || @@ -2758,9 +2758,9 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, note->n_type != checknote->n_type) goto nextnote; note_name = (const char *)(note + 1); - if (note_name + checknote->n_namesz >= - (const char *)note_end || strncmp(note_vendor, - note_name, checknote->n_namesz) != 0) + if (note_name + roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) + + note->n_descsz >= (const char *)note_end || + strncmp(note_vendor, note_name, checknote->n_namesz) != 0) goto nextnote; if (cb(note, cb_arg, &res)) From nobody Wed Oct 22 13:42:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9MB5yd2z6FJ3J; Wed, 22 Oct 2025 13:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9MB593mz3w8F; Wed, 22 Oct 2025 13:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3tXiy3Xp+5GZaehvwaZsoudOdbgBIX4xqex/Z1moZI=; b=oec1k8QRFMD4xuAjZJSUSbR4mhJNT+aopu6/vvtqatr1wkZEVEaKRD3OllU7uNiKEo7U7B D8N4y6oU22dY6L9pPc2InyV7ZIIUpooaPIP3Ws9Tt60PY+POfvf2WmtwO7jIoY6sSBmMRn 8tW5N4v0WPH5eleg9YyquJspPeHX7oIP1ib/9IJGsWtQ7f2FNE2hV6/lAi5y1E7Z+ZfutN 1ApfEtKLCVDP7ZNvfkiTkhtG/Q8U4jm6qq/7KCme5zuF5DwuFZa+xVyDCCjXA1nhMSEpXJ Txy8JsUKwtp3xvB2xB1qybWZ8JhXCIN6yLNdzAhnYOM/URb8h2CA6ezGTiUlrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3tXiy3Xp+5GZaehvwaZsoudOdbgBIX4xqex/Z1moZI=; b=LRAtW+xOA9s9qwQ3AMjSVKM7zld65KXdsUY+ssOq8/Z3Mfx8u01KWOjJjrM3bQF242J/T+ 32MKb2c1dpzyCTHMGsAgfbOWL8VbxSwKsnO1AIgkG4aO+HFdKtZ0cOJyL8dOC6xYj/N9vk SG65rdSD+WiZ3ILKgGxZCYBk4D5WLH8ungWr55zpa8ZlZBwoPoef+qmewOdYsIWaFwGtaO BkzLSgtPZMX0wk5FW6KJ9awpLS2LTfrnMhQ71Udfa6qVlWL3bAIuxKfCLXAYcrCdRgPyZX LCUv01D9bassYQbLriaKemp24isoCK4k+7dvMhx49gfuED/pkb9t8DWL1yAfRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761140534; a=rsa-sha256; cv=none; b=xZkweCcBGyVrL9Rks23i/ZmTTp8LRBtEFxzWh9TqZTM/Z9an3AU4RHuj9G61VdDZ3aXm2h UrBTTiV9BR59ZyMUHJinDqZpIOit5GNjqFTf077HCSWYMa+Tog/srqmFwFyLUes55OTIZy IdmapcOpZhH8RFi0o8z3LmbS6nGcOclxvaE5TgDKA+w1pW2vigkg2//PKH7er8SC3C/GpO pGz2NwV0rNf0Pw8XWCTG+SWS4ZTqix0vBHaS6mfl5o1CMn/WjI6TytpFPznYC7kDNzxnhN lO7crgu6BeNF1uCSIhQbGcSCgOs0x//vGwVJdGVlHY1qXIitCXNalQiM8cE6rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9MB4h3XzWsN; Wed, 22 Oct 2025 13:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MDgElb090826; Wed, 22 Oct 2025 13:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MDgEcP090823; Wed, 22 Oct 2025 13:42:14 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:42:14 GMT Message-Id: <202510221342.59MDgEcP090823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a8079d40ae7f - main - sys/arm: add fp[gs]et* prototypes to List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a8079d40ae7f3cee17c94e61e43c24780a64a010 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a8079d40ae7f3cee17c94e61e43c24780a64a010 commit a8079d40ae7f3cee17c94e61e43c24780a64a010 Author: Robert Clausecker AuthorDate: 2025-10-17 09:30:09 +0000 Commit: Robert Clausecker CommitDate: 2025-10-22 13:41:54 +0000 sys/arm: add fp[gs]et* prototypes to We have provided implementations for hard float of these for a while now. Add them to the header to make things official. This is required for a bunch of legacy programs in ports. Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53156 --- sys/arm/include/ieeefp.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/arm/include/ieeefp.h b/sys/arm/include/ieeefp.h index 57dd058b8a95..57719b883d58 100644 --- a/sys/arm/include/ieeefp.h +++ b/sys/arm/include/ieeefp.h @@ -49,4 +49,14 @@ typedef enum { #define fp_except_t int +/* Augment the userland declarations. */ +__BEGIN_DECLS +extern fp_rnd_t fpgetround(void); +extern fp_rnd_t fpsetround(fp_rnd_t); +extern fp_except_t fpgetmask(void); +extern fp_except_t fpsetmask(fp_except_t); +extern fp_except_t fpgetsticky(void); +extern fp_except_t fpsetsticky(fp_except_t); +__END_DECLS + #endif /* _MACHINE_IEEEFP_H_ */ From nobody Wed Oct 22 13:45:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9Qn4pDQz6FJV9; Wed, 22 Oct 2025 13:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9Qn4KQsz3xjd; Wed, 22 Oct 2025 13:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KTtphldp9biVXYHhsks/eoviJhBXjZaQO5nRplRJP1U=; b=pd1xsEy9FOyEJ5umjXE31x1QmisSuatt3AYArB4gmBhJHyg97bEYyGxvcV8nO1Heb3URN1 wvsUisEbEx6wStl6FSjKOOeIp8jb3WYmbrZ7v7YLMJTPGcCz2oS6a/oFCIxLSb/HhkRSHm /J+bGC6PMPzitbcFV/g3Ti4dbO4mBcl+RWdEYKdgt7QT7SffVCdEQblf4zK5u9j3UgPR3o jqGJ/Oozy4/wDLkE5VdQwkbyceRconhhpYa9Aw4xxBH+6namVeljHc3ib9QjvyuDLzGdr5 c8ipySWetAIrCeLdu1+/mo1v8s3pHFFuLESk9DDatYl6LMEwfGkabO+6zYxN2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KTtphldp9biVXYHhsks/eoviJhBXjZaQO5nRplRJP1U=; b=x26xHCoN5+CTwTk0QY/XAbXjVeYGMkQUgdH1HOr/aXLTqse5CPyT2RPRBG7mH7x+c1rW3L jfn9PYIVpFJxRbmFrFwHitKczZiDymhmqtTPDH3Rps90pHBPfy47JQnQi2qn2l7r6Rfiyk E6CN3Bo+LE0+DdQ2IfPcqFftl9k0EVbIUtVNDpb+QmgTj743fOaG92A/gIW4VGZ0twWYTF MQRbyuzr3jslVIl0cKxXXS7EQ+cDJLte8naUqGIKjxKKGzMllE/bH8IW+BGLdx6XgBhHQh BDmXjZUdk/STvwQXjOEZFef8UdQ1yzgHbdxDsToXawR4iuMobL1NT719B9GsUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761140721; a=rsa-sha256; cv=none; b=ekiUd4LiLg6HmiA6ZzxOa5REDeKbVWt+ZwreuCIvLZQTyHEL7zNC7mPzVlE+etCvTkllQq hjLln8qezWBvOfzkLEqLMrPwaNj4KIy74Yixe5G+5xS8WggLtHWdsvIi0WW3zYZdfO0CpP IZQmsAhIil7WsQU8Jb8eVqsF7WzxtJEOmbLyWeP2eZWh1p7Px7ceH3ZdeRq4f9XQM3N4xQ ET4JFcwy/ayPQDKPeuHHkLMSuJDcwNUDfskhPK9cKXGO2dJDVxbbZN6zSRIEnH5LxhEuZ/ KfdherMOT84ohk1miZfywy8YUeQtOTQPQBA+1WpqvBgw40T+PDp6h1NLoF5Iew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9Qn3YTLzXPT; Wed, 22 Oct 2025 13:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MDjLQJ092940; Wed, 22 Oct 2025 13:45:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MDjLVE092937; Wed, 22 Oct 2025 13:45:21 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:45:21 GMT Message-Id: <202510221345.59MDjLVE092937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0625f470e095 - main - uio.9: Improve description of uio_rw flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0625f470e0956a3a337e4999f6712ec7b7d872e5 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=0625f470e0956a3a337e4999f6712ec7b7d872e5 commit 0625f470e0956a3a337e4999f6712ec7b7d872e5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-09 15:47:25 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-22 13:44:24 +0000 uio.9: Improve description of uio_rw flags The direction of the data transfer in uio(9) can be confusing, so state explicitly the difference between UIO_READ and UIO_WRITE. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52996 --- share/man/man9/uio.9 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9 index e6240c4e51d3..b143eb6e8e62 100644 --- a/share/man/man9/uio.9 +++ b/share/man/man9/uio.9 @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 11, 2017 +.Dd October 22, 2025 .Dt UIO 9 .Os .Sh NAME @@ -107,10 +107,14 @@ The I/O vector points into the kernel address space. Do not copy, already in object. .El .It Va uio_rw -The direction of the desired transfer, either -.Dv UIO_READ -or -.Dv UIO_WRITE . +The direction of the desired transfer. +The supported flags are: +.Bl -tag -width "UIO_WRITE" +.It Dv UIO_READ +Transfer data from the buffers into the I/O vectors. +.It Dv UIO_WRITE +Transfer data from the I/O vectors into the buffers. +.El .It Va uio_td The pointer to a .Vt "struct thread" From nobody Wed Oct 22 14:02:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9pj2PfTz6FKHY; Wed, 22 Oct 2025 14:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9pj1YHqz42dq; Wed, 22 Oct 2025 14:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761141757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RnVJfRjK3fVWSnhc2fdr4lkKXkwAi3eAA2rB6rmJc8=; b=iEzWmWDnk8D8BK8Hgm4mpC/TMPKm+Xdch2wZ7zI56Um44pme9tnBflhpATAkFrzP5QftXt PjJfMqMyMV31jS63Y3BgUW4GEPpnPGGoAQtpdblycAYDo4ho8wUvvFuI1x4un3sXcQdkfb 9jhhxmV0FjEoSFtt7dMDgYWZ2s7AgJkW7bXrZNFToTlZyeL9AKIvyxR0dNuuhqNeJj08op e1K18YAyddEqnOQsuNnLG5iakNzs1OnmIfwZNMS4LShF4FsSDU3HAKiNAgprHJaT4V3xho gdiZhxEmUXKKye76U9tnsGTBl92bG8zPb/JM2Kixvdvd/pBjoJntqP1tkZwxKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761141757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RnVJfRjK3fVWSnhc2fdr4lkKXkwAi3eAA2rB6rmJc8=; b=xEUAju6GLQCJVLqDmD9yoy0RIukGbVfz7IEpyYF6vdtepOxSll9Z+ORS5ZQ/5u0DQEva5z VnxRNfg8pMOZhNY5VL/T7CGuxeoMCsG/3qFbmKHzQN7emxiUWtEbo5hdXntbus+rn4vj7J gxaUq5xIu2zcnAyZZm0RmHkhpZyLsLu/n4JWhoOvkxPmA4IL43UDLE3uxByEhJ3rRM8IOM NOWSHY9kMHsGnowc8S+1QF0YCR7x7v4VeeJFXg+D3xiym8Up43NeWqg9N/yvkfpIQAmqsm +WiJcq2f9swMw52PCLQh4pcc43M3m4q54DdwICnUd8ASfPy924cdwgcFTXNGpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761141757; a=rsa-sha256; cv=none; b=MdfXVFbZNY9MPZFwUeIFNcbLv7W0UDMfrzYSTzvdHiylq13R4RXeAoQ33hUVQDZ95YOE/0 IQvTNPMbd6OoCBGLJVri6lu4K+3teCQk/JNprralc3qAphqjhj0ABvtAYc8mKJ4MEB29Q3 lZR243qxjJ66sNbBoSQoDkRCxNvUF4aRaWtxyn4HHO1zr2VuIOdjeMVfkng1k8vt/Ga1s8 jQ0HzngSm4QQf0aOThvGnDJVveekJP0PRTNeN5GWqIBGRZD/NwQsQ5tNfzC6uJBUfrnuDb j8fhJuWVDZLzv9AIIap8p2HEnnfQ3wTdk8mOK7UZzcF2UX7hw/hjrorncuQ8qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9pj0sMxzXXv; Wed, 22 Oct 2025 14:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59ME2bZR031417; Wed, 22 Oct 2025 14:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59ME2bc3031414; Wed, 22 Oct 2025 14:02:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:02:37 GMT Message-Id: <202510221402.59ME2bc3031414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5f2df8f83128 - main - committers-src: add self List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5f2df8f83128adbd2cf22050ca078f2e46bbb227 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2df8f83128adbd2cf22050ca078f2e46bbb227 commit 5f2df8f83128adbd2cf22050ca078f2e46bbb227 Author: Robert Clausecker AuthorDate: 2025-10-22 12:41:36 +0000 Commit: Robert Clausecker CommitDate: 2025-10-22 14:01:35 +0000 committers-src: add self With big thanks to Mark Johnston for mentoring me! Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D53258 --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 6035dd031216..3f3e39635c55 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -188,6 +188,7 @@ fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2006/03/30"] freqlabs [label="Ryan Moeller\nfreqlabs@FreeBSD.org\n2020/02/10"] fsu [label="Fedor Uporov\nfsu@FreeBSD.org\n2017/08/28"] +fuz [label="Robert Clausecker\nfuz@FreeBSD.org\n2025/10/21"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2010/02/02"] gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"] gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n1999/01/15"] @@ -789,6 +790,7 @@ markj -> bnovkov markj -> cem markj -> christos markj -> dougm +markj -> fuz markj -> igoro markj -> jfree markj -> lwhsu From nobody Wed Oct 22 14:07:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9wZ1MdDz6FL5L; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9wZ0njjz43vv; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761142062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUkP0w0axsrpOqF5DpgQge/N00anl9Wv7epoLO7doeE=; b=u6p8V2qVJZx7F6UzYjfU6RZGC7FuaezSEPUuQ4gx88rUWcEII76oFe4ISjkgSWjMOj+NUX mXaZhD2qaNPnsthg8H/LFvxbHpRtVVq6hqd2EI9yh1bszyySeff/pMQcqbXxZdqQGxU8Mv vJgiNpJlCbyf1UOwWg0Oz00ifjbADLwhbW14oLYsD+HEhy244/ygCOnONzKsNFbzZf+GlZ uFCswnXFgnFPT4IVX0nhB37DGJm0ksE99Qk1dQ72jqTRWr7t9TQdRxYrumx+u+rEUvQAi8 X0lgBPD+ohuBCpbBZ/3aw48pJRBO9nltm2QZNht/g35o6G2b9rPx3FDqLsh6Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761142062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUkP0w0axsrpOqF5DpgQge/N00anl9Wv7epoLO7doeE=; b=IEWhYBxwDLDx5edWS1Rc8sI4RIHhIKQf1J5+MWqHB3o7LMO0ftwCRP8vgmLxSf6u2W1Uoe 3DM38rXFP3JCRqPFb30TA/0vLsJnDOSR1JTz4U9nU3ONjS55pQRXZNFiATLrExN1WaXre/ BjW37dGL92+rZ5dRWNaq3QsEWwoZicn3HkIRQBkqxRdO6fytzcxsKVn1/fjH662RV3pO2S pbwsHYIUQES3U6snlp/rKRrIK5gbOjcwfEn7XhoN99pc2PvVyCn2f71qhE4NgS/E0dzCuE /4UsNjJwFkCuFU4BSCbrZsNnRfl2q5oPoScCyNgqj7TMiVuWigFyPJwFeRGjzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761142062; a=rsa-sha256; cv=none; b=xAHsQMVhN9o2yv2A7i2Ogrk7zyq3LzVlcHcfOHsndlhApoiIKHQSB2nhhcsqOZX8Aiygi6 SbOOOVY0hSedcMkW8PX+rT655GYKR+Y0LdOsVPjYjDRUSnN+T+y5EjonQ2mGcc+CtCilhp d3NucagcXiSt0bYDniqsP4CmnZOXnkVP1TDa6yHdNqQahlypT2R41rU4y2ldF4dBd4HwOI r8mHh7bpQrwm5cfX4SRP+vyuD0e/Rvou1iGqP0fABCJ1zx5kVSmSokrHEIfbg3wEgqmdou A83Yz7hvx9kUHU1TBsuF+Kefc/LIJBh3SNxe+egrwTD509rwQ4HxiZsz27WaCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9wZ0ML7zYMV; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59ME7fcX032998; Wed, 22 Oct 2025 14:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59ME7fDa032995; Wed, 22 Oct 2025 14:07:41 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:07:41 GMT Message-Id: <202510221407.59ME7fDa032995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3e9ad70a30d9 - main - linuxkpi: Fix the definition of BITS_PER_LONG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 commit 3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 Author: Mark Johnston AuthorDate: 2025-10-22 14:04:46 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 14:04:46 +0000 linuxkpi: Fix the definition of BITS_PER_LONG Don't use __LP64__ to decide the value, as it gives the wrong result on CHERI platforms. Just define it in terms of __SIZEOF_LONG__. Make a similar adjustment for BITS_PER_LONG_LONG while here. Reviewed by: bz, dumbbell, emaste MFC after: 1 week Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D53135 --- sys/compat/linuxkpi/common/include/linux/bitops.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 00dd1f9a1ec0..a5a7abd55287 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -37,13 +37,8 @@ #define BIT(nr) (1UL << (nr)) #define BIT_ULL(nr) (1ULL << (nr)) -#ifdef __LP64__ -#define BITS_PER_LONG 64 -#else -#define BITS_PER_LONG 32 -#endif - -#define BITS_PER_LONG_LONG 64 +#define BITS_PER_LONG (__SIZEOF_LONG__ * __CHAR_BIT__) +#define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * __CHAR_BIT__) #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG)) #define BITMAP_LAST_WORD_MASK(n) (~0UL >> (BITS_PER_LONG - (n))) From nobody Wed Oct 22 14:35:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csBXz0WzMz6FMwL; Wed, 22 Oct 2025 14:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csBXy5ggkz48XT; Wed, 22 Oct 2025 14:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761143746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNArLq4w1/n6Ak7VK8cKuttwwWchurJrBbZmstspOhM=; b=nHjrpuoOw38Vl41ikLJ/6S6WLyr+z7fxNK2iXKBV2vUsRQPAVspjlwDYvt+GKTV07XYZAe +58KS+seHjKGCKVmrEHyuJsWiW1i6UDQNqFafyCC662nbXJzgAtxXyWgtdaB5fRm/yWgO3 s3NsfvWngyyGQlw3q2SqtBlUbsKXc/brvCoA8oQxNlXTUU2zBC9Boxd9rDjcmijfKSoLN9 sPQd/w6+fHQw+rxAcPOezBQenED5T2QAZM2ECiC+sRDX9cB3hgjE5zW00rDj0T0gOWQL/q rkW5pSUHIWJM+QvygboT1loiV+Bhub0OEyIHlOFpJsvqTa0aAKQqq6ya4JoGPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761143746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNArLq4w1/n6Ak7VK8cKuttwwWchurJrBbZmstspOhM=; b=RnbzNhEzj7Z/DDPl7MY2eK+U0Vd7YB9rjucd9UVZ9qHN/oHEczSra7aXZa9q+W1mDjpyx8 qzVby+biVa8mLFjEvYMvWXSeMFg9Xj3alAnMPdB4mGDWHwnAa2hABgBnB8ILHrd/XLOWYP GDRJjNRFWGgdArmT0iqewkqVrx5U9SMoylaPNYZrzMUr5anRKvowezOp615WbxsVcTo7Fr PmnrT3Vdv86D9Fjsn5y7bUOKw1Pg/yv1U2VQgtObc2t5Dshwn98raRUEfYWz/VCFoXSu2E hes3L16UdXRgsvPJ/Cf5d3MJUiJTZTOiqmGkxxAvfCY0yLM1/AWxpiT9WN7khQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761143746; a=rsa-sha256; cv=none; b=xdwvP1ZpTEwvjGUeaGt6Q8ZwUe+5k3U7YxKDv/d+U2Lyx/Kye0aQI4qimVTAeWh62IkjnW ml4rxvNi7f2xqNppQw6eDxDp+wHYeVvCa7720x3Thxe0puRGiOrDSGyOKSGdDj3D+r7Eo1 z8lDQXxC6dZ/NQzqtuyliha/jHxvJDFJEtT2cr9EtHs3hzsYcRny0KJ33C2b4kupXiRfZI OZM88teWnRCb8J5YXvjFuTFBLY628TRw1fBs43wGlQeshgBgYimZRMfQGZKhZRB+TrWfzh S6mnF6vww9iwcD0sMvpDvaekV4D4DTfXwFKUv+Z4dUZb0XT/lQl61wG3BfIM9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csBXy5GQszZ0c; Wed, 22 Oct 2025 14:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MEZkD8088939; Wed, 22 Oct 2025 14:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MEZkwn088936; Wed, 22 Oct 2025 14:35:46 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:35:46 GMT Message-Id: <202510221435.59MEZkwn088936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: fe7954d723f8 - main - modules/allwinner: add nvmem_if.h to SRCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe7954d723f85abd6eaf035db92a3a60a7803eb4 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fe7954d723f85abd6eaf035db92a3a60a7803eb4 commit fe7954d723f85abd6eaf035db92a3a60a7803eb4 Author: Mitchell Horne AuthorDate: 2025-10-22 14:29:37 +0000 Commit: Mitchell Horne CommitDate: 2025-10-22 14:35:25 +0000 modules/allwinner: add nvmem_if.h to SRCS Ensure the header is generated; it is a dependency for these drivers. This fixes standalone module builds and riscv LINT. Reported by: zlei Sponsored by: The FreeBSD Foundation Fixes: 5522519731b7 ("modules: enable allwinner kmods on riscv") --- sys/modules/allwinner/aw_sid/Makefile | 3 ++- sys/modules/allwinner/aw_thermal/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/modules/allwinner/aw_sid/Makefile b/sys/modules/allwinner/aw_sid/Makefile index 7d3dad68acb9..2679aa83d09d 100644 --- a/sys/modules/allwinner/aw_sid/Makefile +++ b/sys/modules/allwinner/aw_sid/Makefile @@ -7,6 +7,7 @@ SRCS+= \ bus_if.h \ clknode_if.h \ device_if.h \ - ofw_bus_if.h \ + nvmem_if.h \ + ofw_bus_if.h .include diff --git a/sys/modules/allwinner/aw_thermal/Makefile b/sys/modules/allwinner/aw_thermal/Makefile index 911e6406d947..924b09a3b3c8 100644 --- a/sys/modules/allwinner/aw_thermal/Makefile +++ b/sys/modules/allwinner/aw_thermal/Makefile @@ -7,6 +7,7 @@ SRCS+= \ bus_if.h \ clknode_if.h \ device_if.h \ - ofw_bus_if.h \ + nvmem_if.h \ + ofw_bus_if.h .include From nobody Wed Oct 22 14:56:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csC1D63F5z6CgDl; Wed, 22 Oct 2025 14:56:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csC1D5RzFz3Dyt; Wed, 22 Oct 2025 14:56:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761145008; 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: in-reply-to:in-reply-to:references:references; bh=xK47q+n7XckegJw/lgfE69OnQ6b6ZHgWAdGcTwq+30s=; b=bo7mzx/15lRm9rYxTR+NVmzzxJLMFfCneAhg0QLBPPgO6Vt3w7KqfVXW8E6MPKA51SLv4P LMll5XtvUhMDBUV/PQacaIr/Vi4SeXqy81NuyR+Zu0TnlEIxvnZlP4XrQHKsZjEohyWjBN S31n5n1BeobVHRHQd/2uZKIA6ZWqgAxFtFbw+gH4ZE7ViqYcUYaCQtr8nNW8wxv45pihNe 11Z6vnuetOS3f1R0ojo66+IyNX2EKfEuThSW8esH9Vlk5DpanCijqqB9OIW5FfqC8RC6K3 Hod0ruSs82Mg40pms4w7dDutjpWYlD31Ygpuf1wUuncWX2cls61l678hRxAVzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761145008; 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: in-reply-to:in-reply-to:references:references; bh=xK47q+n7XckegJw/lgfE69OnQ6b6ZHgWAdGcTwq+30s=; b=ozWsd4wOuCdaT++C/mxXtffzMg1OAKpq83NDd5fbkw8XbtGW7J9V7iOXhDUJy37UbVN+ew P0aPdtJA0xAjQ/rzDDxm/VwkmbptVLUqHwaWz1VeQne7S8hvmPS2cijOkya1CkUXOw6m2V YRUhKeStPyLL+donvWNVcCvFp4nhL2OCoRQZ2TJDjcAe4nw8aAnjKmf9Dt4PvJU5Hw+E/A yV7V5khS8lAlxeRv99EwuHCLgve0J+Mq1yWs2JnWRCsQnmJFVFegC5GtrXZm/vskqkFKez A3s5n1Rh7P9LdwgSPMP2C5qcmAEDjwik4Dq7czvYfrQCZKHs93dK6OjVAtEl8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761145008; a=rsa-sha256; cv=none; b=uVPG791PTzsY2WUH6f2fGRr0ju2oYAgmVZi7AbviyY5Xzpkm5uxTm32fDZFM/OKZHeOYb0 f1e4187YyAmA923faBJjqbPR/UvPdlEP8B3+RbRdobdHcjJx5dCJFS2Dtcyeku1wPWrQsg tgsK/sWOHjmntiszsMv97lYqxRIQiGWNUndJ27/nii8jIJVv4DDUg90pAqw2onW2ecafxd OEEmUGQBwxyJEih+iPxc2nN/pDT1Wusay76sxQtWbC9wdktZ3IeFzCKYppmUvcO1WYasky 0PNh60RoKbiUHfP10l8D3qrObOZ1Nsq2GpkiMuWLmmV6rw/cVuSOd4gP3IljRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.2.224] (fctnnbsc38w-47-55-39-231.dhcp-dynamic.fibreop.nb.bellaliant.net [47.55.39.231]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4csC1D436Hz1C2s; Wed, 22 Oct 2025 14:56:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <9ffa5243-7b9a-482f-93e9-d929569070ef@freebsd.org> Date: Wed, 22 Oct 2025 11:56:43 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> From: Mitchell Horne Content-Language: en-CA In-Reply-To: <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Thank you! Fixed in fe7954d723f. Mitchell On 10/22/25 02:15, Zhenlei Huang wrote: > Hi Mitchell, >=20 > The riscv LINT kernel build fails with this change, >=20 > ``` > $ make buildkernel TARGET_ARCH=3Driscv64 KERNCONF=3DLINT > =3D=3D=3D> allwinner/aw_sid (all) > cc -target riscv64-unknown-freebsd16.0 --sysroot=3D/usr/obj/home/zlei/f= reebsd-src/riscv.riscv64/tmp -B/usr/obj/home/zlei/freebsd-src/riscv.riscv= 64/tmp/usr/bin -O2 -pipe -fno-common -march=3Drv64imafdc -mabi=3Dlp64d = -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -DKLD_TIED -nostdinc = -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/home/zlei/freebsd-src/ri= scv.riscv64/sys/LINT/opt_global.h -I. -I/home/zlei/freebsd-src/sys -I/hom= e/zlei/freebsd-src/sys/contrib/ck/include -fno-common -g -fno-omit-frame-= pointer -mno-omit-leaf-frame-pointer -fPIC -fdebug-prefix-map=3D./machine= =3D/home/zlei/freebsd-src/sys/riscv/include -I/usr/obj/home/zlei/freebsd-= src/riscv.riscv64/sys/LINT -fno-builtin -MD -MF.depend.aw_sid.o -MTaw_= sid.o -march=3Drv64imafdch -mabi=3Dlp64 -mno-relax -ffreestanding -fwrapv= -fstack-protector -gdwarf-4 -Wall -Wstrict-prototypes -Wmissing-prototy= pes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=3D= __freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno= -unknown-pragmas -Wswitch -Wno-error=3Dtautological-compare -Wno-error=3D= empty-body -Wno-error=3Dparentheses-equality -Wno-error=3Dunused-function= -Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value -Wno-address= -of-packed-member -Wno-format-zero-length -mcmodel=3Dmedium -std=3Dgnu= 17 -c /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c -o aw_sid.o > /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c:48:10: fatal error: '= nvmem_if.h' file not found > 48 | #include "nvmem_if.h" > | ^~~~~~~~~~~~ > 1 error generated. > *** Error code 1 > ``` >=20 > Best regards, > Zhenlei >=20 From nobody Wed Oct 22 15:41:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD0K3Gsyz6ClFS; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD0K27g4z3L9w; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761147665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yy4KtyTgZPaPks0jwu0gjoKB4gM1SW07IhLHZ1Jvelg=; b=af/l0gqsqJ/svvL8xhpqe4qUqAhWgYbnsVBYrfG411978aSVFQqmU/iWO8XcHg5ACAIf3i QKmbR98jTkDUbN7j1Wg/Ma0SnVJvZgXMowLyh4MjZbW7IWS1l2n+EdiK1//VGG8/WpujCy HBqL0mROLB0VFf7Z5dBfAjdOSZr/2eLsSEnBeUhWV3RpqH34HLvkLipMpXbLbIjsbniwJS ZCx0ft0xHCi5ODXSHJ9Lu2Ww1o9oZ1erND3huSGel5L3fn45RyL6CN3DAfJRZMq19SeTon Ge0BJrbujthNYtCkvQ2vgvskqSnqxET0qyfvx+3zA/+XN/8uy5TXMeOdyLP90Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761147665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yy4KtyTgZPaPks0jwu0gjoKB4gM1SW07IhLHZ1Jvelg=; b=ln+E38DNglxl3BJ2EgUeHEbzYtCeXE3Yi/Szdj0xg/g5dnlxpLAkcGrFi6dTB1u7MUBRN3 Gogr6OuM/TJEln0hQWTigLZ3v3RqjtJwwvdSE1w9tmNwWkvurCW6Uh4qTSboAo6XOLrTHz OtH6AYY6EFnGZTzDUM9rcc2MMMPPXFWSeF8Z5BfXznSM1O48F6w3QDe0qtYXAYnxInDScd BFspeRWLNneNpodECep2Qdzmt2IkUqaoheu5t2ZqRvzDQHBsw0W2QXt/OQK/VvEVf8wk2l FTzTpwCX6iMElg7en5LkPJjNy4EC0ln9+5DZaJi7TF10jQhr3u3muuLSKgZifg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761147665; a=rsa-sha256; cv=none; b=xZKhVM1ee9m/soMOPwzmhdKNTb9WQaO0k8A+uu2euCqR9Wazs4FGWWL/WVVkYp7+bqdvlw lSxAVa2suQ5j/A/VTWGTG546Q2DNpnSb0MfpzQ5rQsF/Ss4Wr2tVuiknIPEJrzdM/LL3eZ dUmtC6hN8gsbJdOOhWg9qWwh2bu70M/7Eqdse23Tf4cQtq1JeLPmg1eTLL2ge7HquqnfcR p9KUZXyu5dc3fb2VHDDgFoauonw+3xBJRUwJ5qHA+ZoAQwhUGY3m4L1EIPasDDDlXm6mpV /5T2QX3iJd+WRSHqDSNYF8sZYS5+XMNPtsen6bPRz7a62uYHcMyjVRp6uJ/RDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD0K1VYszZsq; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFf5RK013921; Wed, 22 Oct 2025 15:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFf599013918; Wed, 22 Oct 2025 15:41:05 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:41:05 GMT Message-Id: <202510221541.59MFf599013918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6d0001d44490 - main - nvme: add support for DIOCGIDENT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d0001d44490becdd20d627ce663c72a30b9aac3 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6d0001d44490becdd20d627ce663c72a30b9aac3 commit 6d0001d44490becdd20d627ce663c72a30b9aac3 Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-10-22 15:39:35 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 MFC after: 2 weeks Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 3a1894bf754d..f212759a5500 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1253,6 +1254,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1495,6 +1514,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_CONTROLLER_DATA: memcpy(arg, &ctrlr->cdata, sizeof(ctrlr->cdata)); break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } /* Linux Compatible (see nvme_linux.h) */ case NVME_IOCTL_ID: td->td_retval[0] = 0xfffffffful; diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..a759181a8c16 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -88,6 +88,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 52e9fcbbebcd..04a47d799350 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -563,6 +563,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Wed Oct 22 15:47:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD805xKQz6CllM; Wed, 22 Oct 2025 15:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD805LVpz3Nq3; Wed, 22 Oct 2025 15:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqAjFA2fOykKoW+cEsaqiLOUt/4IP29DmHCWrJWQrK4=; b=LJe6upJvKXlwrExF4MDHpHnSHcl9a63jbxJ3WpHock8luKzFOK6NZfpXYbRQlZfpp56Vky 3Gc4Y5shDfAAyBhc9BIXdNoV2fgMGLgUSbf3nKoYvd6jo+PZCCgV/g2eZv9/D8cpA40MQS KwMpU4GDUujGNnRs8/nvdYqqlvClXJ7k9A24Vs61wXTQr7W7VFxBndYjtJXUXtI7CHp+7w Z8KntAJ+jbVP5TVTCUCL/wNim/KeodFWKB7BJQ7a1KCQUKa2f5tCB8E/7DZlnRLOiKeEM0 AvcpUvEL/1vpzOCExrAtlzBNvdLTurtLNrEAR8gp8XhoqRoXshh1aEmkXIxrng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqAjFA2fOykKoW+cEsaqiLOUt/4IP29DmHCWrJWQrK4=; b=M4c/FglLXSCOGmVACvnbvd5/PFgwxTA4UdmUVKcDGo7Y0KjzHW0TQd/fcFdYLXFBIVAsBs WISJHRbndZRrsxEWYf9fRY8mkRYtx26zqRwGquMDJX9r8LscWuJLGt9EN5kI3jLsK4PRwU TQZXsMhiiSHKbx7RN9HlAvAVgOBhHZlyJHZmZ63x04aNX8vJ7TKW1LDIz8HulcxSBSSACm QLWA6XhexoSBfpIZE9TSc0hsUs5jTGHFhpzSaEgOanPEwPaL8PazxqppYfv9m3/2qZ0H02 peiRLq+KSUVXVLJJWEdgqVU7yVYiDxRhIJJX1Lv0i8caBWgwCPMNbqWdT+wI0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148064; a=rsa-sha256; cv=none; b=cGL6SY4DM7/CBYjn2a7xFUlG+Om5I+v0Eq0Tv+0FzL+TjjbPPh+wT6s5jNVavYNYUYfrPS 3EqlJF+l7PZWoStNKXW55UfdlbwafNwJLAhJ3Ib9PUOGjLE3xsYhVEygddGNtQw9lTrw29 tYlHWMs4C9pQMdoQwi+8F80MhKyzbSuIkBLpGBIdmS4wA3ahiHxVwvAK8zPbkXzFDml8SH SsSvdvlQYXMU+XvZrC4A9mc2BtVbkA3JRC6hEFgOKT2JRxpa6uVgTPJcFrp7IaDsWfVul2 ND63Bei/0Yx5WbhJCdE5Ogb86M8KGjf4eQkRXOFRZFB/uwgiapZu1+gm1koaJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD804YsFzblj; Wed, 22 Oct 2025 15:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFliEO021821; Wed, 22 Oct 2025 15:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFliDN021818; Wed, 22 Oct 2025 15:47:44 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:47:44 GMT Message-Id: <202510221547.59MFliDN021818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 320ad3dec5ff - main - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 320ad3dec5ff1b37f6907a47961c18b9d77e6a53 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=320ad3dec5ff1b37f6907a47961c18b9d77e6a53 commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:42:49 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 --- sys/netinet/in_pcb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dbe48242381d..712ff28768dc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2665,10 +2665,13 @@ in_pcbinshash(struct inpcb *inp) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2770,6 +2773,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified. From nobody Wed Oct 22 15:47:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD815Zfgz6Clqd; Wed, 22 Oct 2025 15:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD814zPZz3P3Q; Wed, 22 Oct 2025 15:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1zXXjPnVxmgiTZE4GRmY7z3rTuD4b17GSvdoGVSP+M=; b=Ie2u94E6E42cKaFWB/jl4QKnpc50W3iCAlTpuEEusHSYou3Du+j2gDr8C2WOPxDO8amrti LLikmeyxKGusg5Gx32iVkKZNTYaZK8OO/ftFaMZox5ODnAPZx9bcZV2LcCCivMCqnIVPtN ZdqftEg/N09DJJIq7eSsOycjXNAqnNl5X9fTM1t01+uyyDeEhR0tBAnmDTESP8bpG88nwx gDKgM/D8SbzgOEN6rtQ7YgGwyigkLlBaDAliWhUQQT7om7c0i2o5mFy0TwYdiDxvy834GZ CK9hQnfCUPGhfSkAyTb92ib0P9RtrITCiOzIXZ1n2hnp9zC5+Xol1dQo+hrC2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1zXXjPnVxmgiTZE4GRmY7z3rTuD4b17GSvdoGVSP+M=; b=RGdxxHH0QlgLveqvIZmAc2Wfg1TIwREBMogi3bOb6FGI19tV67eJC06gwgGEtOoC1495yo dwJTDI0LfNyoVxTTOEr6/sSFnIKO77GTi/becPt7W/7CHWUGMYDBrzs10y4AjBz+zKWV5c +WBL68LfHUtPNSciOH51Kw+hnadpoWtyPlsq7Ok6iwbtngZxjFpzaUQf3tpX+QtsPvwk5K hR/QI8wbYCjxZ8m/53m/2k4zasL0FPC8LJgIKnIceBc7KnOPDIz3zUBe+s4V25sHybASil LzIh6hAABAmGY2IcIgPcEMSkSGHYZL19WGFAhPO6NFprxupCperPDWeDQ44QEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148065; a=rsa-sha256; cv=none; b=o+Rbr/e5zCCU7HXY2jyYe2HrdFDk3UeiYlgWWID/phytu0omTqPi9KDeEiInz7++UkFotf CCc+n33sKp7+nJBrZ3lVP/gQAqlCerQhk8O7isLgqtoU/GqydCMI6ltOEhbqTghivXB/jR b9yNIZxKc0Sm73mvKOhZmWE9LDOaPbg8YsItPg18BFCn88mJqTCmHbXtb+qT4OD9bu9VQj k0CQFpLS4X7Ysb0M3s9qW1gCdTAFWTomDojDrAWVl+HzIwRUTJKrnFVUbAJzvKArRbC0VH Hdrtzy8uRkBuXPiFfimw5XWpRFveD25TsC6jHACpNkGxpWMBQrCz5AhFPyLJRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD814bS4zcGT; Wed, 22 Oct 2025 15:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFljBU021857; Wed, 22 Oct 2025 15:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFljGG021854; Wed, 22 Oct 2025 15:47:45 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:47:45 GMT Message-Id: <202510221547.59MFljGG021854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1dd66c6ac2c1 - main - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 1dd66c6ac2c146f540b2ff825fbee442354aeee5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1dd66c6ac2c146f540b2ff825fbee442354aeee5 commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5 Author: Mark Johnston AuthorDate: 2025-10-22 14:53:28 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:42:50 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 0479bd070ca6..393a626af5a4 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -556,6 +558,150 @@ ATF_TC_BODY(connect_bound, tc) close(s); } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); @@ -566,6 +712,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bind_without_listen); ATF_TP_ADD_TC(tp, connect_not_bound); ATF_TP_ADD_TC(tp, connect_bound); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:48:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD8n30fXz6Clj2; Wed, 22 Oct 2025 15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD8n2QPNz3Pn0; Wed, 22 Oct 2025 15: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=1761148105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYW/6/sxcxEqwp56cxRjWBpV06U1P/46E5QCWFu1wfY=; b=HjBdPkl4Ojx4espMYY5Xb2uvjvCvth8Jt/ntvM3eV3ixaK4aljFkAgaqmzgRvkCYJq4SFE g/sdq48q9bTggzyyZLlbAcCvDOA7zFp8D6d9Bt4KV5AuI3mRCryBddMGd3lAWmKBGjEl0c wj2WrVLHrMYXLd3rS4lKB5kwyDv3w5tPHuoeTyyHtMoAlfUAlT9BGn9d+pc2fl/IeJs9xq VgrmJB5+I/j3YKwUT5kHtefhnVabSkLTb7meey23zw/+10FYCy2LFTzsKxsBC8jA5bB6PC kraznTcEmaNi0+UETQJCm4PdX96b9PeyY50FESzHfJXA71iOphOQ8tH9Efe2VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYW/6/sxcxEqwp56cxRjWBpV06U1P/46E5QCWFu1wfY=; b=LIc8JZ/LMQtBjXedCD1TKNO85Byx0quQM5g19mXsVumwg0NpsbK4pg23Vh6xxGowcwjyD0 Q1dIVxgtve/zg6nY6mU4FRvcnOZG+C6+K5EH90hOoBTJ2HJOQjERhADeuXXLSMAJ8xbuj8 hqttC/gRIcKpHNY7iWGwJUuKycpGmWQy5nX2utpdrJsh83iKsEWIVNX6QjpcSnNhDmHvQl ta0M6trpgYoZPPqlH3SJAZrx44jme6FvGIGBQdbeD3zi8jqomg7ZDPgWnG7GUu8b+++k9e ejuDBmVsj6Eskvtjh0ykeVv5CJ3OGs8UdKVCD+19TU3qgN4EYl2zYpka/B60IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148105; a=rsa-sha256; cv=none; b=q7a1c6vWE3LL+FA9o5ABaY0eLpHyBafyZmJskM6u4Q4A3tGKLdOx+rvUksDrdSbj9oiyfG 8gzlKrpexzT8W4VsbuQCP0LT6bocTA/Mkec9u1nQUPPK0HuR6kyB9INh/Nl9G60gpphJET ttM5JPOcf2elrf0AatAAfWFIsN7p/249dkC0yOlSFv5gKpqlfo9VvHQMet4thPLmlPLUtf FFVzj++FNwRnPOduLFPg6VVakL55YdXWiOk/oARCgO4TJOpY6yrKAYTNAlpoFcTKBNDDwE PrqBelgEaHjP8R1LIe61J2XWfsfpKt2D465dMACOsyEsfiTw5Z9ELM9gzA+ZPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD8n1rdTzcD1; Wed, 22 Oct 2025 15:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFmP2f022169; Wed, 22 Oct 2025 15:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFmPtk022166; Wed, 22 Oct 2025 15:48:25 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:48:25 GMT Message-Id: <202510221548.59MFmPtk022166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ef159100ec2b - stable/15 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ef159100ec2b73c22caccc00555bae4c3cbc0ea1 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef159100ec2b73c22caccc00555bae4c3cbc0ea1 commit ef159100ec2b73c22caccc00555bae4c3cbc0ea1 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:48:01 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) --- sys/netinet/in_pcb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dbe48242381d..712ff28768dc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2665,10 +2665,13 @@ in_pcbinshash(struct inpcb *inp) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2770,6 +2773,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified. From nobody Wed Oct 22 15:48:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD8p4dWyz6Clqt; Wed, 22 Oct 2025 15:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD8p2pVlz3PnB; Wed, 22 Oct 2025 15:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZx5vxzL5gidKhI3ObHWOnXV2w3W+t13B1Z8BMdHh8E=; b=US3CTlUMXE/ULro8IxwV/kRp7JL64Vb0SVyuCmwPXDvhjJK/goKEppuxDhr4Lq4jiHwwXx nupcDdJYY3vD000VgwywolI4wpqO0J+Y+6rc5bGmZW1dWAGPbYNaETXteLWVzKUbUnRwMc a9X5EwCEijBD4hmfKriBSteoBz9FuS3P9le8xJxHDms8F677mzSBVG/EWmkm+XJNWpU4dJ Z8vaBnYv13uJOgLtDNmss4jdgSS7AhNaX0sz0ksaXiIbFqnvXCb9l8Z8erqP9LYN5nK6n0 q1YavwBqBWh2SzdoCpT2oZMxw82PrF9x+QVydtaJdf9A287ZVB5bqY1JrnNiaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZx5vxzL5gidKhI3ObHWOnXV2w3W+t13B1Z8BMdHh8E=; b=FJTl6kgLIUNfnn8eT/t8/6H2gBs77F5xBPkb7066bwXji+wfr0vGMmBwCRdmr8Qur5YpEN P6rJc5t9TmouES3KRA9XXszMHcdeS2TaAG01PrXS05vPzvmhYozndQ2HJa3Dv7mGy31TC2 o+4+Pkpuodtu8OOofjEDpQHeGdQvpUIlXEmcTTxy4N+SGT4f4Ta/YKxaBuzUlGGZqX9DAE HLexgVzhd1FcJP7pCHkVqCFLXWaGuJTQ8IVAuMAk83EwAQ7Hr/0zgz9d6exYXD3odDTwWz aqtVqiEt/R+jK1GsZklDpPEhLfel8R3UX1pP7HI1NK5qTwVS1FyoZcByyB0sdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148106; a=rsa-sha256; cv=none; b=uIKg9loiKZmn0Wz8xMCFDzGGTjmYppowaQcqvZY+ROksoiyPKP0xIcNXz9xmiJiNiPDGJs jUhO8bCaBapHPXMQIJ0J5QoTiZeNfnhDffUaeehG7FvFQIIqT7CoZsWp58uxo5LiQKaSft W/pkB+b4MUtRdbYtQqZxerNRlYetqqxsPCWZug7dchm0RvXPTNe/f+b1vuR1BgcafnSrmG UkibyqtDQBPnMdCCyUNdlqheUDgxlk6qaADeHkxdGnq29EfZlgZKGzL3eVXSOZfuMsmjvY jWu4MC8OgcmuOm0WYOn4kfkSDoFkoS4A6yeEnMpxMHqY1jXhomnKrV3UvYUKew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD8p2MQYzbnJ; Wed, 22 Oct 2025 15:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFmQ8g022205; Wed, 22 Oct 2025 15:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFmQ7U022202; Wed, 22 Oct 2025 15:48:26 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:48:26 GMT Message-Id: <202510221548.59MFmQ7U022202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 25e065774302 - stable/15 - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 25e065774302591b43a263a78362a816f799f715 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=25e065774302591b43a263a78362a816f799f715 commit 25e065774302591b43a263a78362a816f799f715 Author: Mark Johnston AuthorDate: 2025-10-22 14:53:28 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:48:08 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index fa9d6e425884..31d20160cb5a 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -551,6 +553,150 @@ ATF_TC_BODY(connect_bound, tc) close(s); } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); @@ -561,6 +707,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bind_without_listen); ATF_TP_ADD_TC(tp, connect_not_bound); ATF_TP_ADD_TC(tp, connect_bound); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:48:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD9H4wP0z6Clsw; Wed, 22 Oct 2025 15:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD9H4F30z3Q3N; Wed, 22 Oct 2025 15:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESWHPGti5hrGUyHJegxggkZu89qJViHg286e+0eC2PU=; b=Q1OJqTUQiGhmmAn305VIH3mkfjqoqjHW5GJdx0o6LhcHu+SYJ+/dXfPT6OTe62OaErHusV A6D5ZuxvDoWarCBiUNQXBRDb3sRxupjHRGuDmiCRFZvs31Lh3N+LQkxTUoeNQCpvUEyS7E KJcU+K7axW0v0tOcQT6lHyTIwxOoLs7KqUMHyzU4YKAWL+6ZEuTRGAo3YS3a5mIxUo702t 0VR7Hr8hRpk6QCug0pczmg7saTm0d6zQOHzYklfNCCa+deiSAurxw5fmR9zQoJFz1/yuZS rdZtLoG+zh212hTwE3o/Elt7N+JBwbWFT/vvUUgrltUmVQ4CKPzpqOCmoHstLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESWHPGti5hrGUyHJegxggkZu89qJViHg286e+0eC2PU=; b=baANrjX13QcnwaOLPylznu6E+4HSN+jIH0x884l584baIHVg7zrLWYPz7B6mDjn/qyKDU2 pD0rydVfBT/679yO8NKdCcZ56eMuz6NDTnWJL0PC7tlPQ9Hur9GxDR9JCUsuFcUMn4WB8H nwslgVD2rOgei94yL2Z1pKD6TpFfhXJbtDjn7txYY6LEzIV29ty90EvZsUI/FgnoO+O8yC zn20BTjSoqUB3sSdjji1vhimXKnNSKsVT8zWg+MCnG/uN2+5C69QgGSCovGRjDl3+c17J/ adxhDws6mski+W5exY/J24tfUldBtVCqzgCOrOyfkBay8MPPu16jHsXquuhaTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148131; a=rsa-sha256; cv=none; b=xhtYk+bXsJZf1QRS/ryz1Otj8fIkXlti0lh4m+xryDNvXBcOyvzERFKc1TluVTKEwZU0I+ XHPJMD5hRFF+n9oEl/JbVbWY8lWRh1WRVQp3BcpPZyrdBPCwXHAO1fx9fTo+BWBjmJPrdl c7o3peBAoTjOLScSKgIHBQxRxbdAs4t4KN1MxvQMLlZDTgr4gRW2dnWxy8nalZTz2eohDl tGI16voEL6hld/hvhrX5DBzulxmXYSVQ1NYGm01hM+dzR5uBTVVd3PDaM0pVpxvy638K4m Hr1oJczB7rNgWXuZ40EsXaQzR6PcjQwIFUyIXoMGK9y1Vb1IW7mSwBe17NET5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD9H3Zy9zbll; Wed, 22 Oct 2025 15:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFmpuQ022456; Wed, 22 Oct 2025 15:48:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFmp7a022453; Wed, 22 Oct 2025 15:48:51 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:48:51 GMT Message-Id: <202510221548.59MFmp7a022453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e276759b3687 - stable/14 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e276759b368701a49e543c45d5d6ea08ed4fbc38 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e276759b368701a49e543c45d5d6ea08ed4fbc38 commit e276759b368701a49e543c45d5d6ea08ed4fbc38 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:48:32 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) --- sys/netinet/in_pcb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 89000a521bff..7d665c7d2a73 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2702,10 +2702,13 @@ in_pcbinshash(struct inpcb *inp) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2836,6 +2839,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified. From nobody Wed Oct 22 15:48:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD9J6G1Zz6Cm1p; Wed, 22 Oct 2025 15:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD9J5L8Xz3QBs; Wed, 22 Oct 2025 15:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXwZ4izHC6QF25ppT30x9uwkKH25e5WRVRSbabYwlWM=; b=o6JeaP/ztU8QovCeKBKWr4CY2dlcPYdu1NuaXORWbBKQoi9pidhEpC9XDh4Waup0xne9iv 3qWJyjl81nAjcNVn3IVgOScYNwnSaQxiBJu0q7KUbrt6gAE9s+tLD3zIH/0+QI8bUNH9FE 8+0366XUEc0hfAqgP1Yy/OAXfi9ljH+ojutmTiC/LXHD4bGccwdYUk2Rpwv0cNd4u7J+/Z ti5FFS5xCNCnXOiLFulPjG3TnRYommyLDOovxfg8D/ec5zO/DOawawPalL6wYyIn8tVGgU GTYvzrAb79Z5OE6IhG5fH/Yu5Sj8p+iyIm/KRnBqkhyNoAW9K1kmMwTgRHQQKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXwZ4izHC6QF25ppT30x9uwkKH25e5WRVRSbabYwlWM=; b=aA2hSdCaNsw5m0HEAyjvLVncqXDczklEBlNcYxHczTDyAY5Qitp6+k9z7mWLopgn0HH+K3 P1Ggsv0CrvRZ7A3UZ12CbD5YTGPouIrisDcf32Uem51KDl1kEN6WmrisMlMPcAX8+wDJE7 NceMLbi6nStaxdQNNzeyFvMi9UICjbNiyjXlu3f4J05sSWJBSLmofInSPp42P4TlYFmiS1 QFkZWZsAhxVWC9UOqIBi7bYFHCD0aZJvCVre3cii83GkYHkuXtUt7pAIwupTdSuuKBn+dl 00ZS289bty3Ul9taV34V/l4F798vpPM6OD9NIz080TfHGlIwSJXZZV62ta53RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148132; a=rsa-sha256; cv=none; b=YsEndMSblfYXyxqQkZBcEmJIivd5kfm0X7boePuKrv2A6xEw/ip08QdTaQWwEMoJI/xDjL Rj82RlkJiWmQ++zKwlBtJHFbyG9Ht9GI1iWp+n+5DTe4gIaagu7JJMEOe3N5eYo0gtG3HP rWTa0Ux6ZpqCO2H+5a/B67B5f5z4d8Q4XG+64sGz2mD5pji4x2tCdacnpLmXb0Mt4Ed2yE IQeq6qKZTFSzL0IpDzPC5QOQGYLvi2TAIfzQ+uUr/vWSM0b3bKHPAWaG2VSBzeTbfOp6H7 y196GMK2VlHWZGDO3Eiy2vRGY7XiDRt4LWc2wKSOM9BwYh2hEN3NQXestP6ufw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD9J4tGbzcD2; Wed, 22 Oct 2025 15:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFmqS3022494; Wed, 22 Oct 2025 15:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFmq3w022491; Wed, 22 Oct 2025 15:48:52 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:48:52 GMT Message-Id: <202510221548.59MFmq3w022491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7272e2d029c2 - stable/14 - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7272e2d029c20c3144d7aa49500dc86d70344030 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7272e2d029c20c3144d7aa49500dc86d70344030 commit 7272e2d029c20c3144d7aa49500dc86d70344030 Author: Mark Johnston AuthorDate: 2025-10-22 15:04:02 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:48:39 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 5d3b2ab03af8..6c345c84f452 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -236,10 +238,156 @@ ATF_TC_BODY(basic_ipv6, tc) } } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "unexpected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "unexpected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); ATF_TP_ADD_TC(tp, basic_ipv6); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:49:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDB462B1z6Cllk; Wed, 22 Oct 2025 15:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDB45NZ0z3QS1; Wed, 22 Oct 2025 15:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+F9TxegMvF53ro+fHc9DzA6jXMTiUmMqh47cIhUEe9w=; b=RlOU4Q4fQqSf0P2akPSEjG36DwTVwBa0o5u9lBjiZQd4ayfqMUV/dIyHXCH+T6gmRkO2Ba n2KnwjAzyMHpFwpW/7ouuiBjggHPY9KmPAgWsCLXZS1WwR04jCKAIwf+5o3IafzduTyxb2 XE5XXuYUvCNxsx2ZxZXJ9GyblcoZECfuPUoRhtconfx/SVM9IBCSwoLrGojMBxlcnnATMY ultkFqsPs0Meb7HVn0YzRbsfVbn1mWwiCZ33wp9JZXfUX0CznB+lvfYNnkaOqE1FyP1FFK 2uFf6exeg2pKqyPgcPlMBJluAK4lFwxz0TKinT/sbEj7NZGFMRRHse7d35RpUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+F9TxegMvF53ro+fHc9DzA6jXMTiUmMqh47cIhUEe9w=; b=eKI9EKaQC8Lf6G/0aTYDMh+tbjHxBaZB/ggi4JuF9rv8mWXUGwuRZqvm5JCRVmm7Fib+MS Dz9fZyWbQoDnghmjYZCU2uzXR3JhO7UD3suE65YKbokCz5IpvCx41bxM6WQIT5N3xof/Ya 0aQBLtlyOXtOGzIto5vYSSHL9KKkfXrtpqsUYEoZo6O6crkwYo03V6TqQba4xUucAXvPTV 5M0q0TTo1Ub2Rch68tJKxFQOtx35sdgfFk4+dzVPIE0u5LdApmUKBEtNqoF2E/y0Xo3JK6 l0dSI0bgYHWQUkDJJomH2Hlb94B5r0F6eoTb6aQC6UlnHsZx3rWK7h3XINHn1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148172; a=rsa-sha256; cv=none; b=QKkozGX+WoAIbbqFSUXYIH5+4B2AV9Yl5rKzzhotgoHmnhit3XjnV8BtT6KHzmImTRuJFY zDd8alD9wBLowZTJg4JIl2Zd+3aGK1tGzeFiLU9MzPjtPrNipeBX/dHwHCEIb+LeMlzFH4 SA6e9CFgE6+py8C0IrTsv6wjUV3F7VfZ9UWEbsIEGwVcB03a9bQdLRUk+x5+G1pNfz9vbV HosUYdX9cNHDblzn5lXBde3ZCJNFD2h/U3SfNkMHHzZaggx2PTOXTVYjbEWP1T8RaN4S1b na0hMekSGXs9oi63LI9v0/pGYRRq1WV829vnu6LWjxU+yWFDZ90c8Te6k8m6Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDB44qxTzbjV; Wed, 22 Oct 2025 15:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFnWiZ022809; Wed, 22 Oct 2025 15:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFnWP1022806; Wed, 22 Oct 2025 15:49:32 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:49:32 GMT Message-Id: <202510221549.59MFnWP1022806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: df888c8f41f6 - stable/13 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: df888c8f41f633be3aacecdd357ebaad62aa11bd Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=df888c8f41f633be3aacecdd357ebaad62aa11bd commit df888c8f41f633be3aacecdd357ebaad62aa11bd Author: Mark Johnston AuthorDate: 2025-10-22 14:49:25 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:49:11 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) --- sys/netinet/in_pcb.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 03315344a455..a6fd5feddf9e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2668,6 +2668,7 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbport *phd; u_int32_t hashkey_faddr; + bool connected; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2676,11 +2677,15 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) ("in_pcbinshash: INP_INHASHLIST")); #ifdef INET6 - if (inp->inp_vflag & INP_IPV6) + if (inp->inp_vflag & INP_IPV6) { hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr); - else + connected = !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr); + } else #endif - hashkey_faddr = inp->inp_faddr.s_addr; + { + hashkey_faddr = inp->inp_faddr.s_addr; + connected = inp->inp_faddr.s_addr != INADDR_ANY; + } pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)]; @@ -2689,10 +2694,12 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { + if (!connected && (inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2761,6 +2768,7 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbhead *head; u_int32_t hashkey_faddr; + bool connected; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2769,11 +2777,19 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m) ("in_pcbrehash: !INP_INHASHLIST")); #ifdef INET6 - if (inp->inp_vflag & INP_IPV6) + if (inp->inp_vflag & INP_IPV6) { hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr); - else + connected = !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr); + } else #endif - hashkey_faddr = inp->inp_faddr.s_addr; + { + hashkey_faddr = inp->inp_faddr.s_addr; + connected = inp->inp_faddr.s_addr != INADDR_ANY; + } + + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)]; From nobody Wed Oct 22 15:49:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDB61b79z6Cm2G; Wed, 22 Oct 2025 15:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDB56FGVz3QdR; Wed, 22 Oct 2025 15:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GvNlacqHsbaixV3EhFUzeMIL+JyLkRnCn0j0kNFU5GA=; b=NPPoXQapTtWz3LXqv+NiLg2ZNmV+Cpz5CWkvS6wi/+2m09ytHC6eDBaQgMbRwazXZzJz7B lyDeHMcUFzbKWLYvWnyzIBiKpgCzLenZUPv1vVbm3uYc0C82nQ1sjeA/TQI2T9RZ41rgRi 43XeAAxUaWLaAQ1QqSluqYG6UMXEg4Zx6RwUZEYKZZBaHcBU0YuLbDFztxq7x1qP8+mX07 dTegWjFL2jRerOdoRAZfAnbpyQgkgUp6luiMHY/T3+opn2trN/5B9wM54LeNpZee3XfTOS Tqf1jWMSxwrX75yFXgrvia9FDFJJyaFXdHtuYcUKj2zdiCAN4tRDF1mTUjKMWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GvNlacqHsbaixV3EhFUzeMIL+JyLkRnCn0j0kNFU5GA=; b=cSlNJuaLIfD40TKevMrJfT3V70cOiP6a8w4sS+ZZJoeYFlHgROS/1TZu52fgOhrg5ELJ2N ey2vpgsBbNnBqZU3hXlI8J9jOtOX78hM3SifPBsgYs4AFcZ/H60qGupC4Q04coXkcJNu/D pcq9dMfSiSULHsFx17oIG3UOWOc7gN30aFTtzgztO3VUtI2rfc26Iyz+JSvUMvybLtXbgy LPZglQ2/vHVzOjyHreyrIQBPn0BMfPo23KZoWnuB6E32Z5JdNJve/VDUeUsgkJFTeRdQPC SX9G8AJjUUQoUtRmfmcdCFlDmL4Gql2aUQODYK/yXPRCxfy05ELSEVYIQO0icw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148173; a=rsa-sha256; cv=none; b=DncRGoy0bQqEWpZyR3aBIY1kO5ljfK1bPUAMT2PK8crun8XF0EigThR72go1Q0DY1apkQi pjZqq8s9sqzD7GG2b5aV0qpOquyySfxO0TCEgZ6zHed3sE/1kkITL/+gnH5gV/H1/13LE2 TIF3gSSfn52m7+CqqGUDIUopqNGRae4ay7gYMN0JGNJMVCz1zHYKNbY4qFVpBcb0TdqZ34 oy0IApKTSBshRDIzkfm8OBLuxmTdeGv+xPZkvGsWmDKZNvirhBIVvQRiCYj+pzmePIl9bN YXxtYc1PiRtcTlzpWwoPjjlUYp9kJxqDhrOO0BmIP9I1XxAaAasvH00lVef2Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDB55nVXzbjW; Wed, 22 Oct 2025 15:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFnXro022843; Wed, 22 Oct 2025 15:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFnXdZ022840; Wed, 22 Oct 2025 15:49:33 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:49:33 GMT Message-Id: <202510221549.59MFnXdZ022840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8e999e63c356 - stable/13 - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 8e999e63c356839fa60cf964e33e0054b63c7c87 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e999e63c356839fa60cf964e33e0054b63c7c87 commit 8e999e63c356839fa60cf964e33e0054b63c7c87 Author: Mark Johnston AuthorDate: 2025-10-22 15:04:35 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:49:17 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 5d3b2ab03af8..ff9ba3142f03 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -236,10 +238,156 @@ ATF_TC_BODY(basic_ipv6, tc) } } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len >= 1, "expected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len >= 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len >= 1, "expected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); ATF_TP_ADD_TC(tp, basic_ipv6); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:50:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDCB4DLWz6Cm2j; Wed, 22 Oct 2025 15:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDCB3cscz3RWs; Wed, 22 Oct 2025 15:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OXGfezyHMyg+YomCkiVHE+OZhTL9Zh2+0zNms3O8nlE=; b=Im1HWDqFYMOSzPGIIHFA3nnhf9djPdG/FFvZG/oEgaei1XIFtBdEKFCNrqJBbCT3blS2eo umZzvM8Cso2IgZAiKss6hDLBL0Bu9PQv3nFcJXwL53mK5fHOMcOouVzvSb1ttx/K3pPnkQ rniZ1+yVFsq96O6o4y062EcB4f8Xr6Xw8++rd25LSqqGFxLkgd/weur6v155CnKT6bxhxD SMHqVNu5OzhvRzX+g/NxGxiHQvhcD0qLAjXnTzk9oZhVtLLXJqWZk6Th2HQfZaHLZ4nNzg pqKWhFZDbZrf4PBw4n66JB5sQRnln1pyAGfL+Y3QODuFnOH8UCwsT/FYNW93Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OXGfezyHMyg+YomCkiVHE+OZhTL9Zh2+0zNms3O8nlE=; b=X68fuUTXCNNQt7CVbgTRh3CKh/eL75qJi2d304DN7CrPr2au5zC8+MXOu1m0XwdRAN+5yH o0Wv/crb2GPKbHqGJE48BF6N7s/rpxCCwl0npJVLOK6TYcDeY0/FEyaoZn1jYZsZoQbFDM Fxx+UraeNJJsDy1adonKZIzE/rFCaf5AAVgGlWyPVdLarJT5tOhj2LHNRkYJtOBJ3KRiuq M/zfBDk7+4HrtZSCHz3M3TCxW5A8xh8jDiUBHmSJ3MJi7nJRfJXXYMk+3Ef7kaSZfmjSwm dfTf6WLYW7N6mriJrKUECu+Lb/BbhJ0X61deSI/Q2pkNDM8uXJ2Ngn69NnYKDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148230; a=rsa-sha256; cv=none; b=sq3zXCGSALuchcez4usZNeB4DPVqOSy5ZBGdkm0bt5azGF+juKqUa1aJtaXw/ZJRB5z1Az I/YSALXl/mXu/HIgrAt7cTmJBmfDpt6dIHzYTS4nHSyBhwdGZ2s9J79WdBCrwz1r694MrO Rd6D4tT08kZIaWNUh64HjbW+W1MRuY0c330nbbr99QkLixpXLEoEJkKuLHoV3I74d5nCcz PpJ1cNLug5kNsvizleJYYxY+J7nED4iA8DbmochnX3UFxKUOcyks8ZCc7wk2jFcFN9otqC wxAAToELwhDhhn9kyktiJd6/q0uHcVlS/OXKFoLbu+nFx8p6QnIhika4Ue7O/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDCB3DMRzbnM; Wed, 22 Oct 2025 15:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFoUFo031952; Wed, 22 Oct 2025 15:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFoUjD031949; Wed, 22 Oct 2025 15:50:30 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:50:30 GMT Message-Id: <202510221550.59MFoUjD031949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 98c539667881 - releng/15.0 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 98c539667881d7a3291261fdc754b30820731234 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=98c539667881d7a3291261fdc754b30820731234 commit 98c539667881d7a3291261fdc754b30820731234 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:49:44 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Approved by: re (cperciva) Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) (cherry picked from commit ef159100ec2b73c22caccc00555bae4c3cbc0ea1) --- sys/netinet/in_pcb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dbe48242381d..712ff28768dc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2665,10 +2665,13 @@ in_pcbinshash(struct inpcb *inp) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2770,6 +2773,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified. From nobody Wed Oct 22 15:50:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDCC5F2zz6Clx7; Wed, 22 Oct 2025 15:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDCC4Glpz3RcD; Wed, 22 Oct 2025 15:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtH1otAm19hlnl7cE9cm/EtRClOVPzuK/FYJnpcwk+k=; b=j27i77wf62bm3bTWkn3XAjw57BwkF+VSeMsw6OzjaolDmIRLMmSr8cRy1HGW3gFuWY1W0Q +zrBU1t4IRnsw3WJJfHCWGwJaLCNTFKmdGJUao/VujVxMPjbu0+zKkN+Pd3Y1go9ygxIvf 1RPEDe2k0DFMVTzHwSTJ8Itpn+gGyzDP1HMJahzKJfr5eVQmwu1aKZWgbmpoydTB7R2/Wo A0S+QwmG2PRnDxQ0qmSdbOpHrWpIfgMdJbsKMiCbowmW+Cj9mCNcdpc/5+t4PtIyqcN9PO qImVzpG2VUsfCgA7xTGPguecH1vPs54Bquc/eGqkK0AhdJlAyCIR0m5LFqQzTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtH1otAm19hlnl7cE9cm/EtRClOVPzuK/FYJnpcwk+k=; b=qg7JfepgDWlBPzuJlbnflE90ylxPdu9fPB+qlcuWANThgHSLtiuU5ZJH5jpq2s3QQyfy0V 2wGn88SY/GcS5F9H3JtLZGSkl8/wQISB/gBysun4aF90vyVdXmTtvcMVm3o2ReLlFsmmVo F7JG/TBFKt+eAljPG/vYk87GseJgBDDkgYhlNuP+w8SydaZ4a1NWLX5R7KROuKyXfUa9l4 W86MUfmSeRbSVh5C7YQmPmTltnKKv89rOcBRLyCaRMCY1Czm1v5DY633SxtFnh7tesKzfd faRNu1VP5rA4Bz3VyeWPyfIfYq9kLU8cc+Pb9ACu+FhBzNOpb+hauSnI4OVbbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148231; a=rsa-sha256; cv=none; b=BXBwM3z1fye3vX4JvX61ec7unuM/4l3I0UmuYh+4L6Y5SX9o+Spxkv6XSJINl3EC/9Bg9b g0toeqmun/wzFnn7R5ayPaAoUurQLHfXbUqaQrqdbgTTE5NynaEhce0B8wTCfwaiburTDC gz8QQcQJfTslozUIN1VqZeHE1zuikNamx9pJpZC9Gwi7HvZbAMKTbHY8zgyUlLy8BFfrbp Kk38RdEs+rdkrp6FvTETjpS/Km0MoiZAijO82YcCY0cCSDSlUtgfwuU45sHCSM160uaHWf LEuG570i3L7Ng1liTuZTpVzzvptmDYQCke17Cdw/tyeCU8hMb07rZu6gO5+ejw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDCC3trVzbnN; Wed, 22 Oct 2025 15:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFoVjT031987; Wed, 22 Oct 2025 15:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFoVsX031984; Wed, 22 Oct 2025 15:50:31 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:50:31 GMT Message-Id: <202510221550.59MFoVsX031984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: aaf04147bd3a - releng/15.0 - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: aaf04147bd3a236c3896033d68f81de6b3d43792 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aaf04147bd3a236c3896033d68f81de6b3d43792 commit aaf04147bd3a236c3896033d68f81de6b3d43792 Author: Mark Johnston AuthorDate: 2025-10-22 14:53:28 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:50:01 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so Approved by: re (cperciva) (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) (cherry picked from commit 25e065774302591b43a263a78362a816f799f715) --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index fa9d6e425884..31d20160cb5a 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -551,6 +553,150 @@ ATF_TC_BODY(connect_bound, tc) close(s); } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); @@ -561,6 +707,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bind_without_listen); ATF_TP_ADD_TC(tp, connect_not_bound); ATF_TP_ADD_TC(tp, connect_bound); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:50:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDCD6nRYz6ClrT; Wed, 22 Oct 2025 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDCD559fz3Rj7; Wed, 22 Oct 2025 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euSlVo16mBGl424F7QZr5ynXgUnCblzivHqX0oqck8g=; b=sGInOVA/lmBEvfgcrlXSSF8YuzPM3VaRdkC2D1r8XZ3tTccHl0CD4Ppw7AdxUVk09W7R2X WEy1ZboMZYwtBPxzgELeUGvDeJYSC9KFmE8gMm0iPL78e6pgl/wlcDemyfdHTWXF6K8EwR iD3pEIiLgQoawX8WN6qyJyxw/38ral6pObPGoEAQd8AQGwup6HMv21MnbUK5ego6D07929 lFk9G10b76g6pEqFO6RJ5O+QGCK0d2vPg9aytBLCyDI1fDfuX9PZN7lWJMqzjmta4yQw6t CduLRwPC9Th3F56x7aFFOteW3chMeyBiWtVnq2YYjtQ8cc84UjMC1WZO6xqpkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euSlVo16mBGl424F7QZr5ynXgUnCblzivHqX0oqck8g=; b=iMTiMCeni8v1SDKRAGw/nafs+YTAdSGczJ+GrHP78ZMHH2UzJtYaRwieXvX7mVsksGJefW BvfFsUOpoCZRpRml6OQgKREqhNBwaD4d8n/kk70q1w22ocqUKLuz0VKBMK9SHefhAOkkTo fDcKyTbyVtAqUzYJETQ54DWgNQ1LkebqF/DNjpqaT1FWLr8rwl0DcRaQ1J2+j54RiFTj5z tsqe0sUtD5b31Bo+7rgkjMTuofU36EhODgkU9quVcXmi73m3tbUVUFywLulBND8fyNComy TvisOSmnwzfeqF8ZdubBW+6Pk8FuT8Sg6wbqywhPAqtwN2GyAO9eZtP5T79mtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148232; a=rsa-sha256; cv=none; b=oWV73dMZ0WvN9zTri2EeximRp+N17ieg99iBnChDIktsFFlr21cTC+sm/idlbVlQ8MHFCa ZYYU2yB/teUO/s3hX90O8l59dg07+o0+r+iDRhbSD57crl4FZ6/QGXisuUie/t1ZSSTY7c OQ3CADHyi7pFhAzOY55uEbrsavv/3D+pV5vIL205xg/AXXFEy9KXskVsTDV7KkAxq6HZgU Lxvs4cUp44ICh6jaVnet+HYyxBnchHaH84PJhfPK6+AXf5oqQsEjATZ3IziLCCzeZI6vb9 Gakq0YR6rpBbQeDj/ENquhyUJrzi0J8tPdDU7Uj/QP4tTiYWCfIU2utLvRt5yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDCD4WVfzcGX; Wed, 22 Oct 2025 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFoW6w032026; Wed, 22 Oct 2025 15:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFoWQA032023; Wed, 22 Oct 2025 15:50:32 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:50:32 GMT Message-Id: <202510221550.59MFoWQA032023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c43777cd7187 - releng/15.0 - Add UPDATING entries and bump version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c43777cd7187fba7b337770b66ed876f56241697 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c43777cd7187fba7b337770b66ed876f56241697 commit c43777cd7187fba7b337770b66ed876f56241697 Author: Mark Johnston AuthorDate: 2025-10-22 15:14:57 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:50:12 +0000 Add UPDATING entries and bump version Approved by: so Approved by: re (cperciva) --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index d18aaeb2fd46..2227d1f8acf1 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251022: + 15.0-BETA2-p1 SA-25:09.netinet + + SO_REUSEPORT_LB breaks connect(2) for UDP sockets. [SA-25:09.netinet] + 20251015: The "FreeBSD-unbound" package is renamed to "FreeBSD-local-unbound". If you have set-optional or set-base installed, the new package will diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 746b799a908d..7b00e796561b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="BETA2" +BRANCH="BETA2-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Oct 22 15:51:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDDs2th8z6CmKL; Wed, 22 Oct 2025 15:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDDs2L2Pz3SRl; Wed, 22 Oct 2025 15:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWIJt8gisl1KjFgTcJlxHxQ3iHEDpLF7gtuhBzo2UAw=; b=xaZ4afHCGSn2KjvMk07Xe/Ae7wzfIYLYd/8DQAy9D8/N6YCpbI4vk+oTQ8aAzVk+L74Gbs iy1RlQtAGBVXD5q3y1+7M8e7BeOx8mo8NE21R/ivR9To2fBJr7Mtu0I0gompDfmnaZgcqt PyZz5KLg9Z57+Vn/izB3zWyrO8vmfZjL3HkYiDJK/P4GDH9TjH+wqiTmNwLV1JEu6ZS946 GMBw+H1ggCpqwbyLj8rO8Qa+sna8AG7cIgAOMdzpKOWZ3J0ACh6cbVTGzlcvI0Wu3ikZbu rMOsqgXaYKOPbkQ2yKPjPVK92FvnSj5knd1EvofiwnPaXNLea93VvHdGNXJyjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWIJt8gisl1KjFgTcJlxHxQ3iHEDpLF7gtuhBzo2UAw=; b=AI1sdTL8V1PkOBz5kZarSPunt+CLKCl+0CY6Jz9qsBpAOqErg+nfhYqX2cIAwjTZ61Tp2r 0ZAuxp+1MkUmqJadRXFRciVMTVgysZushz5nN7E5DNnbuy7oA3rxro9JgJT2qwV8JTPMis KIciBGm84Sx/0YtZbs11yUoWEdaH9KKf/1ZGr1lvX10qCGajwHKzdtOKny5Y6y68z1SzcU jvnEDyJvwu3KbZTFn7WsHqHTwi8zW6KnJpSVd22c9Y71oBVZd1wTUPRRyRy0jqwNr/9op5 YuftYhrmM5oqBuQS1b1fsjiUfSnCg1awwxSNktdIUz4W2fvCdEeDOgHCS6cBDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148317; a=rsa-sha256; cv=none; b=MfziGgvaXw/0aJcCq5LfaUkyXCnlYhhBGJWM9lwcStvqdhNBxg18KN8gDS69P89kSs160g gHZcC6CjdRS4/9lEBk2iwpI4duR0a4DBc02dwuWyXX8hY5sGpFhM/aGgTbG4eD4A2TTocm toXHG7SnpVdUDAsUJR/GyZE0cGNBhjZCYmTjtp6/qnEXeFkpvqSsFedqOfoDFRZeX1LHM4 PXpFlpEQCDxB1GODq24ZLQlGMfdT6dyb3HvNrbL2pDKXS59sxDGfjkmPGJfBfDpor1xu2R uCwcJG+kpjCkwqGh0nodDmPYY/YmWzzzXnLOdJMR30hIf+gALbW8hSz7Cp2XEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDDs1hVCzbmF; Wed, 22 Oct 2025 15:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFpv17037104; Wed, 22 Oct 2025 15:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFpvNr037101; Wed, 22 Oct 2025 15:51:57 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:51:57 GMT Message-Id: <202510221551.59MFpvNr037101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 058bcb57cd4b - releng/14.3 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 058bcb57cd4b7e855cd596316541aff0adc5ddcf Auto-Submitted: auto-generated The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=058bcb57cd4b7e855cd596316541aff0adc5ddcf commit 058bcb57cd4b7e855cd596316541aff0adc5ddcf Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:50:47 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) (cherry picked from commit e276759b368701a49e543c45d5d6ea08ed4fbc38) --- sys/netinet/in_pcb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 89000a521bff..7d665c7d2a73 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2702,10 +2702,13 @@ in_pcbinshash(struct inpcb *inp) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2836,6 +2839,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified. From nobody Wed Oct 22 15:51:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDDt3l5rz6CmQH; Wed, 22 Oct 2025 15:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDDt2sY2z3Sb1; Wed, 22 Oct 2025 15:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1pSJipPG+8ssjJFwf8FceQy1T09dHflPiSAp4SifA0=; b=pX/4236qXegMYezxpUfBm8O/PegA/rqf2bJsTEJgSInkh0BY4BPeu5ym00hq2mpipT9Nxe ngtKJWzbnI5E8lTjCS1MTWI6hRD4JvxK10eh4TjZ8JINrcxIi6hFwOZHbFGre5BDMxGdO6 KgjkNaLYbEEn2Eip+69FFRhYrFUBmkuZZ0ZrRPqKD7hOXyHFMkaqZhqb9jIwXwKRyIDY5Y P9S4aAWnERJnnDMZepxlDCx7N1BQE9lNfgx1PBOrlcS3iorpVJsAaMTbD9RsN4reyfeWHz 4F1F0EMA1VFmZ6ZW9CfM83yqa5Y5QUdFgn9yWt535kb5l5tjouxkBqEJDenxqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1pSJipPG+8ssjJFwf8FceQy1T09dHflPiSAp4SifA0=; b=pJOBu2uQn2BfuCRXPoQ7Sp/hIJX3rdaySS2A0FmcDzguv7dwHkZWRiaUzkExT+rqUg/X0A TExTjoZoDqoY3qHFqvHGlVjW/MRukIgafEvPpaelza68LPst90WegzfjV5FKMDeQQX63Ac eNLRLwXmDbfy15sEyyxIUJkzmNH6Aj1SU0She878X9hWs0SuYrLmEXD68l9FA1YegtKPzj BR1PEDouFay8yrWu9UPc3AEAsglw+FXrv/WzYNpTz38ulGETIWLLtBAzx5gwnWKf13h6/t +t3FKQ4KfXX1gXWxDqWGnazR+Y2pF9s7WAqf/Dzp7AZ0yA7R5MkvYWpUHAj89g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148318; a=rsa-sha256; cv=none; b=vMnAHfdSuhWrhr3VFndnk3zyP6A+h9I/OYXevVlkIvaUSy/zoCUYZA5B4WCJAQrSCPTxMf 5p6ROUsChKW4b9bb3HKVqA9ewf8M2pxaesoTpKbyLBdHCNszyyCdmanbyXIqiODjFQ1IM4 liJOJkR5FUloKO29DK1X3ebYLBZP4e6v6mUS+dPkgnHHnkZdjX0nVZ0WD4FTaTF51A9Uuy XwGKSQJT+P3uY/q2c0Jr7exHocilZLsvvDWS6DJNExgCyNOQmNdskKBE46hy9Ohz87GMSP d30951GpKYnRSRlumrhlbAx8pcTcNAeiiKA9AGma5E1sqfOQTWOrmL5xRzMmHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDDt2HyGzbmG; Wed, 22 Oct 2025 15:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFpwbB037142; Wed, 22 Oct 2025 15:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFpwBB037139; Wed, 22 Oct 2025 15:51:58 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:51:58 GMT Message-Id: <202510221551.59MFpwBB037139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 65f6f823c5a5 - releng/14.3 - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 65f6f823c5a5ab1f0517a9652720f458b569a7f3 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65f6f823c5a5ab1f0517a9652720f458b569a7f3 commit 65f6f823c5a5ab1f0517a9652720f458b569a7f3 Author: Mark Johnston AuthorDate: 2025-10-22 15:04:02 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:51:38 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) (cherry picked from commit 7272e2d029c20c3144d7aa49500dc86d70344030) --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 5d3b2ab03af8..6c345c84f452 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -236,10 +238,156 @@ ATF_TC_BODY(basic_ipv6, tc) } } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "unexpected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "unexpected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); ATF_TP_ADD_TC(tp, basic_ipv6); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:51:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDDv6l57z6Cm7p; Wed, 22 Oct 2025 15:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDDv4t2Kz3SPc; Wed, 22 Oct 2025 15:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkcFVtjJRKzTYTtRDTqi8rX9oNuACptaq5OMWnSxysg=; b=m2MtXLnQFYKqRlNFqr4Cqhqp6YsAMIls6FJmW+Tze6cyfaGGjSTONw+k7H8Yr8vtX3nqSy U4ErAeR3Dd1X4p2ij8foNejaDY/08L5ukQ96KjmVcROjWHGRS5bntpLtnjrNdUyhn7oVXD dGB8MpwWdcaT34M6/VE4HbF3wrV1Swjq9nXrDnlavB7J+b7TwV5/ckG7G39FcLO/FmeKi3 n4W80kOyrfi3reznuV1v6Hw1YQYr9431dl7sNikM3UwHD/5wFYt5bbKtfO1hEcUIUVpF21 skX10Aioiof6Nj1gm4v1J9+ODsJmSo7s0oGu+whcy9ik6cKgOryzZRDiaWMDdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkcFVtjJRKzTYTtRDTqi8rX9oNuACptaq5OMWnSxysg=; b=df9A5RGJRGeIzprZN4lkHfJH2BL8f1J6ezH3aecL7fLz442kJxQh45XupyFyiOCFXymet0 d2jYtA7Y6DIIhaU/xt0X1ssLxPyoMQj/IjA/hb7PgFxAyJQhPj3ACdc3M2d+9FqtiJrL5H jA/GfPDNANemfuCcnh2Pn6N5YbF8dkRpejLenmbCFe7F3wgwBu2VPpXXkz3/6hYa/WjaVL w6WE+T7SY0ZIQnvB+ckg34Lq/4Y2ec11Rta9xftyUnqVPUnxGsZixLz0fL97noTUQuRJ8D sjysRYPs07uDZw/dkhkD9wDJCwiKCroP8XUIwWRj305vsu77tuXdqCP10NE//g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148319; a=rsa-sha256; cv=none; b=SxCLxmPzoiBFUZUl2WDV38bjwYcBq/5qJFbAylC13R7tflHzgKqyVQzoyxZ1tM8abxpiwU W7EQ07clVNfA5shz9vY5CtaCGX/LWZCfiw2csumrKQfViZb4rf+ekcGI7R2noNKcUvNzg7 Sxm/BoTNtNLIHAmB82zfpmKeJsKLq0QH9GBVFFSYEpYK8pzogDas4nsOBxwGVA7ckNXHQ8 BbxMakdIBrq8RCgeoC3eMVL59vDuNVx9qn2wzz0Eu2e5T2/yiqOZFTQ5BWYic2k0M9NzR9 vL5UsK7fzaU6hTvq391hJgADtY+YVQJbS0nH/rdgt15mHAZAr5oKL2jB7+wauQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDDv3WWmzbmH; Wed, 22 Oct 2025 15:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFpxRr037180; Wed, 22 Oct 2025 15:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFpx1T037177; Wed, 22 Oct 2025 15:51:59 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:51:59 GMT Message-Id: <202510221551.59MFpx1T037177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 382f54740ee4 - releng/14.3 - Add UPDATING entries and bump version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 382f54740ee421cc0808d70fe79acab1f3d3e836 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=382f54740ee421cc0808d70fe79acab1f3d3e836 commit 382f54740ee421cc0808d70fe79acab1f3d3e836 Author: Mark Johnston AuthorDate: 2025-10-22 15:19:02 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:51:48 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 9987252e8b2c..6af1b31f0b57 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251022: + 14.3-RELEASE-p5 SA-25:09.netinet + + SO_REUSEPORT_LB breaks connect(2) for UDP sockets. [SA-25:09.netinet] + 20250930: 14.3-RELEASE-p4 EN-25:18.freebsd-update SA-25:08.openssl diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8cc1fac788e5..99c29d44db02 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Oct 22 15:53:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDGl6f9Tz6CmQZ; Wed, 22 Oct 2025 15:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDGl66sNz3Tq0; Wed, 22 Oct 2025 15:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZgjNn9eq6Kly7O+g+x7IjNYqdvOqdV+xmHbqS8/gVBU=; b=QvVwPmnIaDfelW0TbjixQjt0cuiURxZE1Q9wAP0JGE+URirMLvBEPzaks1sULuHPpHT/gJ VVDxtSHa+TZhV6xjTXbB+y6wvT2UqzhQzwHSEr/8qxKaHjPQakwlajOCfOqDr3tu2hE7tL Slzl/ZFxb2d8nMMCbUHmdrJwNj4sR0SNBS/oAC2nxC97Jf1Rg4cpvhvtz6rn8OqV9rTCub 3eXzgx8+fv/Fp1Ebq/t1YfD35v4t6i+/zpP0gj7EkgZaJriD2rkDFS+k7nM5eTjWN+a6+v s6Q/imposmMa6cYSaUjk9C3Si0H7Y7EDJxPC4KxTh0868IRd7+oxFquEp7XckQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZgjNn9eq6Kly7O+g+x7IjNYqdvOqdV+xmHbqS8/gVBU=; b=lv9jJAD8WvLGpSs3gS4pqhQlw3/mciNha6vLyvIw9Cky9/gmIfIrXPMAlDe3JySF0eh0RQ 7FQm6yycsNoud1YabkKvPJK3LynYQtpCLscJscmRHO+3ffhTQE2IDg7HJPCZi84xYqRXPU Xaxpux0hMqPfZuhB+sdJykTsYNORzFzagjE/A3ZSfIS3XX/js0O0fMxWycVe33Mc58ny/X iufYQCxKhHefq8nbxf1gQqWbyb9cjpxFHd1eXZnwkqhHbWoKI61aR+gv4EAStQbdI0NsOl GMsTfqJn+KOrP9bubJwMeeh7Y/C8vrLeRVsTsZrhSPC6RewXywDvG4H6kVMyuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148415; a=rsa-sha256; cv=none; b=eZoQ8GJJd3hOTn3y18M57WTcEdHonCSsfc6jiB7ZHMYhue4W40Dyyuh/MXHtr2jvbILl2o ZWS1JakBDxkyruEnyl00NTxsM6SaIvKVLmtLMzNT8/wDZ25MZa1dF4BU/MSipMCCzI7j9H 0BT6AYKp575vgazb+DYZzceNlYBKfXWE7vSj/QcebMUzh3J9Z8HX9KfFcho3HSWi2Yla+D BDnbF9OoISqiZhoM1UCSOyM3hsaXAiXDIDMTedLjFJ0cwmY9epwY/5i0gjGns1C6GUYCTn ftB68xu0VnA/uCMtmgD+kD/vwQLb1nb0baGC5bbnekauwePm6Al50jm+kC0weQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDGl5YHNzc0S; Wed, 22 Oct 2025 15:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFrZ9t039865; Wed, 22 Oct 2025 15:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFrZ5R039862; Wed, 22 Oct 2025 15:53:35 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:53:35 GMT Message-Id: <202510221553.59MFrZ5R039862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 90e14aa082d3 - releng/13.5 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 90e14aa082d3f90c8a805dc0394e1db851859835 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90e14aa082d3f90c8a805dc0394e1db851859835 commit 90e14aa082d3f90c8a805dc0394e1db851859835 Author: Mark Johnston AuthorDate: 2025-10-22 14:49:25 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:52:57 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) (cherry picked from commit df888c8f41f633be3aacecdd357ebaad62aa11bd) --- sys/netinet/in_pcb.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 03315344a455..a6fd5feddf9e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2668,6 +2668,7 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbport *phd; u_int32_t hashkey_faddr; + bool connected; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2676,11 +2677,15 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) ("in_pcbinshash: INP_INHASHLIST")); #ifdef INET6 - if (inp->inp_vflag & INP_IPV6) + if (inp->inp_vflag & INP_IPV6) { hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr); - else + connected = !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr); + } else #endif - hashkey_faddr = inp->inp_faddr.s_addr; + { + hashkey_faddr = inp->inp_faddr.s_addr; + connected = inp->inp_faddr.s_addr != INADDR_ANY; + } pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)]; @@ -2689,10 +2694,12 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { + if (!connected && (inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2761,6 +2768,7 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbhead *head; u_int32_t hashkey_faddr; + bool connected; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2769,11 +2777,19 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m) ("in_pcbrehash: !INP_INHASHLIST")); #ifdef INET6 - if (inp->inp_vflag & INP_IPV6) + if (inp->inp_vflag & INP_IPV6) { hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr); - else + connected = !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr); + } else #endif - hashkey_faddr = inp->inp_faddr.s_addr; + { + hashkey_faddr = inp->inp_faddr.s_addr; + connected = inp->inp_faddr.s_addr != INADDR_ANY; + } + + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)]; From nobody Wed Oct 22 15:53:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDGn0M7Dz6CmN2; Wed, 22 Oct 2025 15:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDGm6kypz3Th7; Wed, 22 Oct 2025 15:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mFosOxcTy8Al3WV6gLlN8BUThHZ0q9VCG0fp8SoBC/c=; b=kADt8svggKYepMLKlXd2soMrHB7szrQRhXwM207Gbq+HNIWCDG4bPyONXLHucSBQPiWJqh WU0BtkmojCxYwFBNm1lh5etiYfoSWq4jRngUz384pu9pvxrn7MEY9W+iltY3+47nTypeLE rzRW3W/F6GQ/AAvbub5q1iCn7bfIQos0hmX2pS8LXb6VRtQq14/mj7YUkAJovNfJJe82Mp YE9okKVfdGYKTFgSDzO34POqnzQkUdczYPMkzBhkDT7DMIjXig/M4Tlv4WRHspDBvk7dpL i8ywTTlBV11T1QS2bje3MjLrElTKS0ObRzjNX/tjCOS3H0u1uT2tsEDlAuW2Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mFosOxcTy8Al3WV6gLlN8BUThHZ0q9VCG0fp8SoBC/c=; b=lM6ZD/HfkO0D7tln6jGXV8y7JLzZnPLfWw29yjOgG5qbKOxpoj+yEjhVDqJC5EUsHGv2Ps 7Lxcfx964NS4aGMR6GWEKeH6GYCWV6RnyA2QJY4KqQfR7/YSspdA8cHX8pK9maXK1A3cZ1 lZJNPvDEDSIPClWk4Rb3hHHWAv3HpL3he9pEH1sLejVS2fW10pMEIg0Sum+bOB15eGwdic Wd6E2SAIZVP33x4eGXYgLjr9GX4wiZ9+BTCTlCyjsMmGoH8cQs30UKYu+8QQz1RnTSJSHS ZL+M/H6lziIkUz6vbPPWa/Vb00FqMAaKZuA1Iv64TEoTdhTp0b+eQHPh/wEk2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148417; a=rsa-sha256; cv=none; b=olxeTKmOhE7EjPRYPg959FFCj6owD+uJRJL05d/c4AD/gE/Yy/auTDH19POoU29TT1n13r cYanDdn7cL2t6S7+Da94vZZ45XN9L2DhABJngPWarJ8/OwroscG2NBpjgIDpHGON8wa8WN C/EfFUuYa8/K5WoZrMC+K1o0lEA8wANO33mHaO30iGW+amAwPSCn9l3AsmIrC9KTDBVZei AlChOAjm7Y0ImxfpVGIlq90mXNi5FXjaPYEicEK/PK2oXEqOlpElrJ5beUojak6HShwJak sXL2lUQWRxZ0xPyNUYCm1xhdPT15wKTi8ZAegQUoeh4EvUq5cdsfZsNquc2HTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDGm69q5zcS0; Wed, 22 Oct 2025 15:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFraMA039906; Wed, 22 Oct 2025 15:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFraS6039903; Wed, 22 Oct 2025 15:53:36 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:53:36 GMT Message-Id: <202510221553.59MFraS6039903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8a7adde307a4 - releng/13.5 - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 8a7adde307a4379a06f49c241d68f4314515836b Auto-Submitted: auto-generated The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7adde307a4379a06f49c241d68f4314515836b commit 8a7adde307a4379a06f49c241d68f4314515836b Author: Mark Johnston AuthorDate: 2025-10-22 15:04:35 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:53:11 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) (cherry picked from commit 8e999e63c356839fa60cf964e33e0054b63c7c87) --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 5d3b2ab03af8..ff9ba3142f03 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -236,10 +238,156 @@ ATF_TC_BODY(basic_ipv6, tc) } } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len >= 1, "expected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len >= 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len >= 1, "expected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); ATF_TP_ADD_TC(tp, basic_ipv6); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 15:53:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csDGp1XgKz6CmQd; Wed, 22 Oct 2025 15:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDGp0Bq7z3Tf5; Wed, 22 Oct 2025 15:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVJh9WgO9O5SPkflHdTYcI8wNUl0o6NKtsNf7tFZxSQ=; b=OXEJ2qFPDEEavIVp88hwvAdSvcLsEd6rcW4jL1BhzmB2FEieIit73ESmlppnLH4AYi71QQ THum6MYMhz1t6pnC8K3MquqoHWLolF/r4BefXZ8O3CMs9Uf+vHmTW/wSzzyOgzX6F/K+Hx tnl7wHLn0v6+E8vPniieB7jmKffD8L+akkpvx5Y2TuWC0Did+Q7U2Zt8v6e8N9b7A9VpMP Ei1ldmNA8WD8m54ShXF/QtoGwg10nkZpVNSASFyOkEDlr2Yc/dNoSwi+2OainypU1u8LPf fUgXrvP5XzSz5G/jrcONr94HgWsaH6ygF/k9gkv+hhfkZ+c1noxLpbBywfZtCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVJh9WgO9O5SPkflHdTYcI8wNUl0o6NKtsNf7tFZxSQ=; b=t2913XT2bX74RRVls5iJHC/CcjUvKvm1kDpVAuZvTlLq2OG0oQnfJlLsBA6MPuknBWHULi fMccva0eU839Edqo/DUhsf+/gODstpOsqREM/YimHhXT148a57abXAKOOth24aRFLweIMy oBTd9KelWio5Kt6QJCrgZUkb4JOkYb/dkzXJCUTkciMSSMtAp70eHdehNRoO5GbvKkccFm FwFk1YtJskBfy/tvEzuvidbapjEvIsN1dBtb4v9JTI7rfO9t7oE5lvzdNAMV94yKFkN9Lz AsCBFE7vqSsHtMA7k4n1RUq6vcmF96CJ2AB7n0YG1S5hUdKn35ZhSxrOyTweGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148418; a=rsa-sha256; cv=none; b=LcQR+Lh3qgi19WvhZIoY1vTdX8d5R0ujb6ZbHoVlep7DAgOt15d0m0AqXlWo2C55CEGdRM Ui/wov1v5QLJPvEbIRKfsUcXNR+BT1avSYEieIvT9n67rwDwsXUWY3Ew2WcqRrgKemnsem nLoVrOqFj3E23MirIh8LtIMkZTZEdr78BJbhgBSBgzdXFBSj3hXPWlqL2YMZ8h5rJLhYf4 /VbTxeI/v8B73HQSZ66QCksaNqtNMVnPkISFUu2ptu4rn77qWLJsBZUj1csMadue87+bAc NsnQEFoB8fUK0rc3MyYcfwtmAb9RtKLDLBlwls2gNViPuF75F/R5PIlnAEi/SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDGn6qKdzc0T; Wed, 22 Oct 2025 15:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFrbEo039943; Wed, 22 Oct 2025 15:53:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFrbJG039940; Wed, 22 Oct 2025 15:53:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:53:37 GMT Message-Id: <202510221553.59MFrbJG039940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c4530d6e5f36 - releng/13.5 - Add UPDATING entries and bump version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: c4530d6e5f368592b6048a0c63892626c05f433f Auto-Submitted: auto-generated The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c4530d6e5f368592b6048a0c63892626c05f433f commit c4530d6e5f368592b6048a0c63892626c05f433f Author: Mark Johnston AuthorDate: 2025-10-22 15:52:29 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:53:22 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index e74c2509c715..55c65b3afd6b 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251022: + 13.5-RELEASE-p6 SA-25:09.netinet + + SO_REUSEPORT_LB breaks connect(2) for UDP sockets. [SA-25:09.netinet] + 20250930: 13.5-RELEASE-p5 EN-25:18.freebsd-update SA-25:08.openssl diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 57b4721a1bfa..add7f72dcaa9 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.5" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Oct 22 16:59:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csFlD0tPmz6CrvB; Wed, 22 Oct 2025 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csFlD0K6dz3cDW; Wed, 22 Oct 2025 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761152392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z/TeMl/GkFD638EmK1j2o1erBUlnyLMJqxxcDo5IO4=; b=fcOc+63F3J5m2R2lI6Iogi9m72IQBERU8KAtoXwgdvFsDYLvxalLjiv9qKonkPrBvI+HSn WhU6LrR5f9M1W1+T8YL2NdyNLU3hDbOZFlFR8a5Px3CCwQP5gJALQhdKuPByP1lwN1G/Th //HbIJfMvjXBHxDEsajMHNldurT1jaU2JyUmFaE8Ue2DFNZVILkNZPePEmj5xolqJZ39tQ fViFzVwBSgnG/ijvMdGnqG92S7CTw4TvGQJGjqtIXrIgyi/OP44iRxL0CTXRmp3Llkg/Th A5DxWY+PHEzEC29gUXAwcQAegcihy5Z89bAn+UuD9ZELbLGA0bbVor67bwto0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761152392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z/TeMl/GkFD638EmK1j2o1erBUlnyLMJqxxcDo5IO4=; b=qVoVafxDebeDEJAfbBGEixDxZHlR4+SLm3k8OoRzC6ITBfsyLriDAJDSs1Z1tbG+UvwUuu ID2xJxVondc6n5VT1X05fbvk3P0PWspE3x2k9vPVcl7g905mIMr+nEXdmuizcAhGqgk0YP +KcuEaasp/t5W/iv2dumZvUfpS0t3gIkSuhshbiwSgHjG5HK2TteolvCzlPoYO9wUmUxZx 0R7kCZa2TRdcLOG/6B4H9dFAiWCgZsUyid15QP3VDKkZqO/MKbDEsplNG77L2DxgOEmZ1h jRvbF1w26ejYX0FF0MYtu3VTqVCOeL6E3g6TdYsv9S2JhhZ6/DOgel4olQfp4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761152392; a=rsa-sha256; cv=none; b=ne/RSKdrPlNaW53vmTyuEYTEpJJP2ZaTLsCbgSMGYN7K0VqRXJVYaWppWx5g4EWE3ZMICr BumO+V5yEKqW5fAJCYF/NchAH4IwwzC6fqSYIqXcSI66i0yLLe6Y2LVGxV6Gq8Rkj9P7AJ xphjDocpJpahOB1dQoXyGikGe3e7GGlXF8qPlHydLwY32vxAzrF5dS4jK07T1AniMEb5MV HktBJRYzzK1RzaJ3GuxO8yuVAFmMCm+JHC96XdEDLod2r3Frvom09O3ITk42ijlWh3cW/D 53GW9vBMn7pymAQdLSw5bEbAInkOYfHeeuS/7gkzbg7l58xv0N8pKBZIw/wo9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csFlC6x9Zzdc9; Wed, 22 Oct 2025 16:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MGxp0q054768; Wed, 22 Oct 2025 16:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MGxpsK054765; Wed, 22 Oct 2025 16:59:51 GMT (envelope-from git) Date: Wed, 22 Oct 2025 16:59:51 GMT Message-Id: <202510221659.59MGxpsK054765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: 62aef3f73f38 - main - vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=62aef3f73f38db9fb68bffc12cc8900fecd58f0e commit 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Author: Gleb Popov AuthorDate: 2025-07-11 07:42:09 +0000 Commit: Gleb Popov CommitDate: 2025-10-22 16:59:21 +0000 vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller The code that makes this VOP_BMAP call tries to perform a read-ahead I/O operation. Failing to do that for any reason isn't fatal for `cluster_read()`, because we still can return some data to the caller. This change is consistent with other places within `cluster_read()`, where error returned by VOP_BMAP is not returned to the caller - see the `if (nblks > 1)` block above the changed lines and `if (reqbp)` at the end of the function. PR: 264196 Approved by: markj, kib Differential Revision: https://reviews.freebsd.org/D51254 --- sys/kern/vfs_cluster.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 2e397b8e9e8f..b674313993c4 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -260,8 +260,10 @@ cluster_read(struct vnode *vp, u_quad_t filesize, daddr_t lblkno, long size, */ while (lblkno < (origblkno + maxra)) { error = VOP_BMAP(vp, lblkno, NULL, &blkno, &ncontig, NULL); - if (error) + if (error) { + error = 0; break; + } if (blkno == -1) break; From nobody Wed Oct 22 17:14:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csG3Z5xThz6Cv9L; Wed, 22 Oct 2025 17:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csG3Z5TDKz3pcQ; Wed, 22 Oct 2025 17:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761153242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQ1ufgBekvHG6TH48LPMcBWKQyvWiH2NaAynLEG+RP4=; b=C8aJufgKblzM3ncKcvXIPvADyZxHF6n8wip8tHIiVY8faC3zcCYDBzqhDZYOOkvuV0KQU3 HuR8gpok6u5mZspElrY7yzw2UzqMnuG9w1AfCreTAj70SQG4nUXQZWQc/I4w7uG0A2g0VO egGAduK/7SKtVO/bqBfHWMvjTbDeTyE92biHAkoCF2FQJIaDdktlm78UfAhKevC+p8mOiW Br9BZ/+fN8msV6y5RaTHpQ8rB9Z5KzxGv14sGIMP6cMZfcujxNUA76jeSkXk/lMlnW24Ty yFUAIWYB+Oqg/zo9+cuZZehXi0a0Yjccxex7BL3Iyg6UDH/wEXiuUdN55FG6/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761153242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQ1ufgBekvHG6TH48LPMcBWKQyvWiH2NaAynLEG+RP4=; b=ilt3o9z42QEkkW4lBRql8omtjuzWSMCn8qp6xm2aJPl+UCKr8jn94pnM83l0pYPpB0Ya9n 5xnOSo8jM8rCYtyRbP118A0wgLyQVbUSbhVGj6bpdxPpmF8UJ5AbEmhJ8ZP52EvcE2yLAY wCEzze175nMVnqmJ2mjfVZotn7TmPsltmJrjaO8UE5wCIiP8worXI37I6LopHYuRfw68ip zm1+0cPtxOmJk4eQssDkR3WrmIgxNUE6DLZvyM6qkOfllOhGpFKU24Oqz036eKGClGMpWP lzuPGRZwLOIfcomCUxx8yGANaYc9XoKmKPoLNFhrkdBqKq5GPT0+TSKNmAXmIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761153242; a=rsa-sha256; cv=none; b=VzJTtdzQEn98Zoafawd2qV5yTCaA2gBveklYEjLGYb7P/1V4WH9BjbRpWq/l8IF2THCrt6 4HBOgdULti6g/YiOztkKEmml5YVyHG/Svd3XTAoc8w8cScYE5GkEat5Kr+KhVU6MLlVDPe ZBu4j8z3rFsFhj7rDkjz0PG3InG3xi2CYlB4LUL/+fFlOq4DkMthcvhIHWxusjQOLIlw5/ Rztn6kKfjWdi2WbqQfEIfFe6k/Dl4ZE/KcuA8y5ydSuT0dUqSHxh3tR4EHacfS0UKAPQjK BJ/DJVJzh++u/4QrFbUdQuqZoDjx4o0Xh7dBc5a6q4a9Y45cEUM8L/GphaO97Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csG3Z52JyzfVr; Wed, 22 Oct 2025 17:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MHE2Cd091424; Wed, 22 Oct 2025 17:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MHE2j6091421; Wed, 22 Oct 2025 17:14:02 GMT (envelope-from git) Date: Wed, 22 Oct 2025 17:14:02 GMT Message-Id: <202510221714.59MHE2j6091421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a12857f5a80c - stable/15 - moused: fix GCC build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a12857f5a80c634b31a2599e4c127c0ee3b01ff7 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a12857f5a80c634b31a2599e4c127c0ee3b01ff7 commit a12857f5a80c634b31a2599e4c127c0ee3b01ff7 Author: Ahmad Khalifa AuthorDate: 2025-09-09 03:54:24 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 17:05:30 +0000 moused: fix GCC build error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] (cherry picked from commit 54cc3da443da7e4a8a483d1fe46071382ff06ed0) --- usr.sbin/moused/moused/moused.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/moused/moused/moused.c b/usr.sbin/moused/moused/moused.c index fa3bfbbf2b3e..36cb8cc27eab 100644 --- a/usr.sbin/moused/moused/moused.c +++ b/usr.sbin/moused/moused/moused.c @@ -1168,7 +1168,7 @@ pause_mouse(__unused int sig) static int connect_devd(void) { - const static struct sockaddr_un sa = { + static const struct sockaddr_un sa = { .sun_family = AF_UNIX, .sun_path = "/var/run/devd.seqpacket.pipe", }; From nobody Wed Oct 22 17:48:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csGqW44tlz6D09F; Wed, 22 Oct 2025 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csGqW1G2lz3tfk; Wed, 22 Oct 2025 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sw5yqjA5RwGLMAqUupqaLe2dexEJjfwLhwkqols+nO4=; b=kqSoqwh0tPG55BPuu2ko7duqZwiyFRP20qIrs8So+bh7PSZ4jenPzdzLqJQp/z/U6qFitW IIMwGqWPOJW37FxLrsv591PMncYHJz4GQEMmi8Q6QUW8DuWA2/UBInspwsrmV/W/i+4Id7 BU9+4LK1tetcb+qy7/1HCPJWNvFzUGwZE2tSVqNKsWKeuunbpVDzhkMymYwMoXcHaVEg80 e57D9d951IJkBffsN/40RAHSnWFQl3QUBucBBGE2bGc9O0hni3sFal3bsYLojiN1kk72Rw 14zH7yuAwyLpcAjna/MurJihvQGjdTMGcgy0yJPCRCIHw7C9HQq3p1UVGmiD8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sw5yqjA5RwGLMAqUupqaLe2dexEJjfwLhwkqols+nO4=; b=KKGACPS6deNP8N52ZbVwKNir/B33cVWOewPqTxDgPkP1VrS0n8TOhOuHuJbXdA4SPNEoP8 K4J4yO6yUBakWhPzAFhc4sDD3oqoY9qg80EiSq6c0uc55fRSEdNeYg7kMCraqz+90NtEN4 onIX92Cymp4aTyXNXSgWOLua8VRdpB7nnhtxzwKH0g6mN4V7ePcE3GF8ag/gIPxHiRIRAK S8okq3fOPgsQV+NhvOancO2UpmAtplGalzvpvCgtaOts9UumtkIwAh4jc4Oru+ut9f6HF3 6WXnGLgplVE4Jn6rwhRPGd3tP+XIzGv7YYjCQ8rNibj/B7M+KXeimbLI1Tg6fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761155319; a=rsa-sha256; cv=none; b=YpMV/hHaeinVP11zHsfbGmjJvIqCjYy5uA6PkocAXioeZsSVyOSjZE5rEA+jmCM3EsenIG 9k4nnHWKt4NZsykH2t8LbdTfs0PNcQTbM0rpkUlzfF5eA0VLzviYGSCxhP6uBj5T2DQXYY XcPgj2zjZiEFOiY/VoYdbCo59rGURUmSCPFI9uLztsBvO0StQuIIXrDU6zDfPLBYQRBRZI egJdesOeIIUeB9sVwPlh5j9wQcixdAJ5OSTmyvWXGqw4FgjI9GMGmEhh8D6jJurdvFgHzN Ezw73URH81Ehxtmnt8fz52xdls/aUhHSqp4P4l/w1q+2MQzfJOLhyqeA/nkRlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csGqW0X6Jzg5Z; Wed, 22 Oct 2025 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MHmckA049173; Wed, 22 Oct 2025 17:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MHmcwV049170; Wed, 22 Oct 2025 17:48:38 GMT (envelope-from git) Date: Wed, 22 Oct 2025 17:48:38 GMT Message-Id: <202510221748.59MHmcwV049170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 8e8ee8bbe2a1 - main - mtree: Remove stray atm directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640 commit 8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640 Author: Jose Luis Duran AuthorDate: 2025-10-22 15:34:30 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 17:48:01 +0000 mtree: Remove stray atm directory ATM support for netgraph was removed in af0cc0b22362 ("NgATM: Remove netgraph ATM support") Remove the directory from the mtree specification. Reviewed by: emaste Fixes: 21735dfaebdf ("include: Remove no longer existing netgraph/atm") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53260 --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 454657183c58..1a60bbef765a 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -303,8 +303,6 @@ net80211 .. netgraph - atm - .. bluetooth include .. From nobody Wed Oct 22 17:52:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csGvz43fbz6D0VM; Wed, 22 Oct 2025 17:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csGvz303xz3w6k; Wed, 22 Oct 2025 17:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEkhlkx7MHWJwRuVGMunUoegRtHTWY0yv2t+IHvK5i4=; b=Z25MT8m5JHqQYLrZyH8rQiZ8C5pKTy6KrH9ZyICNfIaEevlKoznr+4FtAbzUvDuVY57BYJ OHcAKXimASooYnQJMGW4cq4rwYjWGoLiEOGT3FG/GjGCgGowxkOueeY2N4iDIWdvbvBiTX O6AOeeOCHWYIxP3xSIKPM55H3oVMbpMLd+crW5KxX1LJ7WzvH9O2CnqBMUheNnW/Ie2AYb Q7nc+ycJjHVi9W92kDnvh7MFRY8ioV2WU/BCiXwwSN5KniVqCEtqzSvPewrfUfq4Ch9tGf YCosp2E/EfwaRxLIfvnNOTGr0KBxnM7FUb8uNEOOu/7icYjgm5ohvycgD+Hzrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEkhlkx7MHWJwRuVGMunUoegRtHTWY0yv2t+IHvK5i4=; b=k2mbFH2UqKSMyFV+2BdfCpOrhzL/hbGOUH7S0aUUHVEag9ulOLX8/jGaHdDPSr71IYhkID bGt41RmZuYwlglzrKlEUSfH6M2PllmWwI64wbB4YMtuv/Q1wydROB6HfdKHmdDvwLh2sJw TBWCErsai3f2KBToGgrzLrroI/fvCPZSdMrD9nPMBA030LdVcA5adfXbbyOUxoeuFZvsow wE0Ss1MtLmFEz/++K8s5xfrw17dsqN6igUycG/Rzax+JKOkqxH9KFvckxsnyzn4XmxwD7C HGoi5UhIp/USlNMwWPxvUx6SvV0XECFpKp0fmc9asPrYa+k5kpIZrCMbd3HcjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761155551; a=rsa-sha256; cv=none; b=BiCsYr6+K9mzyw/VeYm3GRVbNWN38nlBVlmr83jq9iHoZe7EUDyT5KYN/tVJGeqgubW5Vo eG6dY+J9+W8jLFgBURqsVPbSWqblzgX5UAfeitE8wlVKM6qpM1KzHLj8eoLCaZ+pAZJ7wG zaup/WWAOSsxA4bz7oATk2Izn3JpDOeef694vw/xBWexv9XDUdCzrVjiCPPIbu5caCAsEn QVqEHIp2m4zZ8NbY4YGDSH9Hf2MJc3EaoOpw8om1xKZownAtmLE5lyuhJ2rcIrs/TXsqso LHRKpdYgrrZ99TXl4Eh9Cbk+tTvsGUwN+f4pISlKQu39WCKIsMmRPzgGtNlptQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csGvz2QLPzgBY; Wed, 22 Oct 2025 17:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MHqVP0065933; Wed, 22 Oct 2025 17:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MHqVr6065930; Wed, 22 Oct 2025 17:52:31 GMT (envelope-from git) Date: Wed, 22 Oct 2025 17:52:31 GMT Message-Id: <202510221752.59MHqVr6065930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 3d368c699b73 - stable/15 - libc: Add "Z" as TZ designator for strptime. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d368c699b73cc1dff3ca27d29d19666741d9ff8 Auto-Submitted: auto-generated The branch stable/15 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=3d368c699b73cc1dff3ca27d29d19666741d9ff8 commit 3d368c699b73cc1dff3ca27d29d19666741d9ff8 Author: Gordon Tetlow AuthorDate: 2025-10-15 22:24:06 +0000 Commit: Gordon Tetlow CommitDate: 2025-10-22 17:52:15 +0000 libc: Add "Z" as TZ designator for strptime. ISO 8601 allows use of "Z" as the time zone designator. Update the strptime parser to allow this usage. While we are at it, update the manpage to reflect that both UTC and Z are now valid options. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53083 (cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d) --- lib/libc/stdtime/strptime.3 | 2 +- lib/libc/stdtime/strptime.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3 index 7df73d2d080a..9456fa757b85 100644 --- a/lib/libc/stdtime/strptime.3 +++ b/lib/libc/stdtime/strptime.3 @@ -171,7 +171,7 @@ is taken as noon. The .Fa %Z format specifier only accepts time zone abbreviations of the local time zone, -or the value "GMT". +and the values "GMT", "UTC", or "Z". This limitation is because of ambiguity due to of the over loading of time zone abbreviations. One such example is diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index 5f1293c7a267..375e49146639 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -546,7 +546,8 @@ label: zonestr[cp - buf] = '\0'; tzset(); if (0 == strcmp(zonestr, "GMT") || - 0 == strcmp(zonestr, "UTC")) { + 0 == strcmp(zonestr, "UTC") || + 0 == strcmp(zonestr, "Z")) { *GMTp = 1; } else if (0 == strcmp(zonestr, tzname[0])) { tm->tm_isdst = 0; From nobody Wed Oct 22 17:52:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csGwG5PPjz6D0qN; Wed, 22 Oct 2025 17:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csGwG4Hkfz3wBl; Wed, 22 Oct 2025 17:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d6+SMJk8MMIlIsbNUmdZrYld3JdSSThy0Nb0XwGRxL8=; b=gwVrNrcuQ5WKKYePe580u1JkVdxux0GrjvFAjFGN+Noc+rS/LTRnJm5kXyftvrstpEWDHZ tHdhVgJPvaPnAC0DbT9hiyeeHfuxEPy5RAT1FamaMnrVk5LkqUzGgxU0HJKdsln7MGEPAV lgKjEszghenxbY6B0SQlFbStpBTvJXN1bRGVUpsmzCqmM56UegF9MV/YZf8DM87E6LvS8Z XvoLMFTSPVrKf0ai/iNsO9f9r/x2JwSaUc3zSsckrb0pfTFVfbi5Z+rLOPKY8W+Hyda7YD y+r2AGI7xnJ9X+3Ar1+CLhKLQzD3nq6+IBuvP6aFgUFEJCAPL7z5PVCEk+alYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d6+SMJk8MMIlIsbNUmdZrYld3JdSSThy0Nb0XwGRxL8=; b=fTg8QRKPDoC+axEJLZVXaYfoM53018QoQfIf7s5qzB5L4mSuJzRxMnyqWuTr7Y2CSpt2y8 0wXXoPRVgHH2ogzCcE3hyvKM7Yph4zAv+tFgoOv0x1tXevl+BDG46BUKdcuAswl8ckNQNl 8T4a8hCVID3DNIS0A+7In+66mlmz4kpm7B3txSekjf5WWjpE2UY2vMC8w+EmsWSZhr1hv8 oejtDcRrN/vAC1Rnrty1iiEg+gPKH07zS4I2H+BBbRMwNlDo8CLg+/YmpW1i/XxgphosJc ajBZ1le60fBeOr3Kwob9l2XrJARy5+bAOPyQD7AR0BGhVzuQvvKsDPqdaiCK8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761155566; a=rsa-sha256; cv=none; b=l3bcnZe2sWkGpnwpYTd8a3WWsTaqY40TeoswZ+JtL2levmdHYm6ip+JCDLQOCi1Hhxqw8y km6kTnAj0gKteNWLdX0gsu/GCjD8UxdQwrSgmG69biUv6tVa2ZTnjIl6Cfa/9fbBz1/IOc GO9+s323Yjc8li3PqIOey0QVNXGlwdTj4cIxMzl08z1ejlMLFjCpHsBam10qYdzZk+f/X9 B437qvrsDAQPHuDndSl7COtcyCrLK86aQGo6JCLfK6z6Uy3gyQkJs7m+AqvZksa51MC9bu MjLcyrBdfu4+lEfm44cEKIiyCyU3/djPLrSO4jr0LYiOvgot7Bs+BKY2txRblQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csGwG3mvvzgYW; Wed, 22 Oct 2025 17:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MHqkpf066133; Wed, 22 Oct 2025 17:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MHqkbS066130; Wed, 22 Oct 2025 17:52:46 GMT (envelope-from git) Date: Wed, 22 Oct 2025 17:52:46 GMT Message-Id: <202510221752.59MHqkbS066130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 3b9b7e09e359 - stable/14 - libc: Add "Z" as TZ designator for strptime. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b9b7e09e359ac20f83d4dd972271ff950b62da6 Auto-Submitted: auto-generated The branch stable/14 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9b7e09e359ac20f83d4dd972271ff950b62da6 commit 3b9b7e09e359ac20f83d4dd972271ff950b62da6 Author: Gordon Tetlow AuthorDate: 2025-10-15 22:24:06 +0000 Commit: Gordon Tetlow CommitDate: 2025-10-22 17:52:36 +0000 libc: Add "Z" as TZ designator for strptime. ISO 8601 allows use of "Z" as the time zone designator. Update the strptime parser to allow this usage. While we are at it, update the manpage to reflect that both UTC and Z are now valid options. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53083 (cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d) --- lib/libc/stdtime/strptime.3 | 2 +- lib/libc/stdtime/strptime.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3 index 7df73d2d080a..9456fa757b85 100644 --- a/lib/libc/stdtime/strptime.3 +++ b/lib/libc/stdtime/strptime.3 @@ -171,7 +171,7 @@ is taken as noon. The .Fa %Z format specifier only accepts time zone abbreviations of the local time zone, -or the value "GMT". +and the values "GMT", "UTC", or "Z". This limitation is because of ambiguity due to of the over loading of time zone abbreviations. One such example is diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index e9ffe7180916..b89e140aa8d5 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -554,7 +554,8 @@ label: zonestr[cp - buf] = '\0'; tzset(); if (0 == strcmp(zonestr, "GMT") || - 0 == strcmp(zonestr, "UTC")) { + 0 == strcmp(zonestr, "UTC") || + 0 == strcmp(zonestr, "Z")) { *GMTp = 1; } else if (0 == strcmp(zonestr, tzname[0])) { tm->tm_isdst = 0; From nobody Wed Oct 22 17:53:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csGxL1JNxz6D0kQ; Wed, 22 Oct 2025 17:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csGxL0kpFz3wJ7; Wed, 22 Oct 2025 17:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVsBKCJQUd82ZmHuYfVxCqaH7+X0nCFuQFe3TjYEbA4=; b=f5IBtqai/HA4BUozoyWj2Dm4btX5QPXQqWhgcHRn19mDSjJtcedfCC2gc/I7uL8NJzAGu/ Bvxnfsn+s4OIOQ3c6TQCpilQD4e2p48U/6sAs5K4B88wQaLeI16FvkY7Svo+2M7PXlWEsQ oc531ZRCqKK4kB7weq/blyY7t2P8Fy+h+fjoou3CPd9hSqVisKUUdrZgkAD0zyT9HLq/Ld 2tBtISci+arUayKe+oApSLclA9pGs5uX7am2ll3ivJMBaTsNcfxid6WTAOAoFHTKEZEFtx JmYsHpr2ZIqgYpYGDCpjcbtXa6DvD/337IQdXNbXGXC7mmxcjWGoFXSMhQN4Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVsBKCJQUd82ZmHuYfVxCqaH7+X0nCFuQFe3TjYEbA4=; b=tXy8bqnRuPym5yMVhVhnblzkDj9hF0A4QN3/fKyeW1SB1DoL8r0UumY9Uwhzmywr3YQQME nf9wMChdawbtvAyyrxs+jhBVkIMbbgI95JlkyMQZJnkNplOFZddq6xe1VUKMGyneem2Uxp NwMjCZbtJpXxOWHn4COicJQ4gdDnv9EknGROcTjLqSs5h93NjUZumFacbxKjglYJJY5+ln 0KjDUJ9sudJqI1L1tkjyy3Xz9Kls6kedg9n7m9t010fuE2yGG65XKsVk8dbY1QLZjPLmF7 2Jo0rxFqx6hK+P7EWv4Aesmv2R47EIS/WILcqhHB8qe/qDKSNY0NlRvJYD+TcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761155622; a=rsa-sha256; cv=none; b=Hq20FOUf5Ymk2xN4yY7Aobb5AWoXATXFcASpjlyWhPkgufQfZnxXDz6R+uqjQkKhz8cLga A1Ykq0gL3MFbPhwl8aVJxctIjVHF3vsXCcyv91+Yb/iL6h/y9mYS7GsRkyfaLIGi6Jftsa GY0ltP+I1hy8JN0IFD5nSIziYHjqgNcUVwSOZ4lfL546VKh2evXNlLGyE0Mw3zxLGHAaF7 HXRbXE5gl346C7rYMr+umKVvSGaZvRAoyzdzZcujSHPgRBRgX8MqtahDyeMn89X3mbZ63l 1JOc9hom6ulR0ophW2Li8KkKjBBrX0roU9SCYurGZ471LILLz7zFwGQlQCUeIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csGxL0Jk0zgYX; Wed, 22 Oct 2025 17:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MHrfu4066532; Wed, 22 Oct 2025 17:53:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MHrf6D066529; Wed, 22 Oct 2025 17:53:41 GMT (envelope-from git) Date: Wed, 22 Oct 2025 17:53:41 GMT Message-Id: <202510221753.59MHrf6D066529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 2564a21f9774 - stable/13 - libc: Add "Z" as TZ designator for strptime. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2564a21f9774c177abcaf64f89d65954ec78b037 Auto-Submitted: auto-generated The branch stable/13 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=2564a21f9774c177abcaf64f89d65954ec78b037 commit 2564a21f9774c177abcaf64f89d65954ec78b037 Author: Gordon Tetlow AuthorDate: 2025-10-15 22:24:06 +0000 Commit: Gordon Tetlow CommitDate: 2025-10-22 17:53:28 +0000 libc: Add "Z" as TZ designator for strptime. ISO 8601 allows use of "Z" as the time zone designator. Update the strptime parser to allow this usage. While we are at it, update the manpage to reflect that both UTC and Z are now valid options. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D53083 (cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d) --- lib/libc/stdtime/strptime.3 | 2 +- lib/libc/stdtime/strptime.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3 index 7df73d2d080a..9456fa757b85 100644 --- a/lib/libc/stdtime/strptime.3 +++ b/lib/libc/stdtime/strptime.3 @@ -171,7 +171,7 @@ is taken as noon. The .Fa %Z format specifier only accepts time zone abbreviations of the local time zone, -or the value "GMT". +and the values "GMT", "UTC", or "Z". This limitation is because of ambiguity due to of the over loading of time zone abbreviations. One such example is diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index e9ffe7180916..b89e140aa8d5 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -554,7 +554,8 @@ label: zonestr[cp - buf] = '\0'; tzset(); if (0 == strcmp(zonestr, "GMT") || - 0 == strcmp(zonestr, "UTC")) { + 0 == strcmp(zonestr, "UTC") || + 0 == strcmp(zonestr, "Z")) { *GMTp = 1; } else if (0 == strcmp(zonestr, tzname[0])) { tm->tm_isdst = 0; From nobody Wed Oct 22 18:01:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csH6t41KXz6D2B4; Wed, 22 Oct 2025 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csH6t2pG1z3xR6; Wed, 22 Oct 2025 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761156118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6kQwMQKYZm1+ly3e3s+W6EdvCnjU2seXKmqbL2Z6D0=; b=He+yFK4v6EmqgQxuHNDz+/XIZXXM378MC9eqnhE6EtUMUVEtz4hs4ZE77y6x1P95cR0uUs s1pNB7LoGg8g/VuFBPe/3XLDyPpHFNQ+bgR+c0ygpkHjKdY2LH8VCG5ec7seWDkIa+kT7B GpPvNtz2gN/Fr6keYnOb9EjrjvhNCEHMNWKsmiep/ti562oTJzuCF44raYMfqsUyKWMInp NJIniUEMbHIcFHRQI2K68QdA2Hy78+CVmqiO/mIjFzYd7rdjWSQiPaviS7YQ/YBKIBP8eR JeS88idmA9dOyibMC34Z6Uxi8oVywAaCzeaMCjWxGDKvrvJ0Lu01dt8sgCdUUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761156118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6kQwMQKYZm1+ly3e3s+W6EdvCnjU2seXKmqbL2Z6D0=; b=tSzZPftimBUHIUJKRDomJcTp2ySuGyCikrF6ossED7JoldzVuIUT2FbTj3EbA6QkegtriD jDLaU1+Fbo9t5EZ8+sEjHw8NF4ohBl1xmgfg/AYFFdEo9THeYrWfu6anZGvSqmay6pd0f8 PwmUaN//WB5fflvuAE8m9qNzONS/qQeYqn2tE/uq6OUsuLBTHI8bMH2630SYzd5LgBcB1y 4qzCYCPNWzowrR0uW86gUYxqkhp3w8g+u5xKoyrHe5s4x1zRrO7LaIvbEZW4Mk57GK64pb +zZGYPdswwhbrl5QKUnHHMU4OTq0jL2e9hRZVS5FmjF0uPe9Q2DtG2ERBilCow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761156118; a=rsa-sha256; cv=none; b=cpWPC+caS2KeTt/tT1XCxlBC6zAIrlB9nIyu8/24i7R6nsYOp4PusO/xaYEvl85QqP0vsP c5lIscRrd9l06rc2PMuXXWAlnYQnvVJPpvlpBgwpxMVdA7paYsQ89qYDkcv9BBP2uAmbIL ia7VP+PhUv4hXcb9Bk6atlBMMMdXI/RxOD+2EpkHg7amjr5GpN8BEhVaQzvJovH5SsSlVN q5hHHaL5VlanWCMgZ4t/cmxc9+Y/syY/dovnU4f3It42tLTmGQvfHKQbjPok+q2mgNIawJ EG6iN8n8Q1Okn4lx50dPKAIBY5tr3XAl7BHSjvAn5N0m0rYGDxH0ebWRZ1dmwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csH6t2Nbnzgcg; Wed, 22 Oct 2025 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MI1wNJ085940; Wed, 22 Oct 2025 18:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MI1ww3085937; Wed, 22 Oct 2025 18:01:58 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:01:58 GMT Message-Id: <202510221801.59MI1ww3085937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 99bf680a8499 - main - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99bf680a8499dea71db5da705dfe41f4bb5e00ab Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=99bf680a8499dea71db5da705dfe41f4bb5e00ab commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-10-22 18:01:37 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 MFC-after: 1 week Sponsored-by: Netflix --- lib/libutil/mntopts.c | 53 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/lib/libutil/mntopts.c b/lib/libutil/mntopts.c index 07d3dd6d98a3..4a064a086fd5 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.c @@ -145,6 +145,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -153,19 +165,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -173,19 +193,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Wed Oct 22 18:21:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHY92LGcz6D40w; Wed, 22 Oct 2025 18:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHY90Zkfz41LS; Wed, 22 Oct 2025 18:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3EOCsdJyq9rKGV7DGRvbH8C9pavRA8qgGSRHstV7eo=; b=Mbt6K2exkWJBiIYj3IJpXveHk0/Q8aqA+/868fUeT1vG1jiP6wCjlu305siEo8vKJHqtDC uEQOwMT15AX4Bf1A8LWOOasovLCj/Qm8IWGAkETgtem1TO8clhEcVR8IfBcjwpryydpqS8 e1NhxlxgP02ZGMhEDejZPniU9a0kJ365Vga+wzLUyLxKvE7tt4dE+PNzKaMUlf5xDYUMa0 djlDixb3yA1kK9drHlisneYJfMQ/5RMwyqerpbnWZdx2OuuvQ7i8y66aolIYLdjFJb2NVF 698Wa4Wg9KFMuqzdG6bGr6aWwbSdyAiT1fyDR2lIdJXpF/bp+aQEf0d6CYUlSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3EOCsdJyq9rKGV7DGRvbH8C9pavRA8qgGSRHstV7eo=; b=o6LpDUi4ntsEhfSun7OFZDzQcQg4GOU4/5a/RlVIJQgRAck+I6XgBy3GWM24L8K1ULG9EL RzPXCQ/x4cV98DNjq2WB6oEh+P7/Hyv0QGxvsfPuXpKVzwRXr/JfLFqn+a2m62x4RxBY0+ /M///Dv3qgEwd7o1qQ3p6LRmMgrIkfrmgz2dJrM+SPSqfMnGk9E6YdnFHiWtXnFWI7YaGI R1z249wyiHoPR2T/U0e4asREdq91dui/jhVtaJX2O8pu4oBB01o9KmgzIB3FAMgsVePGq2 WSknltWMZex+l+I9yhEBgVpnJ1pLlFdpFkSjUdXWbeNneR4OVAy8E+Jb8GQ2nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157277; a=rsa-sha256; cv=none; b=qOQC/Y4hT76HozSeDOMBt8Im/egWcciwjqlUeAGOPefqs5DmAJ2aD2zwzw5OzmgrvFQx5R 3tyVsFkvxqnZkDq/NijHsTwA+i/6p7MmrMAJvI4LvjXYzBpEvMwFNIWJrZFB47LjYuhnzt AX0D3cgWO86EaFsYlM2KIdqfqc9zhujFQY9HoipHMPLtpEP8g6nRN5jXtAnhQB1ZHPVwq1 9voJzRIl4HDXrQXs1VcctqeXGFhOkk1Ep0eW04lh72hOsSYLhOMeWfC+TYIbby5kqvQHID m8c72EEAmv+gyf9/kUugQpWsHrxMwz2dmeT5rezloT+OnWIajMA4xnmISQG9aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHY872zvzgdd; Wed, 22 Oct 2025 18:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MILGa3018398; Wed, 22 Oct 2025 18:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MILGgJ018395; Wed, 22 Oct 2025 18:21:16 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:21:16 GMT Message-Id: <202510221821.59MILGgJ018395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 52ea1ca18a06 - stable/15 - release: Add pkg .conf to METALOG on dvd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=52ea1ca18a0674e5085d6d0ddbc3c13bf0850429 commit 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429 Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-22 18:21:00 +0000 release: Add pkg .conf to METALOG on dvd We're correctly recording all of the packages in the dvd METALOG file, but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then users won't be able to install them very easily. Reviewed by: markj Reported by: Lars Tunkrans MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53199 (cherry picked from commit 2b5c62494df95cdb844b5f6f852412f2178f66dd) --- release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile b/release/Makefile index 6b5b0c1b975c..c142bc35a45c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -427,6 +427,8 @@ pkg-stage: dvd mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/ + echo "./packages/repos type=dir uname=root gname=wheel mode=0755" >> dvd/METALOG + echo "./packages/repos/FreeBSD_install_cdrom.conf type=file uname=root gname=wheel mode=0644" >> dvd/METALOG .endif touch ${.TARGET} From nobody Wed Oct 22 18:23:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHbs3kxjz6D4Ht; Wed, 22 Oct 2025 18:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHbs2fsHz41WK; Wed, 22 Oct 2025 18:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MuydRM8hPoU7mksjwefcFQEzl7AK1Y70zAsl6+0C4E=; b=SSkn7yt/KIwzuTDknIp5lBTcHJEM1eeESrCH+vuu2N9CFBhEc5T5IniNw2KRKWR0pkyt8N hosfz6boiUoqO8Jzqj5sYg23O24YxiQ9PhgFZ8XO1P/a9TDuFxa/xM9OMzOetDpqFFiHiE SYRyphms21mojO/hlSuNObqWafQioBfDlDMDRW7jCR2igM2cQ849JwHBCL8dlAVPORIVCg ki2L1VGWU1fz31IAv4xSOsMB/9iQmnPKN4q5n02G6hCZH09YJIGKsks9I7/X+voFfrFBx8 Ayu1xvWnx2I5i8m1YZ/+EVEgIe/Vnx4Nueb+mTlQIh38JHcXJSaQ1DkdX+fMXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MuydRM8hPoU7mksjwefcFQEzl7AK1Y70zAsl6+0C4E=; b=ryI77QkG32ttbb6FJKf+ldh5ddXfmx/SStSUHkYLyoAhS7NKwyFuSrYNH/40UEteZD5fN+ 3z345lauvGiDfJDFayKCEmMv+K2sLfYtMHxiSNQCkqn5uk9LAk60MaIxFzcFDNnwdzHwV/ TDgHqn7RL7fWBB3bsvU5SU1rygTcKq4M+xkA5qRcPFXCta4kXAZzamnKmiiCD82mpJERxW QUoouxUgb9q11/dfMB+hK3+zsJw/UzxD39FdN9s9eHkCv8pR+1Xw9GXsAB8CSh1XUoUC1J hW0C17g7YNT27zmZ5JLlZttRID0L5rVYbH4QsnmaemEAeRlmAZyf7DsjYtFang== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157417; a=rsa-sha256; cv=none; b=N8VFlRxcFWR7+VXG03dPQIjHeCkXX/+dhgbbyv1aOGFSp8aZ/vjEVcTSstqh9XQxvFNTpT 03VAdKND0C854jyyh/JvJy4VTQjXzbSgMlDyP97YGT19xEDWxGJggc+MQULT4y8cEDErrd 3SW83a1eLGxecCRY6xyPaMQPvvnldUx5+H6HI8dKi5Q0hhOk18e8cYTDDTxoMmp71N0O2Y HaNFf5wp6DnO0g0GClRjvPuU92PtVNXshrcJf6YklHdLP8PHxKv8XZBJpB5BZTvtTcsOo0 16uYTeYPhxthQo9ad4SToWRqRgBv93gQ+rc++9t04Y4O6gi/jNKoIqNpFlhDtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHbs24y2zgnM; Wed, 22 Oct 2025 18:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MINbEL023737; Wed, 22 Oct 2025 18:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MINbY8023734; Wed, 22 Oct 2025 18:23:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:23:37 GMT Message-Id: <202510221823.59MINbY8023734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 74921426d552 - main - bsdinstall: jail: Fix DISTMENU items List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74921426d552f7491c61684465f964b446379dac Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=74921426d552f7491c61684465f964b446379dac commit 74921426d552f7491c61684465f964b446379dac Author: Jose Luis Duran AuthorDate: 2025-10-22 18:21:04 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 18:22:44 +0000 bsdinstall: jail: Fix DISTMENU items The menu was incorrectly using the fourth column (distname) instead of the first (dist) of the MANIFEST. The actual file name is on the first column of the MANIFEST file. Remove the .txz part of the name to build the menu options. Reviewed by: jamie MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53177 --- usr.sbin/bsdinstall/scripts/jail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 8e001fc4a027..e4238ac0a687 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -79,7 +79,7 @@ distbase() { : ${DISTRIBUTIONS="base.txz"}; export DISTRIBUTIONS if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then - DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base` + DISTMENU=$(cut -f 1,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base | sed -E 's/\.txz//g') if [ ! "$nonInteractive" == "YES" ] then From nobody Wed Oct 22 18:32:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHpG5rfPz6D5KZ; Wed, 22 Oct 2025 18:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHpG5CpSz43Vs; Wed, 22 Oct 2025 18:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0NadJWgtbZi/WPFEJImMNTYVNREUOMqq03xk58r9ZQ=; b=EqR3ri9jqyKI7PajynBXXjwt9i/CubEPXfpLyzH8dqVMZrOtxymVYHOqsjZXgBoFYUx1JW v1mcbtCvnFiNCdrE33mw2vxhYClqAmpPRlfpSP4TSG4rlrGkU/p4iX2DRbJupanM2AVzI4 HbP7DIZ3UU9ZBiCDA6VOvOJ91YPfnPyS4cHl467L/tV0wHKcVv5wbEbJuLun4AHbberU9Z a6WwYY5VSXGx8zAT2KwpYem23ZRBes3obTOa/Tinu20+QKiZxaPXvTzWxIr8F/pNmKmM8S 6B0kJojhQ7fMPQFip+d4OWYBfH6NcZEIO2hFYXPsa44zTI/oSY5iJXu1Yw3D2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0NadJWgtbZi/WPFEJImMNTYVNREUOMqq03xk58r9ZQ=; b=Ht2l4kxBb51CMWkc/Bdp9tRor19oIkzeMHu8VihXYtB7JeIPbz6mQ9LJBVln0XUOI2F59S eG5x9IKrTUSKzImR3pGDe/u7EtC8/OoEzGelIOKHjdFoLKHZcLrbBDCKe8fzzdkzNrpBtO BK1NeYo7BHMgqldtyAKr8LweAf3MzsfAPQZ+Xm1RPoxW7OVPNPSNIjSjEsvJRszEwmB87s amNzmMABdA1Jr0DDt1veQED2XcTWbw0dFwNPY1IZNTHOpshFGHb4Ca0mkDm7HoLERqnRsI /vGPysm5xCLQIMiMT6/OnfP6KFxh+3LIFvu1c7Wpfm6uKtbHb+RPl2GBhEtUpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157958; a=rsa-sha256; cv=none; b=bYnBug1Af6gPIN6ZTFZoPqqREuIvbUAtd7P4QpIHUGQyEEn8Mc47kaat3F2iqP8Ebjgzdu fwS50itWn4Y31AMq2/gD24SaLumBZiiQTZIcPhKsKCABPq1etKjg/3++mr0ra1tNwXyHeo 4TXWtlZE9eOgLmaR8RE9R5feM7HLqCMVqlh1iSyGLkt9b9epVhU7/HSY2LtWADuNI0+exR FE4Z/rNAdvqWevFJu/YfqkVs+xuiKTBykQCxFEipXYg1rUxSfKXWl3+sxqEBMMWWy10kLP 9iDzBdriPa5nm2h+cj3YhazjqOxGzGyG/lOpjghluJNF1WXGGIqrg82kRz2UiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHpG4ft0zgwB; Wed, 22 Oct 2025 18:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MIWctx043385; Wed, 22 Oct 2025 18:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIWcR6043382; Wed, 22 Oct 2025 18:32:38 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:32:38 GMT Message-Id: <202510221832.59MIWcR6043382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 06e48a8d7a4b - releng/15.0 - vmimage.subr: Fix when/where we fix up METALOG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 06e48a8d7a4bd0299a537fb70968beec9bb5be14 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=06e48a8d7a4bd0299a537fb70968beec9bb5be14 commit 06e48a8d7a4bd0299a537fb70968beec9bb5be14 Author: Colin Percival AuthorDate: 2025-10-19 00:27:07 +0000 Commit: Colin Percival CommitDate: 2025-10-22 18:32:18 +0000 vmimage.subr: Fix when/where we fix up METALOG We only need to check for unMETALOGed directories and sort the METALOG file if we're using it, i.e. if we're doing a NO_ROOT build. This non-NO_ROOT builds by no longer bogusly writing to /METALOG*. We only need to add databases (spwd.db etc) to METALOG if we're doing a pkgbase-enabled NO_ROOT build; but we should always do this before creating the filesystem, not only if we installed extra packages (in vm_extra_install_packages, where that code was erroneously placed). This fixes non-cloud VM images, which in 15.0-BETA2 shipped without password databases. Approved by: re (cperciva) Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53194 (cherry picked from commit 012014403bdcb2b3aa7ed3895079a0059204c35f) (cherry picked from commit 962194df8333124876a25926244864bd5d2d26d7) --- release/tools/vmimage.subr | 66 ++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 842a808c623e..99e1936296e1 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -213,16 +213,6 @@ vm_extra_install_packages() { install -y -r ${PKG_REPO_NAME} $pkg done metalog_add_data ./var/db/pkg/local.sqlite - - # Add some database files which are created by pkg triggers; - # at some point in the future the tools which create these - # files should probably learn how to record them in METALOG - # (which would simplify no-root installworld as well). - metalog_add_data ./etc/login.conf.db - metalog_add_data ./etc/passwd - metalog_add_data ./etc/pwd.db - metalog_add_data ./etc/spwd.db 600 - metalog_add_data ./var/db/services.db else if [ -n "${WITHOUT_QEMU}" ]; then return 0 @@ -290,28 +280,42 @@ buildfs() { cat ${DESTDIR}/METALOG.pkg >> ${DESTDIR}/METALOG fi - # Check for any directories in the staging tree which weren't - # recorded in METALOG, and record them now. This is a quick hack - # to avoid creating unusable VM images and should go away once - # the bugs which produce such unlogged directories are gone. - grep type=dir ${DESTDIR}/METALOG | - cut -f 1 -d ' ' | - sort -u > ${DESTDIR}/METALOG.dirs - ( cd ${DESTDIR} && find . -type d ) | - sort | - comm -23 - ${DESTDIR}/METALOG.dirs > ${DESTDIR}/METALOG.missingdirs - if [ -s ${DESTDIR}/METALOG.missingdirs ]; then - echo "WARNING: Directories exist but were not in METALOG" - cat ${DESTDIR}/METALOG.missingdirs + if [ -n "${NO_ROOT}" ]; then + # Check for any directories in the staging tree which weren't + # recorded in METALOG, and record them now. This is a quick hack + # to avoid creating unusable VM images and should go away once + # the bugs which produce such unlogged directories are gone. + grep type=dir ${DESTDIR}/METALOG | + cut -f 1 -d ' ' | + sort -u > ${DESTDIR}/METALOG.dirs + ( cd ${DESTDIR} && find . -type d ) | + sort | + comm -23 - ${DESTDIR}/METALOG.dirs > ${DESTDIR}/METALOG.missingdirs + if [ -s ${DESTDIR}/METALOG.missingdirs ]; then + echo "WARNING: Directories exist but were not in METALOG" + cat ${DESTDIR}/METALOG.missingdirs + fi + while read DIR; do + metalog_add_data ${DIR} + done < ${DESTDIR}/METALOG.missingdirs + + if [ -z "${NOPKGBASE}" ]; then + # Add some database files which are created by pkg triggers; + # at some point in the future the tools which create these + # files should probably learn how to record them in METALOG + # (which would simplify no-root installworld as well). + metalog_add_data ./etc/login.conf.db + metalog_add_data ./etc/passwd + metalog_add_data ./etc/pwd.db + metalog_add_data ./etc/spwd.db 600 + metalog_add_data ./var/db/services.db + fi + + # Sort METALOG file; makefs produces directories with 000 permissions + # if their contents are seen before the directories themselves. + env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted + mv ${DESTDIR}/METALOG.sorted ${DESTDIR}/METALOG fi - while read DIR; do - metalog_add_data ${DIR} - done < ${DESTDIR}/METALOG.missingdirs - - # Sort METALOG file; makefs produces directories with 000 permissions - # if their contents are seen before the directories themselves. - env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted - mv ${DESTDIR}/METALOG.sorted ${DESTDIR}/METALOG case "${VMFS}" in ufs) From nobody Wed Oct 22 18:32:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHpJ1RTSz6D5HD; Wed, 22 Oct 2025 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHpH60Pnz4367; Wed, 22 Oct 2025 18:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fUk9LHcuZNxkx4jJKu9WMPEkOhPNgvn1FBTwGB67q0=; b=emgsyFOrvmo5D1W61Lke2pSPCN0PvTQJ3wya/SD5R72I769HQfgnTdKwdmjxa0H2m+hiUD ir6aiiOQhYMJ2iI47WVVhTWFcVKn4Bf23Pc6cCIeTwlF9FkfUHpD71pQnlo49x2Tbsd8RM 6u3O43Ir5tPgrJ7m6PF9oUSO8oufeO1nSBfleqMaYHBIDl/06oNTX1lC7bhFedQpiqeLVO yZqmP6u2w8RwYJ9rRdyjC18hX/0fXXMAZvy2zYV5ic6Xl90vz7kBvaKerDm+SZvppdWKFk bncLUc8WuukR2ULHXswAXd2jluE2+kpUGK3dy/fNNuyvIEFwXfyyUyWU6tZKbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fUk9LHcuZNxkx4jJKu9WMPEkOhPNgvn1FBTwGB67q0=; b=GR7LZUubwcgWWLZbhuirt2R/IivYS2RaeYyqd573yqTCevIbwE1NRrQCw4PU/ja7Tm5Gf0 pCgiEA3ZRwFuR6CKd5MH5knoCR9L1XGgf04QZ5aMT0f2chfoik9SLZVeEcKQRLu11HZjpr zAT5O98ob9sv21ixIN4v0rNKMLdx/Y0hO+do9Znp2OQ/WcEC6VLGGi4PwV8j76Xydo1Cca meJar9C3QADrVTXC4HJqjZcb0FCP9+Oy5fmzIHnFOO6aokVfCocMYqhg2WthcGtN6gvPh+ MYrfXsQqF+tY0YEljRMqs2JWo9JMJqPCMaxqeFEgEw5C9TO8NPYPLjvb8i4oFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157959; a=rsa-sha256; cv=none; b=Dg0YOgjobYHE5fLbD6hL6IDdAgzhzmbNAy/gnIQVJzBEuL6LL/39hncIYgnpj9d3G32jIX +UMbIrjXs5e8AC0Cst82GCQ8v01Zffq3qqsu/8XK1jka8ooVnX9jQjI8dJ+S21RF/nbBRI 5XYv0Zdr9e9koFW3Oec1e+T6vWV8rCXbZh9FExHPuYPId5OHTNg/9LHQxxa8wmjPXRRJ8Q aqWo94FOs+ke8aT85a/tbBTh19x116g4G3ucVbPvmHx8fVSbx2lGhtXRv6r3Hz1KJ7zNjU RHmHyVo5UBlqZ7Kn5r/6LdNSzvO6F2HF5H5Aw2v3ImDgAw5f92rhTWBe31onhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHpH5bxMzhVV; Wed, 22 Oct 2025 18:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MIWdHr043422; Wed, 22 Oct 2025 18:32:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIWdm0043419; Wed, 22 Oct 2025 18:32:39 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:32:39 GMT Message-Id: <202510221832.59MIWdm0043419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6f1622df13ba - releng/15.0 - Revert "release: Switch back to latest packages for now" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6f1622df13ba4af003ce6633ba1a680abe7e38fd Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6f1622df13ba4af003ce6633ba1a680abe7e38fd commit 6f1622df13ba4af003ce6633ba1a680abe7e38fd Author: Colin Percival AuthorDate: 2025-10-22 18:18:56 +0000 Commit: Colin Percival CommitDate: 2025-10-22 18:32:26 +0000 Revert "release: Switch back to latest packages for now" We now have 15.x quarterly package sets for both amd64 and arm64. This reverts commit dc5aae134a44d18921e179355e9b93a7eff534ed. Approved by: re (cperciva) --- release/pkg_repos/release-dvd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index c2e64c43a56f..600c309d5979 100644 --- a/release/pkg_repos/release-dvd.conf +++ b/release/pkg_repos/release-dvd.conf @@ -1,5 +1,5 @@ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From nobody Wed Oct 22 18:32:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHpK1ySWz6D5Mt; Wed, 22 Oct 2025 18:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHpJ6cTjz431B; Wed, 22 Oct 2025 18: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=1761157960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zagh9nynv1ScdEfQck4DHVdpj1nCGzee7un2RA2pz6I=; b=CVj9qPku/YB7bvMKKvOE8ojD0lxE9GAJFydXkRU7XcYF3kkO0w8b2UaQ0jiTwdUW5t7ub7 CTQUfChcG8dhEhbylBDG3ds3XFbZQ2FXpu5XdVsj6oqfU7amHfsCnhaxOvss6MKt6npjkz 5dYVJUUOgnQrshN1FQg4VsD3o4c3bJqiP38Q+6y4wBRezcfO+4phJDwvmBAnzbDl3jVxov 9GO7QWMj3PRVli4GIiHl+xgxZdKi6P2vS7Jc+7H7dZxjL7HFuaz82Ry84O1K+PJ9rIUoVB VCFYlvJ+jU3K+JZfG746w3xYsuicrutqb3We3PK+1i77pFFEc4hMB/+A0Sluzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zagh9nynv1ScdEfQck4DHVdpj1nCGzee7un2RA2pz6I=; b=O6wbQZRBV8byElkY2zSkEAXOBv3jzJRpVn8nqbaUlY0W9Qb7N2f/eIH5NVNFJxIipcpkC8 zh8WgwhSQR145m0BZrJYKWaBkHgKlqbx88U8KG/geIWyo/DJv+OAseAfcpWz9fvZpy4Qnl eoOJVhyaRSA7ulDRGD80vbh8kSaqbr5pEm76esivEJbm8H6UsAqVBszfPwqe24TYxNFJeN +1FFLeBeQq5RD+x0Y2dSKqFgGtgfxuJEa4lI8Tu74gkhd0KDik8Zj2vtwg0n1furWkQAHb RmjTTLTz6hhpIpezabj3K+KQZbocqlOhX/vJNqjzt2UvouTWlz9JXuUAJ71YFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157960; a=rsa-sha256; cv=none; b=G8UFYPpdLJsupBb5z9U0Hg9ZubgS9CFeAV69XT82PdaJP5D1biG3C9Ihtc+WS/jDcvun2t zyfX2Sww87DUn4cOFR3jEyWy4OBNrnuQQyCl+wvtwEngNSpxy3XfxCjdC9xAp/HqqejxnT iAfEQy74Y6bPSIANDuff9YhMBGrqY1ppFYSP2cOnpcv9oVnNtEfmqOHSCP3QlZm71PIBtq rJDiUTNb1v+h8tE4VdOnTw5ubApkp7uAvRNVKpodWxcpcgS+8Es7R7kRKQg5pJd7+svwqF rxBmanK9Ljrb2jzPQdBFgDS4j26i+/KqsG4VIr5Jky09CqC0NhAR+vF3YOGXbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHpJ66LmzhVX; Wed, 22 Oct 2025 18:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MIWeT3043471; Wed, 22 Oct 2025 18:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIWe34043468; Wed, 22 Oct 2025 18:32:40 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:32:40 GMT Message-Id: <202510221832.59MIWe34043468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 74cd979bcbac - releng/15.0 - release: Add pkg .conf to METALOG on dvd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 74cd979bcbaccd8a606704ccdad5bb040e4e5795 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=74cd979bcbaccd8a606704ccdad5bb040e4e5795 commit 74cd979bcbaccd8a606704ccdad5bb040e4e5795 Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-22 18:32:29 +0000 release: Add pkg .conf to METALOG on dvd We're correctly recording all of the packages in the dvd METALOG file, but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then users won't be able to install them very easily. Approved by: re (cperciva) Reviewed by: markj Reported by: Lars Tunkrans MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53199 (cherry picked from commit 2b5c62494df95cdb844b5f6f852412f2178f66dd) (cherry picked from commit 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429) --- release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile b/release/Makefile index 6b5b0c1b975c..c142bc35a45c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -427,6 +427,8 @@ pkg-stage: dvd mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/ + echo "./packages/repos type=dir uname=root gname=wheel mode=0755" >> dvd/METALOG + echo "./packages/repos/FreeBSD_install_cdrom.conf type=file uname=root gname=wheel mode=0644" >> dvd/METALOG .endif touch ${.TARGET} From nobody Wed Oct 22 18:32:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHpK4XNXz6D5Mv; Wed, 22 Oct 2025 18:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHpK26Z8z43PF; Wed, 22 Oct 2025 18: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=1761157961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIL4M/rX7m5c/3eN8hx+UCrq1wZeLeAUgDrOykjhmxE=; b=OCyLfrKlvr2nvrew9Ta0SrfMeaDAi6kM4E0yPDyIyXDKo4Dt1c7XNCXBRZrzrDLMQmwEam qyTtwQnqlhRjyOOTMw2MSUgAiLNzRy5P6/eymeLXd8oS13F+eP0hozHyduH14B+Nn5s3Dp JCQvgtAsIFpRzWTrF96JA5YCvqa0ypV/m7/dpMYDS8vqh8XA6bw1QKvNzD/6VpNZEtTM7w 7tN85YC2MXaxr5rvLss/Ggl8kejmyxq/TwQRoOaAhH6KGYhJATDafZRNrREz1VN5McZEMO A9cGt4+uwMhMeH88rezqh5sx5QtkC3v/MMDLwa4AhztIDNruYr2PjpwAvKORdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIL4M/rX7m5c/3eN8hx+UCrq1wZeLeAUgDrOykjhmxE=; b=wDfmhqIl/mLlWbrHO6EfIm2uk/RGJJnbb3O1U1h6MG8RIZCr6lzJ+FpQyldS3Q9GR6j/au 08YRxJSz278XwD92odCQQqAGeJryvOCoRo0j6aGwVjtNgxGDRT+PIZCxjcBHYDFsMXs4xd KyYviBNw2JGuMSeFluvX4YA3BmESgC/xUWC7cKpFI17V1J/WBMuryJbNmWD1AR9cNE00Bd XhMWaUPq1d1wvlzcTMbkyqKYfd00RsAnYZU8C9C+xv8NKgTYABCEEnHJCpuMuELeo6FoI7 6o/Q/csaq9wSymHpp3AEp3D3zkyqZAdBz8l+Qd6WAtICPW/kAkwOtxDao6SYAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157961; a=rsa-sha256; cv=none; b=KaxXUr+jya5zKbamojidYN4MvkmkxnkfRI+vYiI0K/IvfNplx20jGvixuFrh2Drkrxd4P1 Ub5bh+ANbGUkad18K8a975rneyl/PosGR5sKUv4WxVlr0FNNX65QiM2DsCXVs+e6JdntL2 BQct+d3gcUtWWO0h8XOT2LkX1Xl3vJWafJBSeiMza2HSyZzFeh1z6OTM29AeTQMwR1G1x2 iy6xiy+TRw6biRv55WbWxdv4LsOUWfREEwYBVOLtuGX2t4cKt0fwSo8IANAZ8X1kcWLn7z MnYevw1eue++B2hX9GlrDYyYVcp8OoClpXJRIv7p1sFivs/HEV3Y9gPcDzij8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHpK1WPDzhVY; Wed, 22 Oct 2025 18:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MIWfEW043553; Wed, 22 Oct 2025 18:32:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIWfus043550; Wed, 22 Oct 2025 18:32:41 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:32:41 GMT Message-Id: <202510221832.59MIWfus043550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 34943c3c2a3b - stable/14 - src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34943c3c2a3bbc68fabe99367e24d2fe28eb2472 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=34943c3c2a3bbc68fabe99367e24d2fe28eb2472 commit 34943c3c2a3bbc68fabe99367e24d2fe28eb2472 Author: Mark Johnston AuthorDate: 2025-09-07 15:44:53 +0000 Commit: Ed Maste CommitDate: 2025-10-22 18:13:01 +0000 src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list It was added to the list in bsd.opts.mk in commit 4f81c42fbd76, so should have been removed here. Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. (cherry picked from commit b2f5dc591ef2547ee2e9b68e58a263cd34948db1) (cherry picked from commit 7626ba028089b97b5bb204b5203ee8fa24f63c48) PR: 290427 --- share/mk/bsd.opts.mk | 2 +- share/mk/src.opts.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index b56afb89a44d..dfbcab89b7fd 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -65,6 +65,7 @@ __DEFAULT_YES_OPTIONS = \ NLS \ OPENSSH \ RELRO \ + REPRODUCIBLE_BUILD \ SSP \ TESTS \ TOOLCHAIN \ @@ -80,7 +81,6 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_ZERO \ INSTALL_AS_USER \ PROFILE \ - REPRODUCIBLE_BUILD \ RETPOLINE \ STALE_STAGED \ UBSAN diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0bc3d64806c9..0c8eb737fa05 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -166,7 +166,6 @@ __DEFAULT_YES_OPTIONS = \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ - REPRODUCIBLE_BUILD \ RESCUE \ ROUTED \ SENDMAIL \ From nobody Wed Oct 22 18:37:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHw73lD4z6D5y8; Wed, 22 Oct 2025 18:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHw73B5lz44s3; Wed, 22 Oct 2025 18:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761158263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4/cYKkTYnlFUW0moeuYHAB2m5eXnzUzxmJIfJwULGTk=; b=DFsTbB3eoXWXZzD3kWlW/XG7/XkNX3/5n1X/9wzqaIwVkZNR2JBP77y6a+LXB8HxUQcdgF KQ58DlgTusbtW6pxZ/3qj6ARrHm/+oT+UrYFi7F9FTuyxwOJg1sPi42oTuGMdKN4TBurnn 9zeaOvwRyMdSvHc7lLVWf0jZ+3AWXZh3ZsTO5ymYieixkiSCz7zqkc9DArIDmi1D7V+Bxq eqWmWWbAYZrsF+fUzZ6/vnimeWTo46bzvCQBKqxM68STkEtpvrHkD4L4UeSka4oZJDhXdT 4wy/mQbzqFKykIR9MdOUCTbFgz48iOF32J0ET8CZ9zrh24d3XH3/+vhqmeJetg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761158263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4/cYKkTYnlFUW0moeuYHAB2m5eXnzUzxmJIfJwULGTk=; b=CHtdCpMvACgsGzljD7ofbsIoRRAYj+ZgMUPMIui4+TjoZVDKMN51uwc8XBpJnht/jItcl5 RMxjS/L1HrS1wL3yt3B7LPIcn+JP8ekVFSKdCCWmBVIjAyAnm0dxhJ5vfoixGJ2V4Wvqjl Jcrdygq9+kK9z7Q6K+lGXkEk+J7Yw5HqdbzCtg9at+1dkw4k5USe66nNGHMGopncJzwqh8 8PMPfbUM5Utz7GHGU3gomc9RKlVKvGdmn2H8gUHn3XjEkOdHSekbjmamrMFtpYoJ60DSRp N7BtgCGUzhD0VYefhSrl5VYq7QDhQEZ026DGWrqMUY5qLA9pEi8rvFk2dcerTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761158263; a=rsa-sha256; cv=none; b=Qjy72AGmx5Tbyan+aguqS2ZB5dMXYTDZos0k6KoAB8HxzYY7oyYDTNea+vcmbhXLh64Er9 cIXshAntAissC0+5m3jq88JspRRvdVhwt1Un1SmRYH0pnfYrSbIJiaIlwcs+Qqi6NBF7BG 9kHr79smzvtGKlGGxDsjb99y03tFxqgUwzIeLbU5VaIlzl39gfXk4kYERBghJJ2f0CmYZN CUNnAkog/cuopLH0VWZKXvRQrGEmpcmPHXxtXmrmaFM9il74WWGwHc1r8B4DLXGcmrvVrG qk+jND3vNsEZ13pZHE0hAAGsU6nEuqj9uwlQk6Ycn3eQ5Bz9nJZyhBSjVZ88aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHw72nBYzhY9; Wed, 22 Oct 2025 18:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MIbhIY045406; Wed, 22 Oct 2025 18:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIbhUe045403; Wed, 22 Oct 2025 18:37:43 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:37:43 GMT Message-Id: <202510221837.59MIbhUe045403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 283699338c57 - main - random: garbage collect the RANDOM_PURE_OCTEON entropy source List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 283699338c5724253f721f4d0e488113dd49bd17 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=283699338c5724253f721f4d0e488113dd49bd17 commit 283699338c5724253f721f4d0e488113dd49bd17 Author: David E. O'Brien AuthorDate: 2025-10-17 00:55:51 +0000 Commit: David E. O'Brien CommitDate: 2025-10-22 18:37:23 +0000 random: garbage collect the RANDOM_PURE_OCTEON entropy source It was used for Octeon MIPS and all producers have been removed from the source tree. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53146 --- sys/dev/random/fenestrasX/fx_pool.c | 3 --- sys/dev/random/random_harvestq.c | 3 +-- sys/sys/random.h | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index f4ad1e295d54..ec59b97a2070 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,9 +167,6 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_OCTEON] = { - .entc_cls = &fxrng_hi_push, /* Could be made pull. */ - }, [RANDOM_PURE_SAFE] = { .entc_cls = &fxrng_hi_push, }, diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 96676e8694bf..e38fd38c310b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -661,8 +661,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", diff --git a/sys/sys/random.h b/sys/sys/random.h index dca30dc8fde4..af6b1e117423 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,8 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_OCTEON = RANDOM_PURE_START, - RANDOM_PURE_SAFE, + RANDOM_PURE_SAFE = RANDOM_PURE_START, RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, From nobody Wed Oct 22 18:39:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHy90Kplz6D65s; Wed, 22 Oct 2025 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHy86qxQz45DW; Wed, 22 Oct 2025 18:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761158369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ND12Gd1VK/ojx6XmUOYgCdVWX4d37sPD2vbhAtCBTMc=; b=Ntg4gJqiLs9jzI4bLOpYYtb/dCGOU45WOTlHmjXHkkmdoeXgHYrpODV+pkHXZfEfUNRrAp nRlNR7aMfRB8oMWBPbVV7FmJ4umjwZRXa5eRHTB7VcC7WzmhjA30l8LuBpE/pkV+vUNfG3 d7+lIAeZAIp4Jd5JKJE0GZooMPPSHuAUeYOlLGS9hzied+pxDl111AfJwf9wP8RWg31m5I CqmNpJBvovZ8vdo4C6R9qPLHVx3U84guGYYF/w1sLmWwac/qKu9bcNZ0rEqOOMN282u+jE yClq/qTqpmq3I9I3/IO4XktDBHPr2/qVDKus+yznQ9uzsjbCwrwBuIjgxWZ1vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761158369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ND12Gd1VK/ojx6XmUOYgCdVWX4d37sPD2vbhAtCBTMc=; b=Ls7u+f3VmynoHt2XF0tjWU8ErXrIWgPbJoRfh4Y2WcuMeug2Uz6JvN/YSeJI0uOfxLxDr6 7ADoanjoXeWsQZesxkYU4GB6tKXRoby4xWxcdXygIlgmua0aJ/ED+s/Z2e6vAGBo87cqdD TV6sHf6e5LM9QL4hvwbaBurDwor2iMZbzNO+0IEvnwFxO++92pu6+H+gDCdHoDpusIpZg3 fyD8hfiJk1XYa58L6uhY3Y8LuPGBQkAweyLPr5MOElMV+O8iueoGvnHPulK2UUKxQqf2LF KgC4NsALO2OW+d0tcb+WKaMk5zP05joLElWQ/bS/Rx1PA6fbvsKWJY7m8lYkKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761158369; a=rsa-sha256; cv=none; b=KTUVFyMj29lUVHgXFM6sgVQID2Y+4njuix/8UJP9JeFLdFcAwR7KkMGRd2SJcmC6lNdX9n bN0VZW/908iP6f15N/8vWA78pAbfCu4hGDYue+y7D6dMVCyOEHRdOk1Erx9fDsVDD3MpSE LDVkUYdyRP2WjlX07QKbgox9InvIOu53GTt6vWU3gOBNaWvDXG7mSM9pfF/LexyKbBK8BB fqRLOPoEWeFKXURtjHYmEJdERn5ci+pUwvAudP3R05WcQPnsu2u70orxhTMLxylu2LCrhM 50BWGjaYNlpRkymatjHVsVhZwtF0Aue7OlHb/gBhg+RVK9FjtkoUzP1sxFQbtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHy86LwczhVf; Wed, 22 Oct 2025 18:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MIdSNh046197; Wed, 22 Oct 2025 18:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIdSEU046194; Wed, 22 Oct 2025 18:39:28 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:39:28 GMT Message-Id: <202510221839.59MIdSEU046194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c10884484342 - stable/14 - src.conf.5: Regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c108844843423bffeed0317b722b5c3277d8dccf Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c108844843423bffeed0317b722b5c3277d8dccf commit c108844843423bffeed0317b722b5c3277d8dccf Author: Ed Maste AuthorDate: 2025-10-20 18:10:20 +0000 Commit: Ed Maste CommitDate: 2025-10-22 18:39:05 +0000 src.conf.5: Regen after recent MFCs: 9d0b660e6949 ("jemalloc: Fix activating debug on WITHOUT_MALLOC_PRODUCTION") ac5378d93ce0 ("Add build option for the ia32 loader") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 24d041d055a4..f7e523ea70bb 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd September 16, 2025 +.Dd October 22, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1046,6 +1046,16 @@ Build GELI bootloader support. .Pp This is a default setting on amd64/amd64, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. +.It Va WITHOUT_LOADER_IA32 +Do not build the 32-bit UEFI loader. +.Pp +This is a default setting on +arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. +.It Va WITH_LOADER_IA32 +Build the 32-bit UEFI loader. +.Pp +This is a default setting on +amd64/amd64. .It Va WITHOUT_LOADER_KBOOT Do not build kboot, a linuxboot environment loader .Pp @@ -1187,15 +1197,15 @@ if executed as an unprivileged user. See .Xr tests 7 for more details. -.It Va WITH_MALLOC_PRODUCTION -Disable assertions and statistics gathering in +.It Va WITHOUT_MALLOC_PRODUCTION +Enable assertions and statistics gathering in .Xr malloc 3 . The run-time options .Dv opt.abort , .Dv opt.abort_conf , and .Dv opt.junk -also default to false. +also default to true. .It Va WITHOUT_MAN Do not build manual pages. When set, these options are also in effect: From nobody Wed Oct 22 19:07:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csJb2744Wz6D9Dy; Wed, 22 Oct 2025 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csJb26MlFz47lK; Wed, 22 Oct 2025 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761160078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vxINWvVY5nJ4xl/tDW1ibfOmd8Ff3ZcFLk6t6xZgUs=; b=wF5fetjH1ucMgpAeF8AXXA3tBk4pm5YP2Ra7kD7VK29C4Qniyh2urnFVd2CXgjlTOy/xWY 7CjwzvZHCiI1CKAkZyYDgcVDyL2G8lmQD9Rm1mhyvUp1GxvdmjEdAqIyDfn0mhvNoiUiKk GDVrdqKZibDTK4zu5yxGeXeDtC8hWGs7a3kp0qMzSpnfICq+ETgPzK9FX4+o0qvdCd3kjV siwFplP7Mv5tu9Nkflp+4lNymqA22rz4Zlu2HFiqas2B0Io/1qjQUXiQQ3o+PBEtn7TfSi FQIuQyNvsNKXwYgz+9Og1WqyBnsFJm2T+g3KDqTm7fWkQ9RH2ZKVx5UiCKRrzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761160078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vxINWvVY5nJ4xl/tDW1ibfOmd8Ff3ZcFLk6t6xZgUs=; b=D7g9yaJrNijr3Y9NtSFdbEqgshpTVL0KxH/n8NudMyk4ISqxqupfhZIPFIOHirUAiQ8+yg LotozHRaq8ucyGPfarR2MVut8PMlKh1bNEMC5aUSecA8gwr5+WstK38FT2RYLVFmrcxu+z UWDi+yfWzxLyKZN/Gl0m4dZUmknFNoiedH+WY6VgtwW2xxZU+CcDji3Sks+TyHvaApCef9 ZZ3yx0cuSv/YZx8iLNHGfVFbjm/m1wKO6tf+03S53eRIfe3wXSkNlT3oLmJrf0JH5efu26 qW7T03z+WMB17wdt49Z5vSo9MDIpBYBy4JuWzBWfvWD6B0nEKMfyuOnfsGxtqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761160078; a=rsa-sha256; cv=none; b=QayS41qBCnnqHrvN0TXdMj/5PnmYqC7cL4Ik1fq3mpnaiVlH0uBWxAIy1JHkHAlgXfWSkk jSJw4w/lA8MSA/wyRACFGMnPJUY+TveSltgpoljITzSdZNvU3P1aaLmDUm/faBKUGwIqPi //SlsGd1PlLucEPFTYUCdlkAboQtzZJlzaKinoWyVnAgwx9rmaJgd7HeJkJCBHXJZvZuPt Jlmd1tWdf91N5dN0glQzzuI5xX9WPGgzXKrf9niVBb/+Dh6midduB0kGJZDeqDJC/NqL7i SZ0Pgv5JmgKtomr0CdtybosEiWdAr9YZrZr9rdTfmk0VtQo79zib8sZ4E2edqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csJb25hkTzgxR; Wed, 22 Oct 2025 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MJ7wOJ001984; Wed, 22 Oct 2025 19:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MJ7w6N001981; Wed, 22 Oct 2025 19:07:58 GMT (envelope-from git) Date: Wed, 22 Oct 2025 19:07:58 GMT Message-Id: <202510221907.59MJ7w6N001981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 536b07512c4b - stable/15 - pf: fix 'no rdr' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 536b07512c4b931b9d0d3d609c3ac925f55e3ec9 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=536b07512c4b931b9d0d3d609c3ac925f55e3ec9 commit 536b07512c4b931b9d0d3d609c3ac925f55e3ec9 Author: Kristof Provost AuthorDate: 2025-10-18 15:47:47 +0000 Commit: Kristof Provost CommitDate: 2025-10-22 19:02:14 +0000 pf: fix 'no rdr' Ensure we always have a non-NULL rule pointer (ctx.rm). It might have gotten set to NULL by pf_get_translation(). While here also restore the previous rdr behaviour be re-adding the incorrectly removed 'break' in pf_match_translation_rule. PR: 290177 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53191 (cherry picked from commit cb36bfee25b71d1223b8fb1237fcf823d514b50e) --- sys/netpfil/pf/pf.c | 1 + sys/netpfil/pf/pf_lb.c | 1 + tests/sys/netpfil/pf/rdr.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8d3d72148815..af0629397ea0 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5939,6 +5939,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ctx.nat_pool = &(ctx.nr->rdr); } + *ctx.rm = &V_pf_default_rule; if (ctx.nr && ctx.nr->natpass) { r = ctx.nr; ruleset = *ctx.rsm; diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index b8b5157c9b15..29d7a32e0bdc 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -216,6 +216,7 @@ pf_match_translation_rule(int rs_num, struct pf_test_ctx *ctx, struct pf_krulese */ ctx->arsm = ctx->aruleset; } + break; } else { ctx->a = r; /* remember anchor */ ctx->aruleset = ruleset; /* and its ruleset */ diff --git a/tests/sys/netpfil/pf/rdr.sh b/tests/sys/netpfil/pf/rdr.sh index 24b95b2047f4..b0f0e6d13d0f 100644 --- a/tests/sys/netpfil/pf/rdr.sh +++ b/tests/sys/netpfil/pf/rdr.sh @@ -338,6 +338,56 @@ natpass_cleanup() pft_cleanup } +atf_test_case "pr290177" "cleanup" +pr290177_head() +{ + atf_set descr 'Test PR290177' + atf_set require.user root +} + +pr290177_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}a 192.0.2.2/24 up + ifconfig ${epair}a inet alias 192.0.2.3/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + jexec alcatraz ifconfig lo0 127.0.0.1/8 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "table { 192.0.2.2 }" \ + "no rdr inet proto tcp from to any port 25" \ + "rdr pass inet proto tcp from any to any port 25 -> 127.0.0.1 port 2500" + + echo foo | jexec alcatraz nc -N -l 2500 & + sleep 1 + + reply=$(nc -w 3 -s 192.0.2.2 192.0.2.1 25) + if [ "${reply}" == "foo" ] + then + atf_fail "no rdr rule failed" + fi + reply=$(nc -w 3 -s 192.0.2.3 192.0.2.1 25) + if [ "${reply}" != "foo" ] + then + atf_fail "rdr rule failed" + fi +} + +pr290177_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "natpass" @@ -345,4 +395,5 @@ atf_init_test_cases() atf_add_test_case "tcp_v6_pass" atf_add_test_case "srcport_compat" atf_add_test_case "srcport_pass" + atf_add_test_case "pr290177" } From nobody Wed Oct 22 19:51:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csKYk024Tz6DG1q; Wed, 22 Oct 2025 19:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csKYj6YXGz4FLD; Wed, 22 Oct 2025 19:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761162713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuw7pRY8DVwsRTquLRWu9XSvPAjF4LL1nTbw6qTiVas=; b=Rq5qSI3gNyBp0X5bA3DRSGK3hPExU9TxA9Qm6yrkn7yuFretp0TAxqWr9dQT8fjGgGvBCM bdXxwHLtw84TMFJva5G6Z11myXPI37ATcPjcA5hvrnN3xjmDwM6snNHVcWamHo5Aa2sxHd IN+FLeI1zmyOFx3OSx7PUyS6jvbAktlnu1hmPdwkSPOde55m+yuIKAwYfGHu7O7MERuMEh joPaYNizJAve99bb81L6QbM86BHJgMGuxT9OpJ+YmN67lpj7oxCR/MChXt9Pe1zOe4XveW YT7/6dYpxgpQr3uRJJFh+T527aegEgSskQM8FDzYHmlBvk9JHOQ+lP8MQs+OQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761162713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuw7pRY8DVwsRTquLRWu9XSvPAjF4LL1nTbw6qTiVas=; b=W6sJKHI30BMWcB7G7f76GtwKSwyfcYO9rie9X4TT8n9WysPNSPKqhJCbD8yeeyJmYE5ndb 1B0CUxMY3LHVmudGewJybs9TAxOdqYjJH307/Y53hluM6YGKxFDdoU1yTbkPn2TfFewwqu 00sbjLcx+pu8/mPNiiiFCGWVlrqlfEaqzrgwKCmTSwy43Z2AYjLt8C5yrrh7qjkgJMRS6V nAbUkkZs7oIzS1dKuUDPTI3kWYJCi2daOZMF83rQdUtqPx/jKykJtf+SZAZKoh5+D9BTJD LWEZJaiplyWGXeQ2LXWJat1EwXc1vF30GISVsbinqvbW56lRXiFGzWFNWWrtSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761162713; a=rsa-sha256; cv=none; b=Mw48fY9/KdlKgQgIT8nCzXcMpSJmrsr2kwLR6CLa4zuNEDtyqAEIXr5KgSzKU2o9jRomQN OB5rmYyVxPyh1WZ0zckLpWjSVPCcmwAObV2ao//vJ/54jM0Q5PHWNTlW/CzCrn9S2WpKL7 IJUz8SZOlI1MNu9MyDVEhjBJi2kpSNI+m5ChhtDNoNdPnbjv8Bfd95LjREW13LTqh9cQFf HeaoxTcbvwx00QS9a8skeS3GkH/n+b04q5D1w6mBkassBo3o+9t4zlYM4rryxLLJp2rs92 gxnmHC9pc/QFlXZPakdI2fxaGwz5MmqnCElle5GXPQPhc7A4QLafD4wXGnFn6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csKYj5rGSzjhr; Wed, 22 Oct 2025 19:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MJprp5092270; Wed, 22 Oct 2025 19:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MJpr1u092267; Wed, 22 Oct 2025 19:51:53 GMT (envelope-from git) Date: Wed, 22 Oct 2025 19:51:53 GMT Message-Id: <202510221951.59MJpr1u092267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 4dd2b869cd07 - main - krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4dd2b869cd078ed6f40c42d1ef429222da16a58f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4dd2b869cd078ed6f40c42d1ef429222da16a58f commit 4dd2b869cd078ed6f40c42d1ef429222da16a58f Author: Jessica Clarke AuthorDate: 2025-10-22 19:50:50 +0000 Commit: Jessica Clarke CommitDate: 2025-10-22 19:50:50 +0000 krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux This shows up in GitHub Actions as a warning, and some compilers can default to it being an error. --- krb5/include/autoconf.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index ed0bf8cacc14..f1cf42d8f90f 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,7 +691,12 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __GLIBC__ +/* Bootstrapping on GNU/Linux */ +#define STRERROR_R_CHAR_P 1 +#else /* #undef STRERROR_R_CHAR_P */ +#endif /* Define if sys_errlist is defined in errno.h */ #define SYS_ERRLIST_DECLARED 1 From nobody Wed Oct 22 20:04:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csKr92yVsz6DGhd; Wed, 22 Oct 2025 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csKr922kYz4GgT; Wed, 22 Oct 2025 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1CduWD2PNRvN5wT1L+nuYFhlqzNUFUuUWGDNo5MnrXQ=; b=F5q9OSonX5zZewoASD7KXtKbRcP9U97dcNRjtAaAH1hOgHFi012OsxHSJDj449h78uS5Cp JR/f0JxgA1QjKzlAJE/jelSZK7xb9ffxsFmlqmiagVLM/TY6lGUsfKbDw25lCoA5nmDWg/ 05P7GAtx6U63xdYitPPSEP+hqKHYQTUZz6ObPy0WmXj8V4OK4YGUuWTm/G+ks55M7F2h6M dFJfU2ItE40jgC8nIzra2UF/n9oM6ZgNs2TaGeUh2qrkOjhB5vV9h8v4A5PjSbrnPUWVCL 31i+3URtBbaLdKjWsR9eO4Zj45MB1cIlQWXCFTNV/QNxpQjaSg8v7oH0dtvbug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1CduWD2PNRvN5wT1L+nuYFhlqzNUFUuUWGDNo5MnrXQ=; b=qHc4gycXd6ySjimfNfO/1oAEuMlf76V753e3fx5aeUlQstvmFX4AcPnKzWQKZWBLF/Qrsm I1Fg0kHe9xndkF0tXSyd+2AxDZ7EJ4Uvzrq7oJvsgITAUywTtymIgNARaT+OxPuNXuwXM3 dk4md+m5AJgIDDH2dYymxeWJFdky1Ze4Al38qZ+0UOVRNTAxUe83lfqLM4zHB+YwNhN1NA 7V1B3zY1dxVEISNTkj7EK1MMfhP30xeY/qCOGP1D8NIyJ/r0KXb0sAaoQsgxKFRn9nawr6 FNtIfwYnUqw1hESkzo36gIloomTZS9QRWK58tRcilWYzWnYLRPFT4a91q6nBIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761163465; a=rsa-sha256; cv=none; b=PgICD1edkoJqdiMhSPKFTF0bMYsbApg41Y9NMJf8teocKWKCe4Bzfo1aNbgjpm8/VFbvWa R1n1d1EmeamwXgEc3ACmUEfHfo4hEmKEGixPPeLSEzrHI6U7CdtWoOFenesdy7rJAgSZc/ jvwXd1S6HZAnqx+v5VrT61PoAIRHphtxMhOpesDnlGnPyRxI8mrRCZIzal0wNNC4sRwLXM eLwi2qukNSaghl8+qBgapZwYmPeO4XMgSj3zLOxjc/EWLTyqtsZieBk3vObLvi6g/qjTOw +SlcFxmpSaLCQPV+jKsDIy77emhWPaUq8BVje/2bWLQ29YXl10okYHprq+vSRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csKr91VG3zjvX; Wed, 22 Oct 2025 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MK4PBH014078; Wed, 22 Oct 2025 20:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MK4PHm014075; Wed, 22 Oct 2025 20:04:25 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:04:25 GMT Message-Id: <202510222004.59MK4PHm014075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 69415879e9e4 - main - src.opts.mk: Enable LLDB for 32-bit arm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69415879e9e493cba78b3a4afb1a78d813a2eb8a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=69415879e9e493cba78b3a4afb1a78d813a2eb8a commit 69415879e9e493cba78b3a4afb1a78d813a2eb8a Author: Ed Maste AuthorDate: 2025-09-21 14:31:05 +0000 Commit: Ed Maste CommitDate: 2025-10-22 20:03:40 +0000 src.opts.mk: Enable LLDB for 32-bit arm It was previously disabled when we built for older 32-bit arm targets which lack 64-bit atomics. As we now support armv7 at a minimum there is no need to disable LLDB. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52668 --- share/man/man5/src.conf.5 | 6 +++--- share/mk/src.opts.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 1bb609336532..bab2c3d84abf 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd October 1, 2025 +.Dd October 22, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -956,12 +956,12 @@ Do not build LLVM's lld linker. Do not build the LLDB debugger. .Pp This is a default setting on -arm/armv7 and riscv/riscv64. +riscv/riscv64. .It Va WITH_LLDB Build the LLDB debugger. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le. +amd64/amd64, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le. .It Va WITHOUT_LLD_BOOTSTRAP Do not build the LLD linker during the bootstrap phase of the build. diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 446f78a2acf3..e10455cd4e82 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -302,7 +302,7 @@ __DEFAULT_NO_OPTIONS+=FDT __DEFAULT_YES_OPTIONS+=FDT .endif -.if ${__T:Marm*} == "" && ${__T:Mriscv64*} == "" +.if ${__T:Mriscv64*} == "" __DEFAULT_YES_OPTIONS+=LLDB .else __DEFAULT_NO_OPTIONS+=LLDB From nobody Wed Oct 22 20:07:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csKvC0vmnz6DHL3; Wed, 22 Oct 2025 20:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csKvC0FWqz4HKG; Wed, 22 Oct 2025 20:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaAsQ9JZKtSDu16G32bqepAr/FjMRzkZuOkFcl6uOd4=; b=d18RV978f+xZYlBjyAunmEeDgItc+WZTViW2/in2emGjySOiB88DDQWYD86oGW56IbqLRp I2W8nYI1KtrGWsw3CB5JaRmgnH04MWcUX9RLTD0pmt4ngYcQhT1OgO3UbQ5VWHl8vt793x k7FOjV2gQmM5JoMyPL7/MLKr2kkklJF/bm2Xu3dH7dxlk5hDK1aS1ez9AGntozW1+hZEh2 iSN9fSVJOzaDsxRH1WokTv8QVy45sFwZxVZ9CSN8aWKBcl6TxJEQOPqKqwzbgK8/m+Q4Hw yVdC8g5WUtbcy9lMDCLIsCULMumN+2qnTwVxSBGDI84gkuyvTYgpo9juwTpwLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaAsQ9JZKtSDu16G32bqepAr/FjMRzkZuOkFcl6uOd4=; b=yOzMdG9nBjuj9n4sZb1Pobmhr6mAq0/cjFheFFD8Vd7x2CAVUsJqtY0MWbYjpfja9+1fWJ evHaeSKqlqLfuMNtSUNg2q7/3LVKqWMcZXrxC406qaDtKGC7lAcslajVnUZCHGGO8eWnWg Yjz6iYOKDW4Lq6fGg7Ovw/sLojtc5xPUCuWm9isrWJsSrGWcsNCu8tkpu6TnL0KKbfgwsv 5qVYxSea/xAe3x7C1OwgbLXanYFX38/6Jf7EX60Vd6eIXV3HpZAR+NUZNwvKPW0vf+gWwL mZWE4jsYpqe0Rtm1Pj4ogQq9epYNnetSHYLm0l4gsQh7QOgL44txgevYtWA+qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761163623; a=rsa-sha256; cv=none; b=w9YmCBYbnrdB2RPSU5HJI2UwMv2iNHxH8rP4/EbnlhCaDD5efkMp305ND8xywD1G9+klEl 9IB991pTunfOCJ/JzlxQm9e0cOLUmxLkVaUObd850FDHhH57Xym9jT/Mie3jPAVs6pAyVt M+sHWJmsPFkU9+LuETBzFLLlQG+ub+c+p6l2pzzUC7sdBH3b2RkVWbG0Mnjh+o/q6BY+uD EuUqWZjMO9I9+Te/eWUnAvyE6AkQQEdjhENeZ4icO5vKJwTiRa6ym61gOhMcL48c/h0V+3 BJac2xNRbdOtq8hLstkqyS9vRgPcVgCckk/RcACQR1OMwcNFYQkwossEhsKQDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csKvB6prxzkRy; Wed, 22 Oct 2025 20:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MK72fC014982; Wed, 22 Oct 2025 20:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MK720t014979; Wed, 22 Oct 2025 20:07:02 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:07:02 GMT Message-Id: <202510222007.59MK720t014979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 34e7a57673c9 - main - krb5: Include on Linux so __GLIBC__ can be checked List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 34e7a57673c9730ee5d1f7ebb07e152567bd8e0b Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=34e7a57673c9730ee5d1f7ebb07e152567bd8e0b commit 34e7a57673c9730ee5d1f7ebb07e152567bd8e0b Author: Jessica Clarke AuthorDate: 2025-10-22 20:06:02 +0000 Commit: Jessica Clarke CommitDate: 2025-10-22 20:06:02 +0000 krb5: Include on Linux so __GLIBC__ can be checked __GLIBC__ is not pre-defined by the toolchain, it comes from features.h, so we need to make sure that's included by this point. Fixes: 4dd2b869cd07 ("krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux") --- krb5/include/autoconf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index f1cf42d8f90f..760aca79176b 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,6 +691,9 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __linux__ +#include +#endif #ifdef __GLIBC__ /* Bootstrapping on GNU/Linux */ #define STRERROR_R_CHAR_P 1 From nobody Wed Oct 22 20:15:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4p6Klmz6DJ5m; Wed, 22 Oct 2025 20:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4p5mzdz4J0Q; Wed, 22 Oct 2025 20:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NnLV/DxwQ6WT0zhxaAiNwajp95dY7SqGQe8L6Ho7zPM=; b=Xi87owYPS+Ejv6IwHvQgjZ8uOTFQIfYNp8X1WLjb9otG1LbTo0RRu1ZmeA/lUWVUNjWSks h9sqheM2G4GjgdMgarXbfBY3UA2rdYqkZnSL+j7EJYE8IBfdvlk5OjWMUA1H7ImeEpVjX8 L3jrBuVa1HT+uwJGDdths66ZPbByvIZjC87gS7xgjBo1iZwb2diV8aRBgvBs7uAbsd6PSV 8eZ8ZUSzVQx4ggK8OmWNTfbnCy81+UCD4GHburPwAo2fyNiBMbrPWOJWk0kPZBWi2Tt0JO qPYUbjD0hHsYJW4MIV/8ajEStMV55xvkg3aW0FNiCpIiCD9Q+jse+3I8nkJkVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NnLV/DxwQ6WT0zhxaAiNwajp95dY7SqGQe8L6Ho7zPM=; b=rDphOy2XFT9RHyQGRXcwDFb6EWnXKd3ubIg23jLQXiN0KnBivPR0tircwU/MvP4jtPYwpM ax1HI8fEVkNJsfGWjYuEPufaaoM0pfzojfrtFNAccAgLwEKYb/vAutCyGOQbSfCMZsvy84 sFYpHT2AvPkH25gf3nV/XQagrUGbXfKOVC1hOnvgJ+ohKFvIeTR90SiP8CejsVgeMVyBPq EaZu2oocAR2r3XwD2/552w9d6hfTh3i4Pa2E/5d3QssF4HhBWFsKOZNzcz88fVgIYophFx yxLnQhA0Kt4IUN1OHyFFOa6zq0RvfkbFRHJudExFUyWCeLM03JSw4I8NQd0Eug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164122; a=rsa-sha256; cv=none; b=m9bgPAWCrh0FzQ8oY7Flw7ejVn2UqId0aswQlG/o+SFN11YbTXGp5he42F2XNVlqzNmSG+ P1+KORJVsrcJYVc2upjVtGr7ndIyUwLK7pyxZJgFMDSTWAGZWoNv6e23UTOPhSlm9fw3Ik HmTZtV1hkQaaA6LOV8mGNXglJS0Bo5aplNLqfshQFNtT5kiwviA9NbEwGNqZLo5RYcpgor Yy1XlWtkkN1r0lEcMppjvODBsRkLPOxyNawIR18O6muUGP+o1dFvGNgoEMKFHG0XRD4x8F YSBGyEFVkiMJ2foB86cFIJS9/KxB08O65DYp36XNTm4MuAyrBJHW/g5AqNYc/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4p5NLdzkqW; Wed, 22 Oct 2025 20:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFMj4032982; Wed, 22 Oct 2025 20:15:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFMxh032979; Wed, 22 Oct 2025 20:15:22 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:22 GMT Message-Id: <202510222015.59MKFMxh032979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 90cbdfa9dda1 - releng/15.0 - bsdinstall: Use pkgbase release URL for BETA/RC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 90cbdfa9dda1d66d12220dac392a7e49e304abd2 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=90cbdfa9dda1d66d12220dac392a7e49e304abd2 commit 90cbdfa9dda1d66d12220dac392a7e49e304abd2 Author: Ed Maste AuthorDate: 2025-10-20 12:38:03 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:15 +0000 bsdinstall: Use pkgbase release URL for BETA/RC Approved by: re (cperciva) PR: 290238 Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53214 (cherry picked from commit 604b6458f3f327206a56da7ba80c2df7965a0761) --- usr.sbin/bsdinstall/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index e5bb3197fa05..5d7be97ed7cf 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -22,7 +22,8 @@ REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE SUBURL= base_latest -.elif ${BRANCH} == RELEASE +.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC SUBURL= base_release_${REVISION:C/[0-9]+\.//} .else .warning Invalid branch "${BRANCH}" From nobody Wed Oct 22 20:15:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4r0ktVz6DHqB; Wed, 22 Oct 2025 20:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4q73KKz4JGd; Wed, 22 Oct 2025 20:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQUTV0LrKU4MYq3gBp4GEN/oJWfaLUIVG9TLqbQAWuQ=; b=DRk/8ZQ4fZV2PPLljLhbNoMmPi4IrsbxowgU6dq1QKKtwzCXUXZrA7/l2LUziy7Ha2IS8h kTV2kBjFIcywCoRwsvSdHu+tJzWHr0zMkI7CBrmmGQNMzfFlbk4HHbRW1KfpPBUOelOCHe L8TW4R4RZtlMXEJ/2stgoy+jVtDtGr4AYuIrzxxwXe3qs9N9MxQ/W1y0G9eTv+es1fNXLP gGX45iHM92MscjRZENtPa+qopwjXLO3QqEfwJU+Qfr+CsrcmZjYrcXZ91gpEb5HvGPD8xp sl0dX6/sAUSwtMmxJlt8wXoczHe8dPqJU2ehSsEMLCVZB8et9d1LY2iOrj2IWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQUTV0LrKU4MYq3gBp4GEN/oJWfaLUIVG9TLqbQAWuQ=; b=Fs7aIyLZ824PNQ4l9oGSfWUV/L39peqnbjqnu0b2MHNG3Kx1F/gapxItxUW51Ly00jKGVV yI/KePkAI+By/1RoWmbTwVZtt919SzdxefsNBvXcR9HtpBKL37eJSIhRylBlwt0XpuBSud a3qFmVx8uLxwH8H3bHiR6Ofqi6Bbr/CxRlGrwWbkLlELUxcMcVKOYU+G3Cb+FDAWPfF/F1 O+4pMTxnFfjUWhpCDGrsmmZqa7Z7maFuX6oT+WmwEDcPk2NWalIQvMPSZhm0zEb7dG3Q/q 5PqPIpVK9o3ynMyy4HtbbFUlBx3+MuYUi+5kc2Y3tzbG6mz3gZlUyJmCYVEZyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164124; a=rsa-sha256; cv=none; b=fJoA5EXw3qyL++ew/jKRB9/55PNU5yNJ23hMNp5/WtLy1aCVPb+ce4KQGKO3e/UGnpSobD E16FWJLsvJhgwGtznbRBFZppkceAW+37RBFzKFHgSE6YQLjqptTvYyZlSLiozILuFktilU 1kTQ998KILEEKpOeKVXQYtlHB6WsUtBjHAkXHV3G9b+ubvjWNRvVf2lzv6jQEQPNiMvBlS c4bPppzTPOYSCdiXuoqCcBm7gla3ctuRwv70t7SNqkXpesCdQrcw2S4CimJzcV2+Y+a60t BMrpsADK2oWITFEWoXaFevdkcdslqxbEmTPRQQPNpt5gEkkyhd7WTtrOvHswDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4q6ZH1zl48; Wed, 22 Oct 2025 20:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFNX6033015; Wed, 22 Oct 2025 20:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFNgK033012; Wed, 22 Oct 2025 20:15:23 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:23 GMT Message-Id: <202510222015.59MKFNgK033012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 945500c6ddc5 - releng/15.0 - exec: Check for errors when mapping the shared object List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 945500c6ddc5f670c76e9fe390d8919c897fa8de Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=945500c6ddc5f670c76e9fe390d8919c897fa8de commit 945500c6ddc5f670c76e9fe390d8919c897fa8de Author: Mark Johnston AuthorDate: 2025-10-14 13:33:33 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:18 +0000 exec: Check for errors when mapping the shared object In the non-ASLR case, there is no check for an error from vm_map_fixed(). Restore it, it was dropped in commit 939f0b6323e0a. This bug could result in a refcount leak of the object used to map the VDSO page. Approved by: re (cperciva) Reviewed by: kib Reported by: Ilja Van Sprundel MFC after: 1 week Fixes: 939f0b6323e0 ("Implement shared page address randomization") Differential Revision: https://reviews.freebsd.org/D53065 (cherry picked from commit 7117c86fcb7ebee4483097cefa9b143de8d78ee0) (cherry picked from commit 6a5f0dc705c4401454d4fcd61e7301b992bfea13) --- sys/kern/kern_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 0fc2d0e7f1bc..b2c09b47f103 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1314,7 +1314,7 @@ exec_map_stack(struct image_params *imgp) MAP_INHERIT_SHARE | MAP_ACC_NO_CHARGE); } else { sharedpage_addr = sv->sv_shared_page_base; - vm_map_fixed(map, obj, 0, + error = vm_map_fixed(map, obj, 0, sharedpage_addr, sv->sv_shared_page_len, VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_READ | VM_PROT_EXECUTE, From nobody Wed Oct 22 20:15:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4s2dNPz6DJ1F; Wed, 22 Oct 2025 20:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4s08Tkz4JM5; Wed, 22 Oct 2025 20:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHO9g3jL64D+Q38LMVnj+CD+9EEonm6f/dvEocG4ZDg=; b=vGJkT36/+8TcUPJ18NMAyTXllMQ87pmiKNujp9Zp4mSasUlXWF83Rsvsp6KM6WkpUqH4RY VRbnkfCGseCXG6lMU2maFzhg4rd76DZTZQRyuB1mqQniPP7mEFohc66efxrVq69SwlXcZa BULKl9UcFktj18r0FQtw9A4wyKgjSiHGK8A6OeNwWFTrJOkIoa0eIDL9A4aBvrXAXF67Ld vX6vL+DYzGLlFq18xh1yHy/Bf3on+BoQIwvDiO3188ivuFFBZ07Ce1ZvQfQ1CtN6kpG2gY 4+wO4Pk7ydScNNRJaz/iC9bjRfKQzrKNHJ8KttE3NOcOhxqLzIbUd+63YcJjfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHO9g3jL64D+Q38LMVnj+CD+9EEonm6f/dvEocG4ZDg=; b=X13cJeBr7pTQtKc+3Cbs3kFgF4bhyMB82S7KaPwBz9ALxsNcLR0SQQa/GyuwStgvoOH2+N rJFpGaTwuqxFsC1scjmTENKj/bmQGNu4DIjEkTovytOji4oc4JL3ax7p4nvNYIujTorvbV ygMzcG++6A5NcH2vIrVWmWyq5SkfKOdBBtx0nOG4Zh5Uzsx8oo3qJLisHF3h0gGmNb+eTM H2vjzVAiUAlORJsSzYV4AMtu9mB9CCiP8LrO50z8oUohJeFUwputVndi0pF6nXpOLhhg2s MCr6jSrLHeaL0BHpg5JnV2Z3tSRkuUGd83J5Rmdk13fNsoNb/UMJq6Hkt9sKAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164125; a=rsa-sha256; cv=none; b=nV0m//keFtCfBSYN6fovkAw/bysxxSCTcOBlm3viOKycdlspj7MCyOoCYAp+UYipQQ9zs0 AHY08Ya3pos6ay8EcxxSyzxUcmFEpg6bwQOvNVEiR+BdmXKaepl9+l9Hywa7MTtJlLo9wB 8zqHMrFJW+4D0QKg761VUFIbOQt5D/hZyO2u8TAOSedSPlyPK8G+yiAPHljC1jbhxPStp8 ZnUmdeakJwK7+mq2kBM7khQvG+8QhMOpFi4595tQTTNcv5u2hrZbuEBSo7+BjJoORh5FAH ZAFAPghX0M3Ex/Op7InVsQDuqFoVbvKG9Roaa0+tLgdgjm0BFVDT8yf/mgHptA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4r6qx5zl28; Wed, 22 Oct 2025 20:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFO36033048; Wed, 22 Oct 2025 20:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFONJ033045; Wed, 22 Oct 2025 20:15:24 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:24 GMT Message-Id: <202510222015.59MKFONJ033045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eaafcf841ce8 - releng/15.0 - ipfw: Check for errors from sooptcopyin() and sooptcopyout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: eaafcf841ce87f68756fabfa86e0abdaf0863e0a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eaafcf841ce87f68756fabfa86e0abdaf0863e0a commit eaafcf841ce87f68756fabfa86e0abdaf0863e0a Author: Mark Johnston AuthorDate: 2025-10-14 13:33:13 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:21 +0000 ipfw: Check for errors from sooptcopyin() and sooptcopyout() Note, it looks like this code may be unused since commit 4a77657cbc01 ("ipfw: migrate ipfw to 32-bit size rule numbers"). In particular, it looks like the ipfw_nat_*_ptr pointers are unused now. Approved by: re (cperciva) Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) (cherry picked from commit 302c4c540e449e3fec02e27742f7572039347f66) --- sys/netpfil/ipfw/ip_fw_nat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 1e2ff1bca290..19393d5b8444 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -999,9 +999,11 @@ ipfw_nat_del(struct sockopt *sopt) { struct cfg_nat *ptr; struct ip_fw_chain *chain = &V_layer3_chain; - int i; + int error, i; - sooptcopyin(sopt, &i, sizeof i, sizeof i); + error = sooptcopyin(sopt, &i, sizeof i, sizeof i); + if (error != 0) + return (error); /* XXX validate i */ IPFW_UH_WLOCK(chain); ptr = lookup_nat(&chain->nat, i); @@ -1104,7 +1106,7 @@ ipfw_nat_get_log(struct sockopt *sopt) { uint8_t *data; struct cfg_nat *ptr; - int i, size; + int error, i, size; struct ip_fw_chain *chain; IPFW_RLOCK_TRACKER; @@ -1134,9 +1136,9 @@ ipfw_nat_get_log(struct sockopt *sopt) i += LIBALIAS_BUF_SIZE; } IPFW_RUNLOCK(chain); - sooptcopyout(sopt, data, size); + error = sooptcopyout(sopt, data, size); free(data, M_IPFW); - return(0); + return (error); } static int From nobody Wed Oct 22 20:15:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4t3pk0z6DJ1J; Wed, 22 Oct 2025 20:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4t1bYXz4JBY; Wed, 22 Oct 2025 20:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eg/2lPMcOk8W/K4vj5QO+A1Ilfo0/FLwtA7+Lm9bTE4=; b=HpFLk+UyRh1x9anZoYWs0f54WuwVygi0P9d37WeFQK3trKHajXjWdLHA6LG3rnmrk7DgBr fyLvv7+m9C3IwDFZ/P1i8WMHJBWQyVlmyagk1aBHSalM1+riR3sSxlI5dw1LUH/dHy/xnN BJlajLkzocC8UwivS+i7ajhcCHo5TgV4f6OWFFRECFNq5rnd24dp68rEpI0MEiy9soW0Cf NQgojSgmXsK+9cqnixHCZvABfqiO1YS55baAt3j9C19/vWv6WIl15e2CARgdlrUwHuCN2o yWW/dqlLW6USQaa5LfuoKvoFG8WJ0iSdDEe+Yo6ElG/wKdx5aDZxBNFJhtaggQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eg/2lPMcOk8W/K4vj5QO+A1Ilfo0/FLwtA7+Lm9bTE4=; b=b4Awhmh9vQgkLKzxihMFg2aqwMVjqRAzK2T8uz9qDWPgjV1ZBEKxw1dwy+ajPEoeYApcum 9q8+xmPAPp9GvpYd3VzCus9iKtubwLCuT/pwEKacBE2Sj4ZRYP061Rpvzp/W+m2qOzGGqP O2VtNgpnYq4IjHEUPv4dh6I0FmoR+TnVr4n1CMDcWCrtftsxeHGN1hJXCrOgckZO3nPQdx Eg9ZVwgRhL4EQ0BjqiGvFqIh+hpiaWJ9hZEW8OIH12Ft3dNnyXx+5LnlHUPqqwTWa88+bo B1egkIZ2VasRKZ1PXIaXkpIeYkKJPSHdIPEpVmfDIbOCLLQtVBgbi7NawV1Y9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164126; a=rsa-sha256; cv=none; b=nBpn0KgqICC32NGFiZqdkHCZOv/BMmvEq8d8Gqh27E5ABEfX7s9ET+NTI94xXuMP/HjkYe 7AXMAcVDefHh0Agnc/yFc48SxupKD30PeJijF/j3LmFAvDafkgF0LfQA+MoBdcq68vOk5w iDgveu4FxKj0JU0vMg5todmuTseAToNFzi+lWtpLxQDGDmin1GzX+gs6zE8wi06n/SPVdC SlUos/FPrdpnOVq27+NcMRN5hlF5zR/4uuWcd+nx72WmC2CVDfa03RjXjk6S9ki9WtBiw/ e3yYDbN3Oa5XI4uz2lEvCkSDk4eopGelBLdhnUq872rGqdzkdD19x3sBPFHIQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4t0zl7zl49; Wed, 22 Oct 2025 20:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFQQt033081; Wed, 22 Oct 2025 20:15:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFQ0k033078; Wed, 22 Oct 2025 20:15:26 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:26 GMT Message-Id: <202510222015.59MKFQ0k033078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 95f60a34dd1a - releng/15.0 - libnv: Fix a length check in nvpair_unpack_string_array() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 95f60a34dd1a0518368154150b18d1063d4c5cce Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=95f60a34dd1a0518368154150b18d1063d4c5cce commit 95f60a34dd1a0518368154150b18d1063d4c5cce Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:23 +0000 libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Approved by: re (cperciva) Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) (cherry picked from commit c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c) --- sys/contrib/libnv/bsd_nvpair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index c73bc2189121..b884dd260b84 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -985,13 +985,13 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, size = nvp->nvp_datasize; tmp = (const char *)ptr; for (ii = 0; ii < nvp->nvp_nitems; ii++) { - len = strnlen(tmp, size - 1) + 1; - size -= len; - if (tmp[len - 1] != '\0') { + if (size <= 0) { ERRNO_SET(EINVAL); return (NULL); } - if (size < 0) { + len = strnlen(tmp, size - 1) + 1; + size -= len; + if (tmp[len - 1] != '\0') { ERRNO_SET(EINVAL); return (NULL); } From nobody Wed Oct 22 20:15:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4v3ldpz6DJ1K; Wed, 22 Oct 2025 20:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4v2KGMz4JHR; Wed, 22 Oct 2025 20:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVUcjx2+yEcXijAg2/u6yBdpqdcaUBowXC9R7kyXvfY=; b=g6r5invuxNhV5IH8YIF7Y+PYYoNvdZyR0Ql2ZDxJtDwzWanT3s0Er5uvtL81mhauz01Yv1 rFnMZYlYiYz/ExC6DONbrVdfBwBEAr81VDE/BTrEWPi1XYjysKtXcMGUYmQK8PoxrLeP/H lGLPtGvaeMiD82LFc8roG4WyXSb47uUeWuBh0dXZo2LJYXdVVWUepGDGOCJk9GEUQ+l9Uf aZbnuv5Aozg2iPG/UQz55Kvkf4mRXyO/2U3D/RcqUO5HYO0NNkhD1v1Yo5t2i3Q9HjOhTe 9aQzp2PjIpG6crT3QLvkcWV2xNqo6rculVQ6PBuu5peeCSrwIHBDhLb35Ol4jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVUcjx2+yEcXijAg2/u6yBdpqdcaUBowXC9R7kyXvfY=; b=KWcWrkbg01P91TXqx/bl/07XDYCXyvan5N46CNUWYH2WR2g3OW2WI1rmK86XvCbt+nVoeD Ch53GDo/Y1cXHzcRj2N4Ob3yrB6NFxvbJHwJyV2345H7skeR0Kn1tJCDSNDqJZcCIP7mpp p+pYX9L+7EntuByzP5GLUCWi8z6QULkb4f5VuBU3c3NhhFNgg6OHc6lq9Ppoq3089Fz8xB /CTir/qeSqSlj3R8vCX56xk5iXDx2TrXoyuA4Vd/6LeitfdEopdibAQ66jf2nAlRFyp07S GEXYzU3v6HoIOWx+1KMsqHhUyBAuYMcsPJuYb4m8MgiYE6E+TG6gNBfdDAVtYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164127; a=rsa-sha256; cv=none; b=wnIQGriag+1PRR6a1885dUhb5ZCitLRtxVcO/tphRA6ht9DjiWXPaV1x8JcGlIRC3wCphI hcpABd4V1NMhhjcv0ACS3faDqScfaAYf0YPQd60ZDIHaS1qfuV6+sgbcvJ6GgTEbQjjUmW XWrP2gvNnqE+BykKKy7OVpXCc19V3fT3IfsQ2rjj5WBvo5h9cvYxM2q9eGPSkIXK+l1+u2 WiLT/kfk68x7ZkaT+xSgS9Eala2Gm6qazAHkfJE111ekAIHB6w/wIHHYdb0zpQuYxPu16B 6JttO9PHjjVJuKTwg78i1sOiFBoQM0jod9dKA8+IYt+MVwVimVCaue5yRtWZFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4v1tN2zkqX; Wed, 22 Oct 2025 20:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFRap033120; Wed, 22 Oct 2025 20:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFR5U033117; Wed, 22 Oct 2025 20:15:27 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:27 GMT Message-Id: <202510222015.59MKFR5U033117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b1faa50c18e8 - releng/15.0 - imgact_elf: Check note body sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: b1faa50c18e8f65a43c7fb4c4170a9ff47706805 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b1faa50c18e8f65a43c7fb4c4170a9ff47706805 commit b1faa50c18e8f65a43c7fb4c4170a9ff47706805 Author: Mark Johnston AuthorDate: 2025-10-15 20:14:36 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:27 +0000 imgact_elf: Check note body sizes In parse_notes we validate that the note name fits within the note buffer, but we do not do the same for the note data, so there is some potential for an OOB read in the note handler. Add a bounds check. Approved by: re (cperciva) Reported by: Ilja Van Sprundel Reviewed by: kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53063 (cherry picked from commit c86af2cc4cd12fb0174843b22d737c3b5b5d55d0) (cherry picked from commit 09ae918e1f00572f9045283c281cf2d210ece491) --- sys/kern/imgact_elf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 1bc2491a1a12..bc4fcad6c61b 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2831,7 +2831,7 @@ __elfN(parse_notes)(const struct image_params *imgp, const Elf_Note *checknote, } if ((const char *)note_end - (const char *)note < sizeof(Elf_Note)) { - uprintf("ELF note to short\n"); + uprintf("ELF note too short\n"); goto retf; } if (note->n_namesz != checknote->n_namesz || @@ -2839,9 +2839,9 @@ __elfN(parse_notes)(const struct image_params *imgp, const Elf_Note *checknote, note->n_type != checknote->n_type) goto nextnote; note_name = (const char *)(note + 1); - if (note_name + checknote->n_namesz >= - (const char *)note_end || strncmp(note_vendor, - note_name, checknote->n_namesz) != 0) + if (note_name + roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) + + note->n_descsz >= (const char *)note_end || + strncmp(note_vendor, note_name, checknote->n_namesz) != 0) goto nextnote; if (cb(note, cb_arg, &res)) From nobody Wed Oct 22 20:15:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4w4S6vz6DHqH; Wed, 22 Oct 2025 20:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4w3GZ1z4JVY; Wed, 22 Oct 2025 20:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/l7Mbnqv/EiOtyUZQxhTEHilWVi+KzXStrvgxLb7To4=; b=HeM7bI9/bKWIEYdz5wPzzdf3uDDws8rUaIrtsf0JZ/tuVo48+7c0RCaBbfMpE9CW6jr4dn 9JrHT4RylRxw4GI02pHaV3aRNT21STa7Zkb27WX+uPcWqanrbgKRHbX37iv6sprHp3V3TR h4q1nJgoSBok/AHOHJRs3OhkDayVNFWs/qW302gXNsc6vR5wpz1AE1kLK6GF/zPsxd78IO r07jfopsoiy+fS85mM1xiB0PHtHf5xEf34kkDiAiW7NmQaZkYyHW0CmM3hd8mStE+DjjX1 2eFwIhb8WPivUqLTr/VgDcYCi6ZauQQBnX21gmNcF4QL489RHXxAGalP7OPQ0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/l7Mbnqv/EiOtyUZQxhTEHilWVi+KzXStrvgxLb7To4=; b=vtiXGWMjy/W2AS0Q0c3hkpbOSVqv3K1IMtlivxiMKslztfPpN9WBKbnALCQSW42hCm5ZrW g+xkqPLsFQENqGhVr3q4FY6hZGfHQvj+5q6RYXS+0xKy47RYZpggVX3YrrZUdPGg14RqY5 8RfE/Il4nPc7zhStC82Abj2Ul4c/nK5IvYRJnTLp1vdP2bBTFy+IKkGiB4bFyrxOPbOxxL 7GzsqiFWx+04mN1JZTmy6keOMhcVE+WOeOTBRQHpRad3V6GI7FIsvWIvaubdSPVR2WK8IB StX01bL88Ryy1X5uwMtuqWjWzoRjpk5Wuc8nLhtHaEHRgpAbCAf2KM/YFh9u4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164128; a=rsa-sha256; cv=none; b=xrobZyfnrs1NLjW5Vtkmh7BkAKx+4K+5MdBQ+pG9NaZ66MXK0rueZBZNzuf33t3oj09PJN 4OJQuCJTj2ZrAX7ouJ/JMZ2B001fDIY2RcMXhmQWA/oTlOz56Nd7YqTHBOWWdgwDKe+Up6 8gPOTBaCU5Y5UNTbxTOX6X1v39nux8kcjNrKGdblBSxa8oVBMxEA6lyJz9Z00jP50CcKGf y7NZ/C6wsybYtil4vFZFuGfuUnf5UQZEKTMqvGIvmr+p0YdpnTVHU0MNyNcfZFT7ed0G1Y ky0FNR6Uxh3OxP1Dp+l6DFW8bjD8mNjrUZmanbWmHerx05ae3ddg3sstay28uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4w2nmwzlCJ; Wed, 22 Oct 2025 20:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFSI2033157; Wed, 22 Oct 2025 20:15:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFSJd033154; Wed, 22 Oct 2025 20:15:28 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:28 GMT Message-Id: <202510222015.59MKFSJd033154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0948c4d4a330 - releng/15.0 - libc: Add "Z" as TZ designator for strptime. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0948c4d4a3308737879342d87efc311913ee4335 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0948c4d4a3308737879342d87efc311913ee4335 commit 0948c4d4a3308737879342d87efc311913ee4335 Author: Gordon Tetlow AuthorDate: 2025-10-15 22:24:06 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:30 +0000 libc: Add "Z" as TZ designator for strptime. ISO 8601 allows use of "Z" as the time zone designator. Update the strptime parser to allow this usage. While we are at it, update the manpage to reflect that both UTC and Z are now valid options. Approved by: re (cperciva) Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53083 (cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d) (cherry picked from commit 3d368c699b73cc1dff3ca27d29d19666741d9ff8) --- lib/libc/stdtime/strptime.3 | 2 +- lib/libc/stdtime/strptime.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3 index 7df73d2d080a..9456fa757b85 100644 --- a/lib/libc/stdtime/strptime.3 +++ b/lib/libc/stdtime/strptime.3 @@ -171,7 +171,7 @@ is taken as noon. The .Fa %Z format specifier only accepts time zone abbreviations of the local time zone, -or the value "GMT". +and the values "GMT", "UTC", or "Z". This limitation is because of ambiguity due to of the over loading of time zone abbreviations. One such example is diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index 5f1293c7a267..375e49146639 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -546,7 +546,8 @@ label: zonestr[cp - buf] = '\0'; tzset(); if (0 == strcmp(zonestr, "GMT") || - 0 == strcmp(zonestr, "UTC")) { + 0 == strcmp(zonestr, "UTC") || + 0 == strcmp(zonestr, "Z")) { *GMTp = 1; } else if (0 == strcmp(zonestr, tzname[0])) { tm->tm_isdst = 0; From nobody Wed Oct 22 20:15:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csL4y0vHzz6DHqL; Wed, 22 Oct 2025 20:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4x4J2Tz4JXy; Wed, 22 Oct 2025 20:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tD2UoBsWPLPNKcsFSQrCsr4pDe2/GnGUr660nHKj6l8=; b=LocCRgzA2Bp42ExNdU7r43wQm9yGUwL9HNwMUUkKabyxAyZxSjkemF2R6/QreWkM+jaD1y wkobH7GI1GiIzquwSbPuGdgwvQqYEhRjSoOhND2pDasM1gTOlUvflgCTXKwozTIsbLlvan lGCutDmjWz3mie37GyM9z74d1D/2fQwUwXZNMEwSiPvp/nnAQ9+Sncp7AIOgL3VQP1J2Tn SClXWXuPSNepNvCFbwO2gXh6QGPjIGieTXSaksdude3u9DNoCeC+HQXCnWDMgLA4P6owFx Gt3T5r8SbbGYu8wYsj0YOeG9Bafkue31G31NrbQ0efuPc6U1y7EQEnYVKM2Rbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tD2UoBsWPLPNKcsFSQrCsr4pDe2/GnGUr660nHKj6l8=; b=tIgNHbj81HwpBabMhE3i/iqm+CP+/Q8FEj1BuKgOxXoVh9pggBrTv9AF7em64t5GWbd6vJ nOobH5n3tZv8tez0COrPBFkTwMBboDPQNLvNbeo/rGWjsJbY1vN9VoFb17jpxs4GqV0qQL e0dSr9ZVGJOAt9fvCWPRTC63BY5ph0Ahpa0/taZdlLOSGLEDHKt1Nuh/dhUoKTaXfD/D9e pxOH53zFJF4IMflrBmmSD+5Z4sF1+itRJSe23QSbj8GC+TMNdTA1PnyJSoohlcSXSNJnDb prbq1wh47cCXLwBFUCJC6CZ1a1LU7S42uLR60Na975gDOTH00NTHpgYI5efRMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164129; a=rsa-sha256; cv=none; b=Lu8ZRz9YV2l1o4AvEf2vaEmahK2+zsI5VCs7MKLz+3je8HrY8UO02meVCmthBEz/7kZ8DU o/8w6T3itZtyHO+p5TiWc54yjecFvwXHmRi5qj6L0Eo1Cyk9COxLgkt2Zgf6niYkQWSGiE 3dvGH5xd8qFz+IzaiNLIvx/oC64z7x9YRhwnpTLVAAbpfoKGD8gqVxf1wmq3vZL4UMcUG4 zBSV4MCU0iOgKIygqnI7EDg1UFQnIC7Ro3AeeOGARyH/b3CeeJZK0xj0HgaK27eJK12t7/ S9TvaDpKtLBEwO7wZ78PT7iw/6uZoLh1Hjqye0oTIQtY/7hkROXMryr9uOVJ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csL4x3rHmzlCK; Wed, 22 Oct 2025 20:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MKFTfR033190; Wed, 22 Oct 2025 20:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFToC033187; Wed, 22 Oct 2025 20:15:29 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:29 GMT Message-Id: <202510222015.59MKFToC033187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f138688ea41a - releng/15.0 - pf: fix 'no rdr' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f138688ea41a1a2ecd0d08d02575542f31f1ceb5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f138688ea41a1a2ecd0d08d02575542f31f1ceb5 commit f138688ea41a1a2ecd0d08d02575542f31f1ceb5 Author: Kristof Provost AuthorDate: 2025-10-18 15:47:47 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:34 +0000 pf: fix 'no rdr' Ensure we always have a non-NULL rule pointer (ctx.rm). It might have gotten set to NULL by pf_get_translation(). While here also restore the previous rdr behaviour be re-adding the incorrectly removed 'break' in pf_match_translation_rule. Approved by: re (cperciva) PR: 290177 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53191 (cherry picked from commit cb36bfee25b71d1223b8fb1237fcf823d514b50e) (cherry picked from commit 536b07512c4b931b9d0d3d609c3ac925f55e3ec9) --- sys/netpfil/pf/pf.c | 1 + sys/netpfil/pf/pf_lb.c | 1 + tests/sys/netpfil/pf/rdr.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8d3d72148815..af0629397ea0 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5939,6 +5939,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ctx.nat_pool = &(ctx.nr->rdr); } + *ctx.rm = &V_pf_default_rule; if (ctx.nr && ctx.nr->natpass) { r = ctx.nr; ruleset = *ctx.rsm; diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index b8b5157c9b15..29d7a32e0bdc 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -216,6 +216,7 @@ pf_match_translation_rule(int rs_num, struct pf_test_ctx *ctx, struct pf_krulese */ ctx->arsm = ctx->aruleset; } + break; } else { ctx->a = r; /* remember anchor */ ctx->aruleset = ruleset; /* and its ruleset */ diff --git a/tests/sys/netpfil/pf/rdr.sh b/tests/sys/netpfil/pf/rdr.sh index 24b95b2047f4..b0f0e6d13d0f 100644 --- a/tests/sys/netpfil/pf/rdr.sh +++ b/tests/sys/netpfil/pf/rdr.sh @@ -338,6 +338,56 @@ natpass_cleanup() pft_cleanup } +atf_test_case "pr290177" "cleanup" +pr290177_head() +{ + atf_set descr 'Test PR290177' + atf_set require.user root +} + +pr290177_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}a 192.0.2.2/24 up + ifconfig ${epair}a inet alias 192.0.2.3/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + jexec alcatraz ifconfig lo0 127.0.0.1/8 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "table { 192.0.2.2 }" \ + "no rdr inet proto tcp from to any port 25" \ + "rdr pass inet proto tcp from any to any port 25 -> 127.0.0.1 port 2500" + + echo foo | jexec alcatraz nc -N -l 2500 & + sleep 1 + + reply=$(nc -w 3 -s 192.0.2.2 192.0.2.1 25) + if [ "${reply}" == "foo" ] + then + atf_fail "no rdr rule failed" + fi + reply=$(nc -w 3 -s 192.0.2.3 192.0.2.1 25) + if [ "${reply}" != "foo" ] + then + atf_fail "rdr rule failed" + fi +} + +pr290177_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "natpass" @@ -345,4 +395,5 @@ atf_init_test_cases() atf_add_test_case "tcp_v6_pass" atf_add_test_case "srcport_compat" atf_add_test_case "srcport_pass" + atf_add_test_case "pr290177" } From nobody Wed Oct 22 21:20:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csMWh56WZz6DQwd; Wed, 22 Oct 2025 21:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csMWh4d36z3DWS; Wed, 22 Oct 2025 21:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761168016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vb5/sYpVdeyWS3HTIU0z2r0Njf2yo/xQANrnor2zRM8=; b=R2pkwwG/SNlm1ennGLjKGTnJCcKxhqgEQFW6nldrIdDNXqMfUjSy+sIpJB/BqgdJfww9tJ bNbgFMhmJklOWGoWBji0fk4Spd3mpuiqiAtY9QfbKhM4iTCZgpFIINR6bJHrp68qHpfqHs ra28svp/gt8t4V0MZb0L90DbpKlTpEsDhb7+b95mY6jBocIch1ojG3Vq02XdGPHSUMevcX wbXWg2n4P9wKvEFSScPG09ZcZGLq3+V5VgfbFU0Mi2A6j6Fr0WXZGhRihpAsAahwnJ6G8I 5dKUIUv8VYYz0QN1v5EjQlxur13hdmAvZS1oJVzRZzHf2haX2X6BHqVmvOpyGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761168016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vb5/sYpVdeyWS3HTIU0z2r0Njf2yo/xQANrnor2zRM8=; b=KXE2mJqTIgTjpvUkeunPJALed52ZqiuLN7HB1er/V2mdxmSGn4tLE3KeWlK8hK8wxgEtsB t+qatxzfwPNX2/dGCBiefq2ulI/9DnRFbrPaR+D1iezMkbDnpo1GIM0ENuBtIaqR0M2ey8 vwkzNelGEecCzkAunyyUK2aA4FRhirxDRn0cgNEX7shSEMKoxN7pkwyFc4jkdiM3iWIjFs 1YA/k/IalsqApLCvQm/68B/jAHd5Qvb8vwKxI+MRO4Golct3h39sxVUfK2kFTiSIIkUEhN CR17LQuvTH8L6Of9OZo+mURzTtG6Qllr1fxoXzsuBHL73yq+9R0OBVkXLUSUSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761168016; a=rsa-sha256; cv=none; b=N/7Wz7CaVtHGZZuuA4txre7Zo3KvwaUjguKooDP3ZoHOTxRPcieXVJifmQuY2y9+k1z/3c NFhRusR9qqV4/x0uiHloY1dmxGfOKaX0uxtQoy2km9rwCLNNIsdXTn7vsU+6wlo4GtSJSy lo+wVeUU5IHzZpBdKr8dirQNbrXTD8J0OYMDvPBktzk2acxlub/7buAgOOapEc9ukVZHJH rFU3zECTih3aqaHU2J8TYYkI2T9UDYB6gyM9+yeb4Mt7PDkRnPUjc5MwkVVimdb9Kio1qm g4Iok2ZskJBgunkvNse2h30c5xBIM9tdtTAhQYCRnAuVY1mhW7zUenNd7xxyMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csMWh49y2zmX1; Wed, 22 Oct 2025 21:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MLKGX8055547; Wed, 22 Oct 2025 21:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MLKGnD055530; Wed, 22 Oct 2025 21:20:16 GMT (envelope-from git) Date: Wed, 22 Oct 2025 21:20:16 GMT Message-Id: <202510222120.59MLKGnD055530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 3b6d4c6cdffd - main - nfs: Add support for the NFSv4 archive attribute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c commit 3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c Author: Rick Macklem AuthorDate: 2025-10-22 21:16:48 +0000 Commit: Rick Macklem CommitDate: 2025-10-22 21:16:48 +0000 nfs: Add support for the NFSv4 archive attribute The archive attribute (UF_ARCHIVE) is listed as deprecated in RFC8881. However, the Windows NFSv4.1 client folk disagree with this and say they need support for it. This patch adds support for it, in a manner similar to what is done for UF_SYSTEM and UF_HIDDEN. MFC after: 2 weeks --- sys/fs/nfs/nfs_commonsubs.c | 24 +++++++++++++++++++++--- sys/fs/nfs/nfsproto.h | 4 ++++ sys/fs/nfsclient/nfs_clrpcops.c | 3 +++ sys/fs/nfsclient/nfs_clvnops.c | 8 ++++++-- sys/fs/nfsserver/nfs_nfsdport.c | 11 +++++++---- sys/fs/nfsserver/nfs_nfsdserv.c | 12 +++++++++++- 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ec95716ea485..8d506a5643a9 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -641,6 +641,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, if ((flags & NFSSATTR_FULL) && vap->va_size != VNOVAL) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SIZE); if ((flags & NFSSATTR_FULL) && vap->va_flags != VNOVAL) { + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); } @@ -1672,9 +1673,17 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_ARCHIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (compare && !(*retcmpp)) - *retcmpp = NFSERR_ATTRNOTSUPP; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (compare) { + if (!(*retcmpp) && ((*tl == newnfs_true && + (nap->na_flags & UF_ARCHIVE) == 0) || + (*tl == newnfs_false && + (nap->na_flags & UF_ARCHIVE) != 0))) + *retcmpp = NFSERR_NOTSAME; + } else if (nap != NULL) { + if (*tl == newnfs_true) + nap->na_flags |= UF_ARCHIVE; + } attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_CANSETTIME: @@ -2804,6 +2813,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, if (!has_hiddensystem) { NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); + NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); } if (clone_blksize == 0) NFSCLRBIT_ATTRBIT(&attrbits, @@ -2888,6 +2898,14 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, *tl = txdr_unsigned(NFSV4ACE_SUPTYPES); retnum += NFSX_UNSIGNED; break; + case NFSATTRBIT_ARCHIVE: + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if ((vap->va_flags & UF_ARCHIVE) != 0) + *tl = newnfs_true; + else + *tl = newnfs_false; + retnum += NFSX_UNSIGNED; + break; case NFSATTRBIT_CANSETTIME: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); if (fsinf.fs_properties & NFSV3FSINFO_CANSETTIME) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index d628108bdc1a..13fec8a102a3 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1135,6 +1135,7 @@ struct nfsv3_sattr { NFSATTRBM_RDATTRERROR | \ NFSATTRBM_ACL | \ NFSATTRBM_ACLSUPPORT | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_CANSETTIME | \ NFSATTRBM_CASEINSENSITIVE | \ NFSATTRBM_CASEPRESERVING | \ @@ -1217,6 +1218,7 @@ struct nfsv3_sattr { #define NFSATTRBIT_SETABLE0 \ (NFSATTRBM_SIZE | \ NFSATTRBM_HIDDEN | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_ACL) #define NFSATTRBIT_SETABLE1 \ (NFSATTRBM_MODE | \ @@ -1262,6 +1264,7 @@ struct nfsv3_sattr { NFSATTRBM_CHANGE | \ NFSATTRBM_SIZE | \ NFSATTRBM_FSID | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_FILEID | \ NFSATTRBM_HIDDEN | \ NFSATTRBM_MAXREAD) @@ -1298,6 +1301,7 @@ struct nfsv3_sattr { NFSATTRBM_CHANGE | \ NFSATTRBM_SIZE | \ NFSATTRBM_FSID | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_FILEID | \ NFSATTRBM_HIDDEN | \ NFSATTRBM_MAXREAD) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index ad9404a18fc8..d3b83eb8b94b 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -4162,9 +4162,12 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, NFSATTRBIT_TIMECREATE)) NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); if (!NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, + NFSATTRBIT_ARCHIVE) || + !NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) || !NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)) { + NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); } diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index e9ae91e046e7..f80cf30669ca 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1081,12 +1081,14 @@ nfs_setattr(struct vop_setattr_args *ap) #endif /* - * Only setting of UF_HIDDEN and UF_SYSTEM are supported and + * Only setting of UF_ARCHIVE, UF_HIDDEN and UF_SYSTEM are supported and * only for NFSv4 servers that support them. */ nmp = VFSTONFS(vp->v_mount); if (vap->va_flags != VNOVAL && (!NFSHASNFSV4(nmp) || - (vap->va_flags & ~(UF_HIDDEN | UF_SYSTEM)) != 0 || + (vap->va_flags & ~(UF_ARCHIVE | UF_HIDDEN | UF_SYSTEM)) != 0 || + ((vap->va_flags & UF_ARCHIVE) != 0 && + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ARCHIVE)) || ((vap->va_flags & UF_HIDDEN) != 0 && !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN)) || ((vap->va_flags & UF_SYSTEM) != 0 && @@ -4835,6 +4837,8 @@ nfs_pathconf(struct vop_pathconf_args *ap) break; case _PC_HAS_HIDDENSYSTEM: if (NFS_ISV4(vp) && NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_ARCHIVE) && + NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) && NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index eb6ba285f8fe..9fe3f4426124 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3193,7 +3193,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, bitpos = NFSATTRBIT_MAX; } else { bitpos = 0; - if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_ARCHIVE) || + NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SYSTEM)) nvap->na_flags = 0; } @@ -3226,9 +3227,11 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, attrsum += aclsize; break; case NFSATTRBIT_ARCHIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (!nd->nd_repstat) - nd->nd_repstat = NFSERR_ATTRNOTSUPP; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (nd->nd_repstat == 0) { + if (*tl == newnfs_true) + nvap->na_flags |= UF_ARCHIVE; + } attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_HIDDEN: diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 921ea4887af1..6f3447f26620 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -436,6 +436,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, /* For NFSv4, only va_uid and va_flags is used from nva2. */ NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_OWNER); + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ARCHIVE); NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_HIDDEN); NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_SYSTEM); preat_ret = nfsvno_getattr(vp, &nva2, nd, p, 1, &retbits); @@ -569,8 +570,15 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, } } if (!nd->nd_repstat && - (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN) || + (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE) || + NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM))) { + if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE)) { + if ((nva.na_flags & UF_ARCHIVE) != 0) + oldflags |= UF_ARCHIVE; + else + oldflags &= ~UF_ARCHIVE; + } if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN)) { if ((nva.na_flags & UF_HIDDEN) != 0) oldflags |= UF_HIDDEN; @@ -588,6 +596,8 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_repstat = nfsvno_setattr(vp, &nva2, nd->nd_cred, p, exp); if (!nd->nd_repstat) { + if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE)) + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ARCHIVE); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN)) NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_HIDDEN); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM)) From nobody Wed Oct 22 22:42:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csPM44nNSz6DZv6; Wed, 22 Oct 2025 22:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csPM441Hvz3McZ; Wed, 22 Oct 2025 22:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrSuMpo75JPH8oQU5bygzS7VJRfieuBGLCAW59bhygk=; b=p0J5Yn5ZXs1aKzLL8PZLfhXI0oTyL2VGV/xOr9Spl6Sf+c59pMmVsfjFMknokVfy7EKaPG c4uFiqmuY8fQLgjJErnVdLO2t5eEleLXLsqVkwX9B7DbmsJG31MqMN5sLbSXUMhVXcvke8 EjlmeZAIWib0gHakiybNqehMfy1KGZsaX0ZvyC20nxenIEzR5Ikpr6KdyBUp3ESNtK7454 IqXrP+fkj9bAuQfs+Dz+FVyWFScCwUDbSZFUuuefRapLhKe73P1K7ouFSM35uAbWi+PTqk VpdKlMF0tw1agUvRmRI7RlvnzOZ00F/cHGOfmDurYVYS7OEhVdKxsPcgbJ1kqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrSuMpo75JPH8oQU5bygzS7VJRfieuBGLCAW59bhygk=; b=ndPCfKJ5K2cHPU8uhmukotEynmnZxEM1EzzhIpNFHYBu2QBGde8a+uWuvazN55iDu5xjB8 z4f465C0pX0CIfHB9uxNxGOVqR9KLedurhp14B1VV8axPhG4kKj0mwtJyqcPxcwY3kv9If nNOKoFzWSv+y7XYBNyWJdUbQu+dffGm3YnRv01FFgOSwdbEKfHE/A/MkykJAcgXM6ieAZk oHJ+XOz1qkcPHDDIC0drSfmD1aPYl04yVnD7MV8eL2MkR3LLHlwH3fn38cPqkS3ewXG+kp j4XzbVXFHVjyEwvSsoG4znbbGUqfHxzRoIqltk75eMBgzTz4m/sriipjb40BgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761172976; a=rsa-sha256; cv=none; b=h7ztq1s8PhDfNAF+jvjfr54Jg2Ksl6Rs/R36WB/F353sWFbBZ2Ew0IUTQVS9twcJmb/DJr 0XShPeZ2rhPybueSHLo6mBdj17JG4DhR2G5r1X8GobIp+EN776yJ4tqz/lDhawUig8CRNH Lnil60AU4tOF8GHxPmlhlwUdPcKkNLA2mc/QA9Q9aEGm/DTm/F9XT1G8GI3lS4ZHOPrRj/ Rl/5rQ+hE8q4+4DJc+aLKuRRVydhcIMLwiWcSpOZmIC/iUJRuUKlOHYxHiT0TCs1L4lWBz r82dFxGA87ttT9vBgcqEz5glf00fnfuRV7ObxJHpbaOpvFDRaqnIX6uQo7TpfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csPM43YTCzpC6; Wed, 22 Oct 2025 22:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MMguDo015322; Wed, 22 Oct 2025 22:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MMgu0f015319; Wed, 22 Oct 2025 22:42:56 GMT (envelope-from git) Date: Wed, 22 Oct 2025 22:42:56 GMT Message-Id: <202510222242.59MMgu0f015319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: f942a7465469 - main - mtree: Remove stray wi directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f942a7465469008f7538436a70f15a44cabecbb0 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f942a7465469008f7538436a70f15a44cabecbb0 commit f942a7465469008f7538436a70f15a44cabecbb0 Author: Jose Luis Duran AuthorDate: 2025-10-22 22:41:03 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 22:41:03 +0000 mtree: Remove stray wi directory Reviewed by: imp, emaste Fixes: a21def4d568f ("pccard: Remove wi(4) driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53264 --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 1a60bbef765a..1b0f98706245 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -191,8 +191,6 @@ .. wg .. - wi - .. .. devdctl .. From nobody Wed Oct 22 22:42:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csPM56pqcz6Db79; Wed, 22 Oct 2025 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csPM55CWBz3MJR; Wed, 22 Oct 2025 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CsE+O/W6WVa7CZvFXhKdcCxfESVbWfvNw6Eci3NG8cQ=; b=h5yYn0EJM3ZbOXlGCrugKgFKlzKT0Jbmx3pxZtYQrefXYq2GyrBuq+w8uEgu5ipRRqCQWB 4otDNvOBY46DV3BcIZX5VG2WsADUrdHDMnaJZDVpwNbhno3Zmoqc8ueVZbGG6Mq+ga26j2 5z+yKgzaIioA1ez2+hBxFGVkmSiySZxYHSkilZoDxPiDg3qN1mubk39w3fWhyaGxOoK5zB IIyk0hJCc+jSaSg4fNxyn2drtqJS4GhdZvw0BPGD2QZnjUhPFDft0vADbg//MgUBnGOJOb PzDhjroP8pXO7PC2o0y3KRbPGz/liQxxThbDKGXIW/u3YXk6soK8Piq0SbkXzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CsE+O/W6WVa7CZvFXhKdcCxfESVbWfvNw6Eci3NG8cQ=; b=p0LL47csIHc1DBbgXJG/EmGaGbEWzcuSv+j+N0nMWDHMpxWTtB66t6MACnhenUrIrNmGgc mpYjCz6i4/+bFBDCjB0kTTgA7jWrtB3H43J1g9JTULeSXl4jLAt49j6ASdAINUftXb4LGN c2fD68+bUYF2WHOQ5tNF4VtheOgKAZU6FR70DCT799jX8eH6JKz2Mdxf7i1wjlVi/6s+N1 pTuVi0Fsw/N0L6b1xh6HOYxfNakXr60MdL3wGhLZWuPRpk7rNZNmtArme/OQorB8kO6715 EHqHD53VX9cEaMaTzFd3yQMpvl92YdVPxfO31+BfzM9A9JUzIOT18t/Lau92qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761172977; a=rsa-sha256; cv=none; b=w3mi7IHTV38GPtAqGacyfF6Ig4M+2nV2cnfr+Qtv+jiKmXCxNCdwYzvujPiOfNALmwUOk0 CLvwXII1BFB3eq2KDF/55uHaMq6LeF8fM9u9MIjvsJMS6QndEqiFi2vGNa9P3+MqjAGSEN DxUTAH/fStG//C8wPz1uWSOAtR8c39ttkE10D2BjZDyCPWQrQpTLiMWG+dNLQveFX2M0P/ ug01HJwMKMQdVpdy0oHGfDmcx1PypnuWEsNBCh5DE2erQs4vV5lT/CoMKWkH4ktO5Yypqk R3OiAiuK6X0kSPOXjGJUStv6DEN5CCzcSC1UZslJe5Kmc6AOtSe9J591R+WznQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csPM54V1BzpV3; Wed, 22 Oct 2025 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MMgv6B015360; Wed, 22 Oct 2025 22:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MMgvIx015357; Wed, 22 Oct 2025 22:42:57 GMT (envelope-from git) Date: Wed, 22 Oct 2025 22:42:57 GMT Message-Id: <202510222242.59MMgvIx015357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: f7ccf051016f - main - mtree: Remove stray an (Aironet) directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7ccf051016fe3989ef6fbf10adea3ce4131f91b Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f7ccf051016fe3989ef6fbf10adea3ce4131f91b commit f7ccf051016fe3989ef6fbf10adea3ce4131f91b Author: Jose Luis Duran AuthorDate: 2025-10-22 22:41:53 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 22:41:53 +0000 mtree: Remove stray an (Aironet) directory Reviewed by: imp Fixes: 663b174b5b53 ("an: Remove driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53265 --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 1b0f98706245..ea333a38d889 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -127,8 +127,6 @@ .. agp .. - an - .. ciss .. evdev From nobody Wed Oct 22 23:12:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csQ1f6Ftxz6Ddg6; Wed, 22 Oct 2025 23:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csQ1f5Ynpz3QwH; Wed, 22 Oct 2025 23:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761174774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rwWXX935C4Liiy7n79/DQJIVCdoksJBOJcgjsV9RtM=; b=tZTKhC95z+8VqdqGeHLKCUHqJ8MdCTnYN31ESrEHfHVB4bQgTOjDImbaz2nfBsiJhmDZJK N8TsvabnW8v+ww8Fxl/K2tGz+E4S0tj8Kwo2MiJRo72duUYfDz2/H2/K9MXxZKrbiqSANi dkIiLf/tcTm9V8tvecAdKyMUuIgnU6jfpqMjjaKlzDix+qXpZHxC3U4V9hCntNNbeuhSZs DGei9/sjVsF7H5+VIerl+xHDdhH5fcBFx79RJFu/RmB4P3rl5dHXIZ6JcVWuw65yhjrMhL xJRhKGdv3+PjxpUDvBXlnFO/o1poFm3w04jjAQpFRlt5yIpV/PKMDaOlDq+QFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761174774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rwWXX935C4Liiy7n79/DQJIVCdoksJBOJcgjsV9RtM=; b=b40lPSJfoNuZMCi5LU8rzpBjUBU4dIqwaGeKLeHpCHFduerIWe/5NnZkVWEqbmYhzXxMqj HS3VVGQnVCtU0JdhXk+uSx5zEjfU0geNDxXUIeirYFEoXYLDh7qLmirWU81l3f1Rglo6HO KIKN7SVZfiY00YA0B78FSqsoXcoB0819y7V2L+E0M+QwzUGmx2gqwOKIJSbZ0xpacl4TE0 b+yK4w2C1Gj2cnzJQz8m5ALcdqgSwZeQZpXb0atvK5KzlC59ZVVV1Pm2+9nEAxchcK5B0Y TRH8bz1Rha+etA9DqTudCH2dXNMJExPv2FC2RtatzPSHJ0OC20vVObYeFtl6fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761174774; a=rsa-sha256; cv=none; b=HUuYPsXDgV7RvllFXeegIS30vjlKHAX767XOcCcxfI0+aIpui5K/IPnyWna9xr0ukKe3X/ I+a0SL7snidJwNk58GdcEURU3RD8qFzWE8obTIuK0dPWUAZlDMJAja0kTAL7Wr5BHsWQFE VNdtg5Mix68XvEbdupgsN6SKN5Y0VzjcqBa9kx1j3dEodBjP2x+f+ySdK2d98AlhZPWGF0 q0JAw7k00t5m7ppzmo/2CW5GuC+8Rz4DBzUtDU2FMbEyLEbjGhwaUqypQ+wJHdcBLwQ43o PW//zBM2vj2MfcMwtdApbgCIyx1iXpXcoC2s7YsHAmdN63VZMx0RAkSwWNTHHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csQ1f54dZzq4K; Wed, 22 Oct 2025 23:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MNCsXH072111; Wed, 22 Oct 2025 23:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MNCs3q072110; Wed, 22 Oct 2025 23:12:54 GMT (envelope-from git) Date: Wed, 22 Oct 2025 23:12:54 GMT Message-Id: <202510222312.59MNCs3q072110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: c1a24d29cf24 - Create tag release/13.5.0-p6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/tags/release/13.5.0-p6 X-Git-Reftype: annotated tag X-Git-Commit: c1a24d29cf240cc6dda1b69017be8257ae4f5bca Auto-Submitted: auto-generated The annotated tag release/13.5.0-p6 has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=release/13.5.0-p6 tag release/13.5.0-p6 Tagger: Philip Paeps TaggerDate: 2025-10-22 23:11:43 +0000 Tag FreeBSD 13.5-RELEASE-p6 commit c4530d6e5f368592b6048a0c63892626c05f433f Author: Mark Johnston AuthorDate: 2025-10-22 15:52:29 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:53:22 +0000 Add UPDATING entries and bump version Approved by: so From nobody Wed Oct 22 23:13:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csQ2Y3QZDz6Ddd0; Wed, 22 Oct 2025 23:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csQ2Y2wKbz3R9T; Wed, 22 Oct 2025 23:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761174821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8kI0GoNfdhegFEBLvLZSXaHmkSvgaJV3PZDdlaoxbU=; b=nyc0kYEnk5gcu5VveSFlmNqCzbxpCYSV5hP6aLNfhol3gZgD4IglDGJj6CeLJkLkvv4XCo u0Gj8ZamtKIm0LN412Pox58Gufvkcup9UT+J2ySNgeH8t4+pplxGgTAcBlMSXMC5k1g22P /8dyhU1suTtxYxMOEWlWIS6exaUffVT0IeVjztsL7NdBWZF+RVBrJzM276dEqK8PASdeGe XteF43i0C6FphXTBqdWGSmhc2bXeGGxt/H9MVrsbnZNIc+1/BR5Jh8i/xq3n2SlXs9avVZ SHGS3MdjNLXc/T48CeHUYkTC6y6xGKzWnn5SiUf4uH0C+PH1HTrwtg/kLP2Kog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761174821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8kI0GoNfdhegFEBLvLZSXaHmkSvgaJV3PZDdlaoxbU=; b=DTCXoy7klXwGAa6pwKXxljOUzx0zfksoo4zhtxGdAWIvK4u9p6Bhi9BcXGZEMv67HiR7Bf gWBK9vgoBwDlIepzrnNX4FTvbSV1c4b7GUuNt7DEmhe7lDKmfrF2VXgU9GX1RJ2ygM67p9 gcFhsR6GVm2sbivccYdpstxvnishgROYHW73AGjM4sSDhdgQyiaDrMsBxl31xbHmJQZDPe vGe4j+lFMdMpGad9gkpYQNoBn9bGhzz7LkTK/Wk0knpTr/9dSloavYr+DW+4s7QcZj8qjK Odx+vWVhEOzHWz5QYKhrOTsNOCb+kxb/wfw51cpu5F4RAw2R7VbI3IHDgKke+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761174821; a=rsa-sha256; cv=none; b=MsydGkfXGLhSZ/FtberuNrrJd9cCKj9R9KTZbi6P+hCXmB+opFZ2hDePVphfg6O8CqKjMt pP7Y85S9d6of6jLsnjX+8fS83bPWjJA3ldt1XLgxrxOmb3HP/NKR00tmVkwWyVpaznl/PW 7u6Yl9aQm3E0QpRzsDfTIkQS8mfpa1rMyBDWFSxyHgABMP1AU22YYARbeKWX7W1fCRGamy vWmkLC7BkOglaZcHfVFye7uUAZK69r+4Qdigf0W60++gI7owJN75cFVoTmHz4BCmFRjNAp 4twhnk9EyfF95G0ZIrTOsv4h6wV/ro8+npWIPqG2Osr2V3l1uTrHqQI2YJ4FJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csQ2Y2WJZzqG7; Wed, 22 Oct 2025 23:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MNDfWY072411; Wed, 22 Oct 2025 23:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MNDfqr072410; Wed, 22 Oct 2025 23:13:41 GMT (envelope-from git) Date: Wed, 22 Oct 2025 23:13:41 GMT Message-Id: <202510222313.59MNDfqr072410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 5a508d60dc11 - Create tag release/14.3.0-p5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/tags/release/14.3.0-p5 X-Git-Reftype: annotated tag X-Git-Commit: 5a508d60dc11f501c1b51cc497dcb9ab2699010f Auto-Submitted: auto-generated The annotated tag release/14.3.0-p5 has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.3.0-p5 tag release/14.3.0-p5 Tagger: Philip Paeps TaggerDate: 2025-10-22 23:12:42 +0000 Tag FreeBSD 14.3-RELEASE-p5 commit 382f54740ee421cc0808d70fe79acab1f3d3e836 Author: Mark Johnston AuthorDate: 2025-10-22 15:19:02 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:51:48 +0000 Add UPDATING entries and bump version Approved by: so From nobody Wed Oct 22 23:16:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csQ680WCJz6CQPm; Wed, 22 Oct 2025 23:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csQ676ccjz3RYY; Wed, 22 Oct 2025 23:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761175007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nviLwxvnhBfximdqd7TMewJufR7hdh54XbSl0e6H4Q=; b=xZ1OHEC8lpMQlM5sFH9btg//xz+cjM1Rhf3RfmIkrZFItJjV+jHdijK7yk6H0eeG37ApKP XoJZ6BIeZdfaVdRZ6OlnS+WJ0ue9omEsBEBl9jL4DFkU02NdIXXiIIyeuDq3MYyS24AMZp 8AIKWyuOYftjTyHdyOH4NJ3VKpKadKWhoWbhlknlU5qJndEdk1pQ/SFeYcroYjfrn6VvmC qmh+5R2jyO2CuwzyoJE3tT8tCp/m1QlEnrOKZLdenA7uaBF/rn+c2eDY/AqG6ZdYEW8qyF h8wvAipLHT/r2rCmUKSqKyPdQKHJ1JvuV+etawcgwY68UoqAOrl4vE1sRMgZ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761175007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nviLwxvnhBfximdqd7TMewJufR7hdh54XbSl0e6H4Q=; b=F7Kjxe0T5+ANg1uEGqpIJr8Ho/GJlk6f1AjJM6HSjrauaD6F4SpGdN7FG109dqEG0K+jLf oPnCFf1+lbIjMSC9iQCRJXb3h7I957Z63ZE5sPVuOyMY9ifiAGUYma2M9v+JzFY4kWOKg3 K8Rm9HP6BkCzpq+3+mfKuC9U1bLitK0RQF0MliF+T7iD9rGFqtb6gq5VLAm6o16a5jc5KY cOsKWpbK4BSessrwSR3d1ffQzXAdGh0xO9MwhcQL0efZoqBW1IhjKntnvIH8+uS+GmDRQ8 Tw5hJK6Hh2JmIWDkpC4ALfV8MwKivbluFlkI12/ae8js0kqhMLnDzemk52dgNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761175007; a=rsa-sha256; cv=none; b=B9aCKbSsp38Z3Mzb/hdIn6U3DIEjiGNJe8l9ek3lSU4GY18BzlW8eqHkdxj+xHD1J1KvnL /ltwhORqogoDh3h4daPqb4rGoNX1upA2i20jXflZRvnn7XkVY1DgVmK1uOIF3ayMC/1rH4 KY9VybKiSzTFo3329gE8v9S2X+EazaseH5wwB1xmOa8JiXCqK+FVEStdoM9rbGaH9IOUee lg5+3i4JJWWSDyUVimdxGOz6mECpbtyc3wjiQnIuXjFhM3qbj72nMWQHDySyrAykndm6nD mF7uHGacX41L5QWSFCEyTYclvXFd3HGCLxMX45VPBVBORPpZPRXpHDwAsQY1Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csQ676Cf5zq7r; Wed, 22 Oct 2025 23:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MNGl4r073453; Wed, 22 Oct 2025 23:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MNGlSJ073450; Wed, 22 Oct 2025 23:16:47 GMT (envelope-from git) Date: Wed, 22 Oct 2025 23:16:47 GMT Message-Id: <202510222316.59MNGlSJ073450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: fa240b7ff081 - main - packages: Update the METALOG when (un)installing the caroot package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fa240b7ff081a49d44e0941b2090e5dc5838fe60 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fa240b7ff081a49d44e0941b2090e5dc5838fe60 commit fa240b7ff081a49d44e0941b2090e5dc5838fe60 Author: Mark Johnston AuthorDate: 2025-10-22 23:14:35 +0000 Commit: Colin Percival CommitDate: 2025-10-22 23:14:47 +0000 packages: Update the METALOG when (un)installing the caroot package There may be other issues here but this change certainly seems to be necessary. PR: 290394 Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53263 --- release/packages/ucl/caroot.ucl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl index e43c9d0771f2..f7d0dd8acb7f 100644 --- a/release/packages/ucl/caroot.ucl +++ b/release/packages/ucl/caroot.ucl @@ -4,6 +4,6 @@ deps { } } scripts: { - post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash" - post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash" + post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" + post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" } From nobody Thu Oct 23 00:37:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csRvZ4KRBz6Cbdy; Thu, 23 Oct 2025 00:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csRvZ34dxz3bbR; Thu, 23 Oct 2025 00:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJgNtnf25MVTYBfxtH4QP2wZinE6o+K3mil3hLjRpsE=; b=SLzdkq9UC46TFL7vq2rn7BRelJTRayNXjmmu+BkIi6p4/kvqWPxkXph3qARWPopL84fAhU LtwFMj7LgpixpEhovEiav7kk7XGNgPuSPxbL+PiJqwGQhyQdoPqjJqi6TfGhXffpYLxb/Q /LjWBfjQlVOoF9UB1/qCZrx8tIByHgsbb0apMEx8ekdr1l0Z6Evj6KcL0S0Lde9zsiVjja E9+Zxmvehjt0wq/hn4s/AWzUAkpRMk7E0bIVHoYwtvhd1tChVqshIyZ9D5NgF3kJG+zlBo 52S0gfs3M2vGzGiARVcNAQwNfQCfnERReW/VRsalbV3me73ACu9Ktqlk/fnf+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJgNtnf25MVTYBfxtH4QP2wZinE6o+K3mil3hLjRpsE=; b=klACr4r9iY6ZgWun4lUwBk/S1bGvKEA+RAwYrafEADfRguHAqsVSPFlS6Er9asC5iyqFTL rdrNu4lTDrhOAsThGGgZgqXDfcGB1ggkmxL0mkprLlQk9KTZOUgE35/lqro8zm59OPDYZJ yoyRInM1U0gV9xR7qlYFSBh5NmEaVPFu4dIGVXATYjkLRpHv2PRKx9pVulBYQgAyr0a/+E K/P70DcjNaCgmcgHn7e+Dy0ow98kiHm6swOxwE97WX3wR7/FJ0FOEdSek6fyZalD3ZKzNh Z9n9JWHgVHrL9v6a4s31jeC/LMJMWhGfuFCXnclkAFgSq673D86m6yMJW0zfwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761179866; a=rsa-sha256; cv=none; b=JKtNt3mwXB85UCiXfzppYcTokY9wqnULgfWmY0zsu/I4NHhe/ayUsRnOD0Lhq1Uv0f3mYl mRItHxWSN34NWUNanG3IV5HdCyXAPVEAbZuCBnn8fpG5W/I+5y+UbZpMmL/iYkX0uEXMRA H0S9rBzVp9o3ubL6At16LDBmakK09dds01t8pbYFDKl5/At5yYogoDejJZSR0KCEtPB8/R Mz74f9LDA0qwqA5q2zDIFwzGvjFzDHByV8L6Xj7WjSbePUGBv+M0KcWSddXJ6I7eit6iQ2 Tx7J1M4BCXhKYKOjjOY2V5A89tdX3+l+3IMNMdxPi2/iD3im0KUi8ohmhRvYtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csRvZ2cP8zsQ8; Thu, 23 Oct 2025 00:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N0bkDk023384; Thu, 23 Oct 2025 00:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N0bkAR023381; Thu, 23 Oct 2025 00:37:46 GMT (envelope-from git) Date: Thu, 23 Oct 2025 00:37:46 GMT Message-Id: <202510230037.59N0bkAR023381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: da0e0f755e7b - stable/15 - bsd.man.mk: Support MANGROUPS.yes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: da0e0f755e7b1e904dab8d70a46debce5f5dd5f8 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=da0e0f755e7b1e904dab8d70a46debce5f5dd5f8 commit da0e0f755e7b1e904dab8d70a46debce5f5dd5f8 Author: Lexi Winter AuthorDate: 2025-10-17 10:40:39 +0000 Commit: Colin Percival CommitDate: 2025-10-23 00:36:50 +0000 bsd.man.mk: Support MANGROUPS.yes Similar to SUBDIR and CONFGROUPS, this allows the use of MANGROUPS.${MK_FOO}, simplifying Makefile logic for optional manpages. MFC after: 3 seconds Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53126 (cherry picked from commit e757a92282fcd064c82cf2685dde4730743fc425) --- share/mk/bsd.man.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 0a3594e05d94..1591a3e0905e 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -97,6 +97,14 @@ manlinksinstall: .PHONY all-man: +# Take groups from both MANGROUPS and MANGROUPS.yes, to allow syntax like +# MANGROUPS.${MK_FOO}=FOO. Sort and uniq the list of groups in case of +# duplicates. +.if defined(MANGROUPS) || defined(MANGROUPS.yes) +MANGROUPS:=${MANGROUPS} ${MANGROUPS.yes} +MANGROUPS:=${MANGROUPS:O:u} +.endif + .for __group in ${MANGROUPS} realmaninstall: realmaninstall-${__group} From nobody Thu Oct 23 00:37:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csRvb5k3dz6Cbx9; Thu, 23 Oct 2025 00:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csRvb3x53z3bMp; Thu, 23 Oct 2025 00:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hxGq2nYhIb8BSHmZuBzOMJt5Km0tXyeK406KjJpCj60=; b=AGTsa/g3yqVCH+GjQThy31Awi+TduKCezaOSqQSfsI1chBK8d/OQDWhC3NxZXjTgKfmeyV ngC/xlSV9JwkDDohePPc5yjaJS9TxMpOJ3ZInDbl5owTTnWRvKyvlRNi0Xxb1Qhe1BZC36 xB276Ck2aJP65Rvo8IzjAzYSKOEtgP5WpzUdp/FDy4JXxDuYBza1JYGZx1U9izIcgdE3fj GqBps4pRzDj9vjMnim+rc5VhZ+RF6mkkbp4+4MNnGuwYnBhwHu7itIr+v4ccBJlXSQgfud hJkmo78skmr0j2MNqihmDOTga1jg5FTrvwmDU45gfZ5Jc54WYiFUIqE1lMjtkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hxGq2nYhIb8BSHmZuBzOMJt5Km0tXyeK406KjJpCj60=; b=MGj9xKM5mvHErwlNeBuUgM6G51YTQChHqJxK5JjdQzYN9JTsoGhT2UuP8ugtL8ZZsTcomv OvbZUjqohr2Y0iAAxkDGyNBUwuXhmU86YwYsQpgNhvk+SB8c1g/yO1h5BSd3F7uq08RRWF GuK3wSGeCqUO1/YHOuh65LgRf9kodpNCjUCLxiLFRJOeFC/oUh57H9zCUQc6iIOWCsdAqt MmKFRdXl76fiF4wVrxBI8Cy2m32vp3S3M2T1wlY3w9jFveSUChuI17vc7lVRwllE1CQa0N LVPDtrgKHbh5xlY5AD20lbx88HQEj+Hm/4R2Ltbe8Dm9YrMA3yacSo9bU4NigQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761179867; a=rsa-sha256; cv=none; b=dM2nzVil99GkYR5Tvl3fzyLux/WDMS7S2M6acNxZPnZRRY1QaNzivAVH8YjBcRpZ7fHdLF 6KfITyAPhw9qOVDhC1jwOB3PbLKpnaLvxWvZU1y258TFmGprbA8JC83a8NHDrFxaKPSXdg aSw0Crb45sUIWDSw9/M88+6S2F70Ye2OPjUVcdiEdtBTVi4DJnQk6EuYyqrEgJaUjy3xsG 6vufo+cVa8eRkpdLQ1H3UQFY8IRitSzZE9ql9bXBmbmrmCCDo0KbTSxbHnFt/fS2UM5FU+ 3WEAKm/RlPRn2G5RFJJcizSMAs9ZqJVzDI9V8mlvDB0rWR3CjR6/6r0zmjkoGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csRvb3XSTzsL9; Thu, 23 Oct 2025 00:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N0blrs023417; Thu, 23 Oct 2025 00:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N0blSr023414; Thu, 23 Oct 2025 00:37:47 GMT (envelope-from git) Date: Thu, 23 Oct 2025 00:37:47 GMT Message-Id: <202510230037.59N0blSr023414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c6a19aed6916 - stable/15 - tar: Move to the utilities package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c6a19aed69168d2fdf5ab3d77470b5cf91152eae Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c6a19aed69168d2fdf5ab3d77470b5cf91152eae commit c6a19aed69168d2fdf5ab3d77470b5cf91152eae Author: Lexi Winter AuthorDate: 2025-10-17 10:42:03 +0000 Commit: Colin Percival CommitDate: 2025-10-23 00:36:50 +0000 tar: Move to the utilities package tar(1) is not a core runtime utility; in particular, nothing in /etc/rc.d/* requires it. Move it to utilities, which is also where cpio(1) lives. This removes the dependency from runtime to libarchive. MFC after: 3 days Reviewed by: manu, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53059 (cherry picked from commit c0f17d637a4ab1e5dcae6b931623b7b0ee5bece2) --- usr.bin/tar/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 9260315fb30b..d3d29e03fd35 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -2,7 +2,6 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive -PACKAGE= runtime PROG= bsdtar BSDTAR_VERSION_STRING!= sed -n '/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \ ${_LIBARCHIVEDIR}/libarchive/archive.h From nobody Thu Oct 23 00:37:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csRvd0FPJz6CbqF; Thu, 23 Oct 2025 00:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csRvc51lkz3bq7; Thu, 23 Oct 2025 00:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iH4VU6P15vo3v/G5QigcF1P2Z0/aWQYRrHWwIyqhbQI=; b=tc+QU0XPMKPW6PH68uXCOdPOyPL7PFM916pHNLSbO2kjP05fJiTCxAalxeRKXyPtn/USfG BHdAdoh3CdoUu26KVvYgw2WXNRNrvIC2KZ7tacjxpNEQh/mdHxYojAmg59TxsjrsxjHJH+ H0XEpyo8ovS+TmVFtgeecutk+rNMA53ivT12Ct+gt7mAMuB7iPvxAJAhUan6rtcqXMnP7C SHlOVlB5balyQ3Fbm9lWFYyRUTkTSFYMUxYPJdgLwb3IGB3CzoxirafhtnYLFBC81DlmDO Y8hSOHbqxNigN7EKw7U8rj1RQOAIVf5qf/0ZT9O5I2cWJz+K1SuN1plB1YmA5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iH4VU6P15vo3v/G5QigcF1P2Z0/aWQYRrHWwIyqhbQI=; b=F9+Rfiq18F41ZtipVssCM5bejppL13Wda+misr7sSSMj8MlYoGA4+fwMHF9RwlL6c+LcYE zMyBttpjwqGbCENf8JaX2I8w4LJnADPbjY/8mSblOrInlxXazCmA0DTZn0yUMiRNuV9klA +jdQ9j2Rdwc7wSqs93kt57gpIMn1n3VyDEhejSK8m44c2MIXUJm37/iYlI6ZJwOi3jCKGO MffBT/vUUW66QC2jZur5Znt7BSYtB5JV/WWRRlvcLzC30DSCZXVMaq494ewBi2tpnhLohs sTiN7/rygEqdl9+WaH+tSkK826zMfdJiy5FbAx4LJCj5fdjKhhzU+JDmJpE9EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761179868; a=rsa-sha256; cv=none; b=I/h+NE+3qitEdPOwH/UGb7C4lix2wraFkhM59qs8/6J+NLtMGrwtyft7RI5pFQGdxfwjKQ u93YqgEbTEARckN0F4pfigBASXC5LZxDfotVUn+V+jntJO2isE8ydNnuL8gix7bJFH9nNh wX++lHAwiO8w9ByaatUWsK1VYHgzZmeG+n06eFJ/0jfW6Q9z3XfOl7O+Ro1AvwxW3oTFzs dFm3dx1wbbv29cyYf9C02EMPOnWB7WxZXVD1pJFwuw851aptv07rxqCaLnMwnNEoRbSHiy JF5czN2WOxWNXcG/begZIic4hfs9t0xAG3WZ7D9Pq4y9Oqix7aJddxzXj089Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csRvc4VWbzsLB; Thu, 23 Oct 2025 00:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N0bm8c023450; Thu, 23 Oct 2025 00:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N0bm3d023447; Thu, 23 Oct 2025 00:37:48 GMT (envelope-from git) Date: Thu, 23 Oct 2025 00:37:48 GMT Message-Id: <202510230037.59N0bm3d023447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 68897925cad0 - stable/15 - ncurses: Move utilities to the ncurses package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 68897925cad092db1479145abb60e1304c6ccede Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=68897925cad092db1479145abb60e1304c6ccede commit 68897925cad092db1479145abb60e1304c6ccede Author: Lexi Winter AuthorDate: 2025-10-17 18:41:09 +0000 Commit: Colin Percival CommitDate: 2025-10-23 00:36:50 +0000 ncurses: Move utilities to the ncurses package MFC after: 3 days Reviewed by: manu, kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53163 (cherry picked from commit 09a49cd49b4fecfb31b2b6677a938ef847289055) --- usr.bin/ncurses/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ncurses/Makefile b/usr.bin/ncurses/Makefile index 33001e6ab568..1ed8a2d9a915 100644 --- a/usr.bin/ncurses/Makefile +++ b/usr.bin/ncurses/Makefile @@ -1,4 +1,4 @@ -PACKAGE= runtime +PACKAGE= ncurses .include .include "${SRCTOP}/lib/ncurses/config.mk" From nobody Thu Oct 23 00:37:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csRvf0Q5dz6Cbms; Thu, 23 Oct 2025 00:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csRvd5sjsz3bh9; Thu, 23 Oct 2025 00:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSu3uQ9bbwKV8zHEvvqxKscsZN2Ptsj0CLfWdRp6rwg=; b=dWECBOUYmeFXX5pNS3NitgM7DS4oavXlDpRtPkPyHT/4lJ30IDepydNsjn7S6RZ5lQUMQY 2MYUP6ee/FjIEh+UlJ0n5lUjhaHrHwbgUIb+Nr/OLJd2Au4MN3FtGk10okGbzvl+8bXg/r QMvVfQ2hSO/jJLkTSxE0fL5TJSsrWKQ/L/4lXH9rMwruiYEhiUSXPH2UN9lGg+bW8Tc0Xo mKIya+06USDNlQwkq/eD1j/R9CHHOTuTq885mf9Ei3rOmz105msnDYb2J/7qkUmN0lPZ0+ y07L124uVOxMeAO5Ysx8R5D6BzIlZKhCLpaIR1ZbI+2TrJX/hOZdxb2Bujpcjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSu3uQ9bbwKV8zHEvvqxKscsZN2Ptsj0CLfWdRp6rwg=; b=VXwhBJGgDxal10DQcPqr/5sdk2dVzz/on1YD+8VBYne+DNm8Ar05XDeQk6aboDGT8PO4Lq 31Q4wGg/ocUy7aY879Mn5XA9ONxnpl94XwtsoOmI7By8tlMk7daGvqZzTg3q4oNPH8pVfZ DT5xxdyhRMqZ/tJTLPesTOTevL8Cy5U2cs6ytF+h84izPvnFos88kpl5nKErnNSr12cQCK w3V2YBoK6Iqf9pA8oDSA9TVkZrfkREiH58foCdWS+Nykv8Sxjh2SvL9vHS70g9IOrkHLws Tep+QzqYfdkyoYbwKnQBGE9RHn8JtR7EU82QYFd9mOOwLdn8L5a9lwdA2mpkNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761179869; a=rsa-sha256; cv=none; b=gTQ8EWL0q34sffLXGJPXf4Ui/+C2eYABZMvdkZcuBtJIAmgv6/aop7ZRsE+IE9AneisWZ7 VOs826P1PFv1HyXV4Z8AkgAjFyxjrmivXzrmrWe37orMAlgaYGFDeDMWSb+z899GlPMX0R W9daTpO8xdvIAyDL0/toNU86fx5KNtzXCuEGCfS4c1MZs9gWRSW4TO2F29m/4ZklQ04VzM Cj2fdFDoEzakUc7Zy9GlMRW/cQcYUVYag3RcwubgaxtXdcLHAD6JlPJGlX6e1xzr47qmMA 5HOgxRdMKSblPIhhst3K4pQJlPISjXVXzhdwMlLDQiQAgGMt7L6KFOiNDjeUtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csRvd5SZyzsLC; Thu, 23 Oct 2025 00:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N0bnZf023483; Thu, 23 Oct 2025 00:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N0bnsN023480; Thu, 23 Oct 2025 00:37:49 GMT (envelope-from git) Date: Thu, 23 Oct 2025 00:37:49 GMT Message-Id: <202510230037.59N0bnsN023480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ef82bdc864c5 - stable/15 - Makefile: Don't allow install{world,kernel} with pkgbase List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ef82bdc864c5750c6c42a45696aa35c1a1cff10a Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ef82bdc864c5750c6c42a45696aa35c1a1cff10a commit ef82bdc864c5750c6c42a45696aa35c1a1cff10a Author: Lexi Winter AuthorDate: 2025-10-17 19:06:17 +0000 Commit: Colin Percival CommitDate: 2025-10-23 00:36:50 +0000 Makefile: Don't allow install{world,kernel} with pkgbase Using these targets on a pkgbase system will cause the installed system to become out of sync with the package database, which is almost certain to cause issues the next time pkg(8) is used. To prevent users doing this accidentally, disallow install* if we detect that FreeBSD-runtime is installed in the target. The check can be overridden with DESTDIR=/ for users who are sure they want to do this. MFC after: 3 days Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52879 (cherry picked from commit 74a6bb524e5b9ad654a9acc5da5c195f406717b5) --- Makefile.inc1 | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 21adf215c0aa..dcd4fd23c087 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -600,7 +600,16 @@ PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif .endif # !defined(_MKSHOWCONFIG) +PKG_NAME_PREFIX?= FreeBSD +PKG_MAINTAINER?= re@FreeBSD.org +PKG_WWW?= https://www.FreeBSD.org +PKG_WORKERS_COUNT?= 1 + .if make(*package*) +.export PKG_NAME_PREFIX +.export PKG_MAINTAINER +.export PKG_WWW + .if !defined(PKG_TIMESTAMP) .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) SOURCE_DATE_EPOCH!= ${GIT_CMD} -C ${SRCDIR} show -s --format=%ct HEAD @@ -611,14 +620,6 @@ SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime} .else SOURCE_DATE_EPOCH= ${PKG_TIMESTAMP} .endif -PKG_WORKERS_COUNT?= 1 - -PKG_NAME_PREFIX?= FreeBSD -PKG_MAINTAINER?= re@FreeBSD.org -PKG_WWW?= https://www.FreeBSD.org -.export PKG_NAME_PREFIX -.export PKG_MAINTAINER -.export PKG_WWW .endif .if !defined(_MKSHOWCONFIG) @@ -1366,6 +1367,28 @@ __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. From nobody Thu Oct 23 00:37:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csRvg1Ygtz6CbkW; Thu, 23 Oct 2025 00:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csRvf6RC2z3bcD; Thu, 23 Oct 2025 00:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/wWO3p/skuR3t2tSIrumwa6iNH9sy9DqqwhjwB5yb0=; b=a6wFuwEz3H0Z8p0lUIs+DwzEi+Fcl5sCdDy5uBCvj+wit6BnI5wRWqjUc86GGA6mpcIlZv KL768YovpsZvBiMQxZbnuiqFsSAs7ZcENFZM7pwexZ4RBUAeDPHnpkoLLIGm1KTye6AWf/ jQW5VAx7EELVKGauPY4tCPp23XSmuhgl8/VWkivfr27WnqO5HAS1LCRbWN6HQbQnBPOxjD J+si8AqIG9fuCZHU0Hwk9jyb4tupCB+DFpBIKl7dsYodpWs9khFbJl3ow6sftc+eWawtgL yEyNDHpgEtYpSn161cUHBK993JdTb3fp4c62Woa9s8YUmP4G02Mh+RtsOgKRzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761179870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/wWO3p/skuR3t2tSIrumwa6iNH9sy9DqqwhjwB5yb0=; b=w7l6OUDM8YJUzIIaQ84sW3y3Hk6pE5Rt1gVCryOMNlFvRPxlCVTzLk/ReVp2kpS2EKdsTn nx6z7oL7QOv3yLR+sb+P1fYZzituTXFgAb7ISkAuCU5MnvI/MTob+V9pU6YWcdQdI3Jseb auTO9wQteeCQn0rR2Df1NxoYj736SKueuHbS8nea6k1V3KlbUan3PL9sDgWsBmEX2pcozU BOCgNiKy28CXGfErcG44ucQRxH1fdJ0yKiHaOdNfY27xQy1/smNManH8hs7FlnyGJkM7y4 lPiHoWylFrElkPmEiuYCIeBh3X855VUpERHBeSMdD+DmfYRW6EF5BR0TOCrxdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761179870; a=rsa-sha256; cv=none; b=W0MmhD7Orz4WeX5FSzru8Ar9+rlT8I37rVqEYUmJvhZfpBA6ZRvGdqxf1YRWyqozNeiRpH EvvKyCduOxm9s05khu3aztBYY+SwLoVvYBJhCMktkg02lOFZkxBO7LZvDDT21lhPlJEvzR KZXONCDuA30zrMZtVXNbjsMj3mIDRR8c8kIKzvGDQ01ktFcrj7bgKBK2LiJ4wUDDE7ZZR0 IfthUAEwysYeszSrE+Gxf0j3FtQIoX5Sa3+93au6ORqRoz8t3bx7id+NkOyhUVEskQ5uB5 Y0l1ohDluIhXX6mZfxoZoFZz32+t5wbrIfKwWOJxTfLZtmvsW6aDynEi4CU3og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csRvf5mQlzsPK; Thu, 23 Oct 2025 00:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N0boLZ023525; Thu, 23 Oct 2025 00:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N0bojx023522; Thu, 23 Oct 2025 00:37:50 GMT (envelope-from git) Date: Thu, 23 Oct 2025 00:37:50 GMT Message-Id: <202510230037.59N0bojx023522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ff7a10d0e1d1 - stable/15 - libc: Import OpenBSD's inet_net_{ntop,pton} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff7a10d0e1d1498724c6a1e02a70926944a71590 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7a10d0e1d1498724c6a1e02a70926944a71590 commit ff7a10d0e1d1498724c6a1e02a70926944a71590 Author: Lexi Winter AuthorDate: 2025-10-18 14:18:40 +0000 Commit: Colin Percival CommitDate: 2025-10-23 00:36:51 +0000 libc: Import OpenBSD's inet_net_{ntop,pton} Our versions of these functions (originally taken from BIND) simply don't work correctly for AF_INET6. These were removed from BIND itself quite a while ago, but OpenBSD has made several fixes in the mean time, so import their code. Add tests for both functions. PR: 289198 Reported by: Nico Sonack MFC after: 1 week Reviewed by: des Obtained from: OpenBSD (lib/libc/net) Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52629 (cherry picked from commit 8f4a0d2f7b96099001dbc51e06114df1a0e6d291) --- lib/libc/inet/inet_net_ntop.c | 206 ++++++-------------- lib/libc/inet/inet_net_pton.c | 363 +++++++++++------------------------- lib/libc/tests/net/Makefile | 2 + lib/libc/tests/net/inet_net_test.cc | 333 +++++++++++++++++++++++++++++++++ 4 files changed, 492 insertions(+), 412 deletions(-) diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c index 9d98dbb5ca99..30dd5c0571f2 100644 --- a/lib/libc/inet/inet_net_ntop.c +++ b/lib/libc/inet/inet_net_ntop.c @@ -1,20 +1,23 @@ -/*- - * SPDX-License-Identifier: ISC +/* $OpenBSD: inet_net_ntop.c,v 1.9 2019/07/03 03:24:04 deraadt Exp $ */ + +/* + * Copyright (c) 2012 by Gilles Chehade + * Copyright (c) 1996 by Internet Software Consortium. * - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996,1999 by Internet Software Consortium. + * SPDX-License-Identifier: ISC * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. */ #include "port_before.h" @@ -31,18 +34,10 @@ #include "port_after.h" -#ifdef SPRINTF_CHAR -# define SPRINTF(x) strlen(sprintf/**/x) -#else -# define SPRINTF(x) ((size_t)sprintf x) -#endif - -static char * inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, - size_t size); -static char * inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, - size_t size); +static char *inet_net_ntop_ipv4(const u_char *, int, char *, size_t); +static char *inet_net_ntop_ipv6(const u_char *, int, char *, size_t); -/*% +/* * char * * inet_net_ntop(af, src, bits, dst, size) * convert network number from network to presentation format. @@ -66,7 +61,7 @@ inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size) } } -/*% +/* * static char * * inet_net_ntop_ipv4(src, bits, dst, size) * convert IPv4 network number from network to presentation format. @@ -83,53 +78,63 @@ static char * inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) { char *odst = dst; - char *t; u_int m; int b; + char *ep; + int advance; + + ep = dst + size; + if (ep <= dst) + goto emsgsize; if (bits < 0 || bits > 32) { errno = EINVAL; return (NULL); } - if (bits == 0) { - if (size < sizeof "0") + if (ep - dst < sizeof "0") goto emsgsize; *dst++ = '0'; - size--; *dst = '\0'; } /* Format whole octets. */ for (b = bits / 8; b > 0; b--) { - if (size <= sizeof "255.") + if (ep - dst < sizeof "255.") + goto emsgsize; + advance = snprintf(dst, ep - dst, "%u", *src++); + if (advance <= 0 || advance >= ep - dst) goto emsgsize; - t = dst; - dst += SPRINTF((dst, "%u", *src++)); + dst += advance; if (b > 1) { + if (dst + 1 >= ep) + goto emsgsize; *dst++ = '.'; *dst = '\0'; } - size -= (size_t)(dst - t); } /* Format partial octet. */ b = bits % 8; if (b > 0) { - if (size <= sizeof ".255") + if (ep - dst < sizeof ".255") goto emsgsize; - t = dst; if (dst != odst) *dst++ = '.'; m = ((1 << b) - 1) << (8 - b); - dst += SPRINTF((dst, "%u", *src & m)); - size -= (size_t)(dst - t); + advance = snprintf(dst, ep - dst, "%u", *src & m); + if (advance <= 0 || advance >= ep - dst) + goto emsgsize; + dst += advance; } /* Format CIDR /width. */ - if (size <= sizeof "/32") + if (ep - dst < sizeof "/32") + goto emsgsize; + advance = snprintf(dst, ep - dst, "/%u", bits); + if (advance <= 0 || advance >= ep - dst) goto emsgsize; - dst += SPRINTF((dst, "/%u", bits)); + dst += advance; return (odst); emsgsize: @@ -137,132 +142,27 @@ inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) return (NULL); } -/*% - * static char * - * inet_net_ntop_ipv6(src, bits, fakebits, dst, size) - * convert IPv6 network number from network to presentation format. - * generates CIDR style result always. Picks the shortest representation - * unless the IP is really IPv4. - * always prints specified number of bits (bits). - * return: - * pointer to dst, or NULL if an error occurred (check errno). - * note: - * network byte order assumed. this means 192.5.5.240/28 has - * 0b11110000 in its fourth octet. - * author: - * Vadim Kogan (UCB), June 2001 - * Original version (IPv4) by Paul Vixie (ISC), July 1996 - */ - static char * -inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) { - u_int m; - int b; - int p; - int zero_s, zero_l, tmp_zero_s, tmp_zero_l; - int i; - int is_ipv4 = 0; - unsigned char inbuf[16]; - char outbuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")]; - char *cp; - int words; - u_char *s; +inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) +{ + int ret; + char buf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255:255:255:255/128")]; if (bits < 0 || bits > 128) { errno = EINVAL; return (NULL); } - cp = outbuf; - - if (bits == 0) { - *cp++ = ':'; - *cp++ = ':'; - *cp = '\0'; - } else { - /* Copy src to private buffer. Zero host part. */ - p = (bits + 7) / 8; - memcpy(inbuf, src, p); - memset(inbuf + p, 0, 16 - p); - b = bits % 8; - if (b != 0) { - m = ~0 << (8 - b); - inbuf[p-1] &= m; - } - - s = inbuf; - - /* how many words need to be displayed in output */ - words = (bits + 15) / 16; - if (words == 1) - words = 2; - - /* Find the longest substring of zero's */ - zero_s = zero_l = tmp_zero_s = tmp_zero_l = 0; - for (i = 0; i < (words * 2); i += 2) { - if ((s[i] | s[i+1]) == 0) { - if (tmp_zero_l == 0) - tmp_zero_s = i / 2; - tmp_zero_l++; - } else { - if (tmp_zero_l && zero_l < tmp_zero_l) { - zero_s = tmp_zero_s; - zero_l = tmp_zero_l; - tmp_zero_l = 0; - } - } - } - - if (tmp_zero_l && zero_l < tmp_zero_l) { - zero_s = tmp_zero_s; - zero_l = tmp_zero_l; - } - - if (zero_l != words && zero_s == 0 && ((zero_l == 6) || - ((zero_l == 5 && s[10] == 0xff && s[11] == 0xff) || - ((zero_l == 7 && s[14] != 0 && s[15] != 1))))) - is_ipv4 = 1; - - /* Format whole words. */ - for (p = 0; p < words; p++) { - if (zero_l != 0 && p >= zero_s && p < zero_s + zero_l) { - /* Time to skip some zeros */ - if (p == zero_s) - *cp++ = ':'; - if (p == words - 1) - *cp++ = ':'; - s++; - s++; - continue; - } + if (inet_ntop(AF_INET6, src, buf, size) == NULL) + return (NULL); - if (is_ipv4 && p > 5 ) { - *cp++ = (p == 6) ? ':' : '.'; - cp += SPRINTF((cp, "%u", *s++)); - /* we can potentially drop the last octet */ - if (p != 7 || bits > 120) { - *cp++ = '.'; - cp += SPRINTF((cp, "%u", *s++)); - } - } else { - if (cp != outbuf) - *cp++ = ':'; - cp += SPRINTF((cp, "%x", *s * 256 + s[1])); - s += 2; - } - } + ret = snprintf(dst, size, "%s/%d", buf, bits); + if (ret < 0 || ret >= size) { + errno = EMSGSIZE; + return (NULL); } - /* Format CIDR /width. */ - sprintf(cp, "/%u", bits); - if (strlen(outbuf) + 1 > size) - goto emsgsize; - strcpy(dst, outbuf); return (dst); - -emsgsize: - errno = EMSGSIZE; - return (NULL); } /* @@ -271,5 +171,3 @@ emsgsize: */ #undef inet_net_ntop __weak_reference(__inet_net_ntop, inet_net_ntop); - -/*! \file */ diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c index d566a0e1d3c3..14c88eb72014 100644 --- a/lib/libc/inet/inet_net_pton.c +++ b/lib/libc/inet/inet_net_pton.c @@ -1,20 +1,23 @@ -/*- - * SPDX-License-Identifier: ISC +/* $OpenBSD: inet_net_pton.c,v 1.14 2022/12/27 17:10:06 jmc Exp $ */ + +/* + * Copyright (c) 2012 by Gilles Chehade + * Copyright (c) 1996,1999 by Internet Software Consortium. * - * Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 1996, 1998, 1999, 2001, 2003 Internet Software Consortium. + * SPDX-License-Identifier: ISC * - * Permission to use, copy, modify, and/or distribute this software for any + * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. */ #include "port_before.h" @@ -22,7 +25,6 @@ #include #include #include -#include #include #include @@ -34,13 +36,37 @@ #include "port_after.h" -#ifdef SPRINTF_CHAR -# define SPRINTF(x) strlen(sprintf/**/x) -#else -# define SPRINTF(x) ((size_t)sprintf x) -#endif +static int inet_net_pton_ipv4(const char *, u_char *, size_t); +static int inet_net_pton_ipv6(const char *, u_char *, size_t); -/*% +/* + * static int + * inet_net_pton(af, src, dst, size) + * convert network number from presentation to network format. + * accepts hex octets, hex strings, decimal octets, and /CIDR. + * "size" is in bytes and describes "dst". + * return: + * number of bits, either imputed classfully or specified with /CIDR, + * or -1 if some failure occurred (check errno). ENOENT means it was + * not a valid network specification. + * author: + * Paul Vixie (ISC), June 1996 + */ +int +inet_net_pton(int af, const char *src, void *dst, size_t size) +{ + switch (af) { + case AF_INET: + return (inet_net_pton_ipv4(src, dst, size)); + case AF_INET6: + return (inet_net_pton_ipv6(src, dst, size)); + default: + errno = EAFNOSUPPORT; + return (-1); + } +} + +/* * static int * inet_net_pton_ipv4(src, dst, size) * convert IPv4 network number from presentation to network format. @@ -57,22 +83,24 @@ * Paul Vixie (ISC), June 1996 */ static int -inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { - static const char xdigits[] = "0123456789abcdef"; - static const char digits[] = "0123456789"; - int n, ch, tmp = 0, dirty, bits; +inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) +{ + static const char + xdigits[] = "0123456789abcdef", + digits[] = "0123456789"; + int n, ch, tmp, dirty, bits; const u_char *odst = dst; - ch = *src++; + ch = (unsigned char)*src++; if (ch == '0' && (src[0] == 'x' || src[0] == 'X') - && isascii((unsigned char)(src[1])) - && isxdigit((unsigned char)(src[1]))) { + && isascii((unsigned char)src[1]) && isxdigit((unsigned char)src[1])) { /* Hexadecimal: Eat nybble string. */ - if (size <= 0U) + if (size == 0) goto emsgsize; - dirty = 0; - src++; /*%< skip x or X. */ - while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) { + tmp = 0, dirty = 0; + src++; /* skip x or X. */ + while ((ch = (unsigned char)*src++) != '\0' && + isascii(ch) && isxdigit(ch)) { if (isupper(ch)) ch = tolower(ch); n = strchr(xdigits, ch) - xdigits; @@ -82,14 +110,14 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { else tmp = (tmp << 4) | n; if (++dirty == 2) { - if (size-- <= 0U) + if (size-- == 0) goto emsgsize; *dst++ = (u_char) tmp; dirty = 0; } } - if (dirty) { /*%< Odd trailing nybble? */ - if (size-- <= 0U) + if (dirty) { /* Odd trailing nybble? */ + if (size-- == 0) goto emsgsize; *dst++ = (u_char) (tmp << 4); } @@ -104,16 +132,16 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { tmp += n; if (tmp > 255) goto enoent; - } while ((ch = *src++) != '\0' && + } while ((ch = (unsigned char)*src++) != '\0' && isascii(ch) && isdigit(ch)); - if (size-- <= 0U) + if (size-- == 0) goto emsgsize; *dst++ = (u_char) tmp; if (ch == '\0' || ch == '/') break; if (ch != '.') goto enoent; - ch = *src++; + ch = (unsigned char)*src++; if (!isascii(ch) || !isdigit(ch)) goto enoent; } @@ -121,10 +149,10 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { goto enoent; bits = -1; - if (ch == '/' && isascii((unsigned char)(src[0])) && - isdigit((unsigned char)(src[0])) && dst > odst) { + if (ch == '/' && isascii((unsigned char)src[0]) && + isdigit((unsigned char)src[0]) && dst > odst) { /* CIDR width specifier. Nothing can follow it. */ - ch = *src++; /*%< Skip over the /. */ + ch = (unsigned char)*src++; /* Skip over the /. */ bits = 0; do { n = strchr(digits, ch) - digits; @@ -132,8 +160,9 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { bits *= 10; bits += n; if (bits > 32) - goto enoent; - } while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch)); + goto emsgsize; + } while ((ch = (unsigned char)*src++) != '\0' && + isascii(ch) && isdigit(ch)); if (ch != '\0') goto enoent; } @@ -147,29 +176,23 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { goto enoent; /* If no CIDR spec was given, infer width from net class. */ if (bits == -1) { - if (*odst >= 240) /*%< Class E */ + if (*odst >= 240) /* Class E */ bits = 32; - else if (*odst >= 224) /*%< Class D */ - bits = 8; - else if (*odst >= 192) /*%< Class C */ + else if (*odst >= 224) /* Class D */ + bits = 4; + else if (*odst >= 192) /* Class C */ bits = 24; - else if (*odst >= 128) /*%< Class B */ + else if (*odst >= 128) /* Class B */ bits = 16; - else /*%< Class A */ + else /* Class A */ bits = 8; /* If imputed mask is narrower than specified octets, widen. */ if (bits < ((dst - odst) * 8)) bits = (dst - odst) * 8; - /* - * If there are no additional bits specified for a class D - * address adjust bits to 4. - */ - if (bits == 8 && *odst == 224) - bits = 4; } /* Extend network to cover the actual mask. */ while (bits > ((dst - odst) * 8)) { - if (size-- <= 0U) + if (size-- == 0) goto emsgsize; *dst++ = '\0'; } @@ -184,222 +207,48 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { return (-1); } -static int -getbits(const char *src, int *bitsp) { - static const char digits[] = "0123456789"; - int n; - int val; - char ch; - - val = 0; - n = 0; - while ((ch = *src++) != '\0') { - const char *pch; - - pch = strchr(digits, ch); - if (pch != NULL) { - if (n++ != 0 && val == 0) /*%< no leading zeros */ - return (0); - val *= 10; - val += (pch - digits); - if (val > 128) /*%< range */ - return (0); - continue; - } - return (0); - } - if (n == 0) - return (0); - *bitsp = val; - return (1); -} static int -getv4(const char *src, u_char *dst, int *bitsp) { - static const char digits[] = "0123456789"; - u_char *odst = dst; - int n; - u_int val; - char ch; - - val = 0; - n = 0; - while ((ch = *src++) != '\0') { - const char *pch; +inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) +{ + struct in6_addr in6; + int ret; + int bits; + size_t bytes; + char buf[INET6_ADDRSTRLEN + sizeof("/128")]; + char *sep; + const char *errstr; - pch = strchr(digits, ch); - if (pch != NULL) { - if (n++ != 0 && val == 0) /*%< no leading zeros */ - return (0); - val *= 10; - val += (pch - digits); - if (val > 255) /*%< range */ - return (0); - continue; - } - if (ch == '.' || ch == '/') { - if (dst - odst > 3) /*%< too many octets? */ - return (0); - *dst++ = val; - if (ch == '/') - return (getbits(src, bitsp)); - val = 0; - n = 0; - continue; - } - return (0); + if (strlcpy(buf, src, sizeof buf) >= sizeof buf) { + errno = EMSGSIZE; + return (-1); } - if (n == 0) - return (0); - if (dst - odst > 3) /*%< too many octets? */ - return (0); - *dst++ = val; - return (1); -} -static int -inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) { - static const char xdigits_l[] = "0123456789abcdef", - xdigits_u[] = "0123456789ABCDEF"; - u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp; - const char *xdigits, *curtok; - int ch, saw_xdigit; - u_int val; - int digits; - int bits; - size_t bytes; - int words; - int ipv4; + sep = strchr(buf, '/'); + if (sep != NULL) + *sep++ = '\0'; - memset((tp = tmp), '\0', NS_IN6ADDRSZ); - endp = tp + NS_IN6ADDRSZ; - colonp = NULL; - /* Leading :: requires some special handling. */ - if (*src == ':') - if (*++src != ':') - goto enoent; - curtok = src; - saw_xdigit = 0; - val = 0; - digits = 0; - bits = -1; - ipv4 = 0; - while ((ch = *src++) != '\0') { - const char *pch; + ret = inet_pton(AF_INET6, buf, &in6); + if (ret != 1) + return (-1); - if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) - pch = strchr((xdigits = xdigits_u), ch); - if (pch != NULL) { - val <<= 4; - val |= (pch - xdigits); - if (++digits > 4) - goto enoent; - saw_xdigit = 1; - continue; - } - if (ch == ':') { - curtok = src; - if (!saw_xdigit) { - if (colonp) - goto enoent; - colonp = tp; - continue; - } else if (*src == '\0') - goto enoent; - if (tp + NS_INT16SZ > endp) - return (0); - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - saw_xdigit = 0; - digits = 0; - val = 0; - continue; - } - if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) && - getv4(curtok, tp, &bits) > 0) { - tp += NS_INADDRSZ; - saw_xdigit = 0; - ipv4 = 1; - break; /*%< '\\0' was seen by inet_pton4(). */ - } - if (ch == '/' && getbits(src, &bits) > 0) - break; - goto enoent; - } - if (saw_xdigit) { - if (tp + NS_INT16SZ > endp) - goto enoent; - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - } - if (bits == -1) + if (sep == NULL) bits = 128; - - words = (bits + 15) / 16; - if (words < 2) - words = 2; - if (ipv4) - words = 8; - endp = tmp + 2 * words; - - if (colonp != NULL) { - /* - * Since some memmove()'s erroneously fail to handle - * overlapping regions, we'll do the shift by hand. - */ - const int n = tp - colonp; - int i; - - if (tp == endp) - goto enoent; - for (i = 1; i <= n; i++) { - endp[- i] = colonp[n - i]; - colonp[n - i] = 0; + else { + bits = strtonum(sep, 0, 128, &errstr); + if (errstr) { + errno = EINVAL; + return (-1); } - tp = endp; } - if (tp != endp) - goto enoent; bytes = (bits + 7) / 8; - if (bytes > size) - goto emsgsize; - memcpy(dst, tmp, bytes); - return (bits); - - enoent: - errno = ENOENT; - return (-1); - - emsgsize: - errno = EMSGSIZE; - return (-1); -} - -/*% - * int - * inet_net_pton(af, src, dst, size) - * convert network number from presentation to network format. - * accepts hex octets, hex strings, decimal octets, and /CIDR. - * "size" is in bytes and describes "dst". - * return: - * number of bits, either imputed classfully or specified with /CIDR, - * or -1 if some failure occurred (check errno). ENOENT means it was - * not a valid network specification. - * author: - * Paul Vixie (ISC), June 1996 - */ -int -inet_net_pton(int af, const char *src, void *dst, size_t size) { - switch (af) { - case AF_INET: - return (inet_net_pton_ipv4(src, dst, size)); - case AF_INET6: - return (inet_net_pton_ipv6(src, dst, size)); - default: - errno = EAFNOSUPPORT; + if (bytes > size) { + errno = EMSGSIZE; return (-1); } + memcpy(dst, &in6.s6_addr, bytes); + return (bits); } /* @@ -408,5 +257,3 @@ inet_net_pton(int af, const char *src, void *dst, size_t size) { */ #undef inet_net_pton __weak_reference(__inet_net_pton, inet_net_pton); - -/*! \file */ diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile index 24cff61e8d24..ec0668633508 100644 --- a/lib/libc/tests/net/Makefile +++ b/lib/libc/tests/net/Makefile @@ -4,8 +4,10 @@ ATF_TESTS_C+= ether_test ATF_TESTS_C+= eui64_aton_test ATF_TESTS_C+= eui64_ntoa_test ATF_TESTS_CXX+= link_addr_test +ATF_TESTS_CXX+= inet_net_test CXXSTD.link_addr_test= c++20 +CXXSTD.inet_net_test= c++20 CFLAGS+= -I${.CURDIR} diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/inet_net_test.cc new file mode 100644 index 000000000000..4ecf5a3de492 --- /dev/null +++ b/lib/libc/tests/net/inet_net_test.cc @@ -0,0 +1,333 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * Tests for inet_net_pton() and inet_net_ntop(). + */ + +#include +#include + +#include +#include + +#include +#include +#include + +#include + +using namespace std::literals; + +/* + * inet_net_ntop() and inet_net_pton() for IPv4. + */ +ATF_TEST_CASE_WITHOUT_HEAD(inet_net_inet4) +ATF_TEST_CASE_BODY(inet_net_inet4) +{ + /* + * Define a list of addresses we want to check. Each address is passed + * to inet_net_pton() to convert it to an in_addr, then we convert the + * in_addr back to a string and compare it with the expected value. We + * want to test over-long prefixes here (such as 10.0.0.1/8), so we also + * specify what the result is expected to be. + */ + + struct test_addr { + std::string input; + unsigned bits; + std::string output; + }; + + auto test_addrs = std::vector{ + // Simple prefixes that fall on octet boundaries. + { "10.0.0.0/8", 8, "10/8" }, + { "10.1.0.0/16", 16, "10.1/16" }, + { "10.1.2.0/24", 24, "10.1.2/24" }, + { "10.1.2.3/32", 32, "10.1.2.3/32" }, + + // Simple prefixes with the short-form address. + { "10/8", 8, "10/8" }, + { "10.1/16", 16, "10.1/16" }, + { "10.1.2/24", 24, "10.1.2/24" }, + + // A prefix that doesn't fall on an octet boundary. + { "10.1.64/18", 18, "10.1.64/18" }, + + // An overlong prefix with bits that aren't part of the prefix. + { "10.0.0.1/8", 8, "10/8" }, + }; + + for (auto const &addr: test_addrs) { + /* + * Convert the input string to an in_addr + bits, and make + * sure the result produces the number of bits we expected. + */ + + auto in = in_addr{}; + auto bits = inet_net_pton(AF_INET, addr.input.c_str(), + &in, sizeof(in)); + ATF_REQUIRE(bits != -1); + ATF_REQUIRE_EQ(bits, addr.bits); + + /* + * Convert the in_addr back to a string + */ + + /* + * XXX: Should there be a constant for the size of the result + * buffer? For now, use ADDRSTRLEN + 3 ("/32") + 1 (NUL). + * + * Fill the buffer with 'Z', so we can check the result was + * properly terminated. + */ + auto strbuf = std::vector(INET_ADDRSTRLEN + 3 + 1, 'Z'); + auto ret = inet_net_ntop(AF_INET, &in, bits, + strbuf.data(), strbuf.size()); + ATF_REQUIRE(ret != NULL); + ATF_REQUIRE_EQ(ret, strbuf.data()); + + /* Make sure the result was NUL-terminated and find the NUL */ + ATF_REQUIRE(strbuf.size() >= 1); + auto end = std::ranges::find(strbuf, '\0'); + ATF_REQUIRE(end != strbuf.end()); + + /* + * Check the result matches what we expect. Use a temporary + * string here instead of std::ranges::equal because this + * means ATF can print the mismatch. + */ + auto str = std::string(std::ranges::begin(strbuf), end); + ATF_REQUIRE_EQ(str, addr.output); + } +} + +/* + * inet_net_ntop() and inet_net_pton() for IPv6. + */ +ATF_TEST_CASE_WITHOUT_HEAD(inet_net_inet6) +ATF_TEST_CASE_BODY(inet_net_inet6) +{ + /* + * Define a list of addresses we want to check. Each address is + * passed to inet_net_pton() to convert it to an in6_addr, then we + * convert the in6_addr back to a string and compare it with the + * expected value. We want to test over-long prefixes here (such + * as 2001:db8::1/32), so we also specify what the result is + * expected to be. + */ + + struct test_addr { + std::string input; + unsigned bits; + std::string output; + }; + + auto test_addrs = std::vector{ + // A prefix with a trailing :: + { "2001:db8::/32", 32, "2001:db8::/32" }, + + // A prefix with a leading ::. Note that the output is + // different from the input because inet_ntop() renders + // this prefix with an IPv4 suffix for legacy reasons. *** 186 LINES SKIPPED *** From nobody Thu Oct 23 01:55:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csTdF2DHPz6DHdp; Thu, 23 Oct 2025 01:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csTdF1g9fz3lJs; Thu, 23 Oct 2025 01:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761184529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3f/OStGhkqGlBSaXrEPEiUOvQ8IT2xZR8p3ef5CVCA=; b=iJAzWowyif+q+14ytkI9DDv1XEbZ4Z1eG5NlOrLQESPNUVo7glRtZPP6UEHm1EOqc/c5q3 sJUmNKhgipSjDdRsXUdKAMiLmyNhGaFeW6x/OcGNRQJf1VNOzaxYmfEIM8E83weOBGZ0Zf o/sEkfZ4WAcrHXjcrvQ6LChXFBFTp/SqJHyutiUnpSGFUd9cNpyH3kZIVMGj0M0fw1q6fx vfjSFB6fMpN8Y5vwKCNcX5cI/X9N4hWMBwG6Oz4XMGEJx5YdTSVPRl6TIdmrqpM8VOziMg a85OopiJV1olOYzy7FE37z4NjB2coufU+XvPpCAx3j+bcOOmvdqyNUd/eq3dhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761184529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3f/OStGhkqGlBSaXrEPEiUOvQ8IT2xZR8p3ef5CVCA=; b=Os9JeHMfHxWuAZSL9MyqBfL9Ru5JhSCKD5NIUhXFHO4ifI76txw5+48IZkN0txQaAlxXI5 tWwHlrVeUEwgludD4XmotPeO6cfNLvb6jI2LiIo+GCsm7HhqBGJ7kyEPuS8UecUlCVyoK1 LLhq9rzFJPlPsvh2NePMRSXNptH7NECp5Xw439JdgNCc6sgnJaOBgxYwx8o4Gi3id12l66 AsIVFvNhINrbmLak7On4qHqGbGrh24Vxr6mNRwGFyGyPDFWf3GXx/b0lzuAizt1WoEYqCo sHlf1QL3hxqUCzNVz5sO/CZPVAfWL0VRrfDnlxHyPBy/dhW6hlX+RI23Qfxsnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761184529; a=rsa-sha256; cv=none; b=qJ4K4tlO+egyR6lUrgwZXbAPtoXVYxSPqWcAFINaaf8ofK5Q5f3DfX8eppP3PaEHHkPRDT CW5UoYYU9xutXiWq3EA4jEUml8xL/VnRsua96re5/VG2dAAFV0mbaNMDSucpnO8o1bClDf Ce23IlfjtOkpck0tcE3RwkoROK1TLEgw4k5Rx8iEE9tfAgBgQO8dTXgp4HLyhgAEKOw0yY 8SKoZvP+yJ/0580E9ENcyFVGLScuSYDUprOhh8MoxbYZTz/SJ37vEn5p2OvSVu0aXJUcBC qbNe+9oud4U9GTroXPe7cxf8HuqlEswwNyg1nfGqvEvFZO0hJQFsHdo/xTHBqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csTdF1BXRztxn; Thu, 23 Oct 2025 01:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N1tT4N072663; Thu, 23 Oct 2025 01:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N1tT2G072660; Thu, 23 Oct 2025 01:55:29 GMT (envelope-from git) Date: Thu, 23 Oct 2025 01:55:29 GMT Message-Id: <202510230155.59N1tT2G072660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brad Davis Subject: git: 6cfe0bcf7fbf - stable/15 - mkimg: Add a -h option and improve usage output to be more expressive List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6cfe0bcf7fbf3faec6892beb15febc6bab91eb21 Auto-Submitted: auto-generated The branch stable/15 has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=6cfe0bcf7fbf3faec6892beb15febc6bab91eb21 commit 6cfe0bcf7fbf3faec6892beb15febc6bab91eb21 Author: Brad Davis AuthorDate: 2025-10-03 21:57:06 +0000 Commit: Brad Davis CommitDate: 2025-10-23 01:55:20 +0000 mkimg: Add a -h option and improve usage output to be more expressive Reviewed by: imp, kp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52906 (cherry picked from commit 6fa18fe74461497f9a557af806552d246159272e) --- usr.bin/mkimg/mkimg.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index a7409b686560..27b79b82ca02 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -142,8 +142,10 @@ static void usage(const char *why) { - warnx("error: %s", why); - fputc('\n', stderr); + if (why != NULL) { + warnx("error: %s", why); + fputc('\n', stderr); + } fprintf(stderr, "usage: %s \n", getprogname()); fprintf(stderr, " options:\n"); @@ -171,19 +173,19 @@ usage(const char *why) print_schemes(1); fputc('\n', stderr); fprintf(stderr, " partition specification:\n"); - fprintf(stderr, "\t[/]::[:[+]]\t- " + fprintf(stderr, "\t[/