From nobody Mon Feb 6 19:01:13 2023 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 4P9bFj6YSGz3n3Yd; Mon, 6 Feb 2023 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9bFj5wBFz3Nbv; Mon, 6 Feb 2023 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sW0XicpnblWJs9oQg12HEGs6Z8QGvlL+sYQB4fZ0Tis=; b=XyzbNWa1P/RcGn9rRU99KRgGSqm3fOobOkvgn3DlrbZHLRR2poNhvWbq2KEu4E8CxVyRbR 7N+16GUxeuP1V5yVyx6mblmRyMVtSpffeWrD/OOChdrHEjFcJxFFdnPMxEWH+uwQTyzF4I O+3chR6o5Sin6hoKS38U7OLLxhiyiaOftLKMs2r3ThyZDuAJH9lsa4UEymHGRCA0nRqnOy rRGJ9iFt4z26fBn3pfraz7kEV8pMHHE/VnKVxYg2LzdL1RQDwKTrTOvHSOy6bV+1y4pX9q W2AzM0zvL2JXkkkLIocukeA05UvRy0DCsKO9rjESUaOVbc3fhLxx+0vH8y3vRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sW0XicpnblWJs9oQg12HEGs6Z8QGvlL+sYQB4fZ0Tis=; b=cmOyak1mU1UcNx5Dcd7YUncB3YvA1B5vgQBvcPkOVtBKwgZ91H8EukeSQo6Ru6iCoJXRri OYS10QP5bDIpxq32MuQvAasN4IoZgttVp2WGr9mchpYlBU5kB5sX3GV4cbrJZsYe2U0s+V h95ZnBoyhl0I01ajVf7bnxA4ppZmeoRZW8MRHGLBRD7FL8dNppo9NQWnrhFDLoiHU6jnoT lAVPSr5podYieXcY+FA+qFyJlCXegE8lacRhfcopU6XKS4RfboTdz1zNFjuCS3xJo+JN+W +iR3UC13hHNh0pYg5JEwKzMF08XA8mIBfWsGT2qVnG67ueIX8UvOVHIrCV1tIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675710073; a=rsa-sha256; cv=none; b=jwM+tScjBanmPrww5F2DMI41Rg53WMYfqNMLKaX3V0jDOFnzftFLvTeowZAVv+q0wNC7Qq lPK1y3y4IPrlgFWB/3qW0Xkrt9crYZR/ZuUYR/jMqdA6ZIHragirXJrp1wizFKcI+jNp7l mjhsMaaFwSnCbDEz3n0V88c59tTcL19MzXM36tnxblxgrzyo1u7eIqKzmPvwEFrUEhxwkU GeFxb253KiGD336CXnwKCrBv3eGNqABPblUfdY0aMDR4CnR5Uyq7NWiYamTTKiGYHxx/LO U/PCYJ85xtK7y/xwApfTCOTeoTzYemTfHopwwq+bQxfe3nLwheBFbNzTZ+o/PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9bFj4j8Lzm1x; Mon, 6 Feb 2023 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316J1DYr074909; Mon, 6 Feb 2023 19:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316J1DMH074908; Mon, 6 Feb 2023 19:01:13 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:01:13 GMT Message-Id: <202302061901.316J1DMH074908@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: 4a1c4de232af - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4a1c4de232af202aa5fa02c7adaa97174997ae61 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4a1c4de232af202aa5fa02c7adaa97174997ae61 commit 4a1c4de232af202aa5fa02c7adaa97174997ae61 Author: Val Packett AuthorDate: 2023-02-05 20:52:50 +0000 Commit: Ed Maste CommitDate: 2023-02-06 19:00:52 +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 --- 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 ad23d65b6b6f..92656ca3b376 100644 --- a/sys/arm/arm/identcpu-v6.c +++ b/sys/arm/arm/identcpu-v6.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); 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 dadb589e9294..299d0fb0e38d 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -98,7 +98,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, diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 483bbe453b0c..155a81312717 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -315,7 +315,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 84c3db924f68..8140bbd79155 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -155,7 +155,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 4c151eb47939..5f10ec6358ae 100644 --- a/sys/riscv/riscv/identcpu.c +++ b/sys/riscv/riscv/identcpu.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); 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 70bca3559555..2a009d7ec10a 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -153,9 +153,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