From nobody Fri Sep 20 12:19:45 2024 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 4X9BKF3wKCz5WmGx; Fri, 20 Sep 2024 12:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X9BKF22TWz4tvx; Fri, 20 Sep 2024 12:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726834785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzdwLIg85SrT89aoT/34WLTfPnAMbL3b7Od65ak3O9A=; b=LCLgrM7gbHj0JyUFUFhyOKVpdXWq++iFlBrDYEQ4YSGbwZW4FokXqs8NzYdYt4Yb3941S/ 6MmvpywlpP3ML7V7yQD4eVDDTtZKFtKrOkvqdE6H+m8GIysTa7+KC49SI7qYoBoOhrLxRk mGrhjz2x7GQ+gPYFvO3EwMyDyGjGpDVkjG+Z+Xtghb77JDUpmoujX0/JCAVnUXQCU0q/to FTaM2EHVvIoOXbMRC6SB6rfH0cjLD7KCzhhhp0AJ+tB/DKsox+fMR4M75bivsjOqnDHlRo pGGoyEmIUfQoxNu85n/Ac56DAFDX3dLNaQVRwfO8hZFbexQ3LHNjeR3bmb/xYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726834785; a=rsa-sha256; cv=none; b=Qbhm99anu1c/yCHrTjcFL9p0tZoH5t+mshrCS3KiIs79hlzQnTwGvf6JN94feWg4kdyW/c zMD5uxpsZwbdOylXWPZtUNeay397jbV/9ClPnd+UKbjhymCvPcpqyaW8dkoUnQ7benVX43 0tB0floL+uHUDHPtOJ6A0ls1kRDjplF/ORmVAe98NecnnhO+znDfBO4pE2SFL1e7pt8JS7 NSOdov9C0QZ60obOavARN0I9jKxYftkTCdDYU23NzqTSCgurd7C8yrGp4hPpXETQ9OyRRU 9E+hmtAP1twAjzWk6C/tHhB+3Dti+UTgeJOsRgfIpJcBvbIQfcZhBwCUUUOzLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726834785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzdwLIg85SrT89aoT/34WLTfPnAMbL3b7Od65ak3O9A=; b=jl+HAxZAJSQ9zDegftQcUfos1GFifUTw/gP0Yrm+Xxqcqzz2VqlqG+ue0t4oWlFJwBbdjH DDyCqJroi/RLzLFcCT/4JUq1+97/QIP+D1cWnJCfWB0MZnhtnQgSVmfAz+VvRx8VCygEHk w5hiMG6tP7bQ7ENzRQjCl4Tk4CH291XeAUVba1rQ1smBfjBc2nWy9oSKhLJLdTvQ1Aa9pP BXhO0yjpz/BSh0iJgr5M+oyp+O56ujXSFRuZDUzj/xwAW41Ij9UsC9IDUV23vMHOp/ovY1 35XBT56K8K0MT3zbz+nZeMggLbr2oYAAR4Tbo71PKCuQNwralSB7ODwfQxcbcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X9BKF1XFyzpNx; Fri, 20 Sep 2024 12:19: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 48KCJjQP074031; Fri, 20 Sep 2024 12:19:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KCJjbJ074028; Fri, 20 Sep 2024 12:19:45 GMT (envelope-from git) Date: Fri, 20 Sep 2024 12:19:45 GMT Message-Id: <202409201219.48KCJjbJ074028@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: f7dd97b7e227 - stable/13 - Allow sysctl hw.machine/hw.machine_arch in capability mode 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/13 X-Git-Reftype: branch X-Git-Commit: f7dd97b7e227016a3fac4616307d871af3011dfe Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f7dd97b7e227016a3fac4616307d871af3011dfe commit f7dd97b7e227016a3fac4616307d871af3011dfe Author: Val Packett AuthorDate: 2023-02-05 20:52:50 +0000 Commit: Ed Maste CommitDate: 2024-09-20 11:19:41 +0000 Allow sysctl hw.machine/hw.machine_arch in capability mode There's no harm in reading strings like 'amd64'. Reviewed by: emaste, manu Sponsored by: https://www.patreon.com/valpackett Differential Revision: https://reviews.freebsd.org/D28703 (cherry picked from commit 4a1c4de232af202aa5fa02c7adaa97174997ae61) --- sys/arm/arm/identcpu-v6.c | 2 +- sys/arm64/arm64/identcpu.c | 3 ++- sys/kern/kern_mib.c | 2 +- sys/powerpc/powerpc/machdep.c | 2 +- sys/riscv/riscv/identcpu.c | 2 +- sys/x86/x86/identcpu.c | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/arm/arm/identcpu-v6.c b/sys/arm/arm/identcpu-v6.c index baae9ac360ad..6293a5ccaceb 100644 --- a/sys/arm/arm/identcpu-v6.c +++ b/sys/arm/arm/identcpu-v6.c @@ -52,7 +52,7 @@ char machine[] = "arm"; -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, machine, 0, "Machine class"); static char cpu_model[64]; diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index fcbf607b8fef..e913154f9956 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -96,7 +96,8 @@ sysctl_hw_machine(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD | - CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine, "A", "Machine class"); + CTLFLAG_CAPRD | CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine, "A", + "Machine class"); static char cpu_model[64]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD, diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index b2e9e06f5793..ee3e36c0b5a8 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -317,7 +317,7 @@ sysctl_hw_machine_arch(SYSCTL_HANDLER_ARGS) return (SYSCTL_OUT(req, machine_arch, strlen(machine_arch) + 1)); } SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD | - CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine_arch, "A", + CTLFLAG_CAPRD | CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine_arch, "A", "System architecture"); #ifndef MACHINE_ARCHES diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 96084aea6fcf..85d741d11b1a 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -149,7 +149,7 @@ static char init_kenv[2048]; static struct trapframe frame0; char machine[] = "powerpc"; -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, machine, 0, ""); static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); diff --git a/sys/riscv/riscv/identcpu.c b/sys/riscv/riscv/identcpu.c index 6a63d39d66aa..39bc0e3b91af 100644 --- a/sys/riscv/riscv/identcpu.c +++ b/sys/riscv/riscv/identcpu.c @@ -62,7 +62,7 @@ char machine[] = "riscv"; -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, machine, 0, "Machine class"); /* Hardware implementation info. These values may be empty. */ diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 8a5d74ca5a2d..450df6807920 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -152,9 +152,9 @@ sysctl_hw_machine(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD | - CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine, "A", "Machine class"); + CTLFLAG_CAPRD | CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine, "A", "Machine class"); #else -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, machine, 0, "Machine class"); #endif