From nobody Thu Jan 11 14:32:32 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 4T9nFD50Nzz567YV; Thu, 11 Jan 2024 14:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T9nFD3Vb0z4Sbh; Thu, 11 Jan 2024 14:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7sh9/Z7EHb8lZGQo58lH2yefVB4K+v3o+cc3vMVYU8=; b=BudzMHVKJivM4vCdn48NhUGENWDe5WLRkQdgK2i11SHDdRtP2sqA59w8iehK9Nq+Az0WKr /ULkRVRY/XTL4ZsCIEykxcPftf1a+hkDuXHcXK4sI6A7Cb00Cqo6fURpc/1uw5gK1R01O8 jfM+LNlUa6O4o96rW7eLJzEqTjOtoCwWVpARQaJ9PiwpYtjkEOdn4LPKADdiTYd8/OfbTB dtu/dWz0GuuS1yge3RhsqBT4hh3YL9+sRpzL8h7Qb9vrAEuG0TY3Yq85ilV1IsVyB1TFsS Z2TUWaD3mqLLXwQDngG2qEi4O/WO2gzo5/YN65rH+m75mdM2uvcmmZjbxuL8hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7sh9/Z7EHb8lZGQo58lH2yefVB4K+v3o+cc3vMVYU8=; b=UjImIOspkTM7ohG7ZGG891SXRCEeHOZ3eBS6RC7aYJXgVuvplzqgFIzAlb2+EJOoxWjXdf /8tgrIZd411HV65kB59apVDwQYXBolOz0+h3YiqwwNdKcPE1e2/G9wdnoeeH6wiOn/vchy Y7bRGBbVm5znOT4bIYqiMzsQX0ZIfXlTPwNz3jftPDjs+vi1oV+tYgQTU1zB8COloXzW4u I2qvcRZ2KUbt8peo3cn1ncaWB3jf6W6VFN+y5u6BZ41kgFo3xsL1DPW0S+9KBqvTno6A4K appDYZst7OpsimdYn8ysibXfZO9dPKAoUt5Z69kc+DssF5DBNSSMoaYd3/EUgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983552; a=rsa-sha256; cv=none; b=nIRf9ZO2vfP7aOsXhfl9e3WbvWmcB9RX12f6w9eqZH85ixkFDtfsduPgbHZX/pMV+JqTPG RHaPAdXlfWHQ9ArJsflH7iVjbA0qpl8+hsQUTW6hHggNp0B5SRhTOslKVidDE42REfGp4m KgdSs8u+bp65C5rLhxRtreRUbw7z+x/3vQ31B9mhb32xAjx9JaU/Lo9/f9MmTlIGaqpB0g 2yYXsztQXR6VRRiHTxWyFmwYf7dsc4P2MkLk+cYnKn69cBVhv67Kj0FPCyzWUrAPsIkE/8 bGQ1TUW+DpYmm0z2W+OcCqDl5um7yNNraYkojhfU3NyK1vXbv7SSH7SFAQ0/LQ== 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 4T9nFD2cLbzMsw; Thu, 11 Jan 2024 14:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BEWWds024058; Thu, 11 Jan 2024 14:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEWWQq024055; Thu, 11 Jan 2024 14:32:32 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:32:32 GMT Message-Id: <202401111432.40BEWWQq024055@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: b2dfbd772e88 - stable/14 - linprocfs: Avoid using a sysctl to get the CPU model string 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b2dfbd772e887d722da0aad1ea9c1ce14e65f47d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b2dfbd772e887d722da0aad1ea9c1ce14e65f47d commit b2dfbd772e887d722da0aad1ea9c1ce14e65f47d Author: Mark Johnston AuthorDate: 2024-01-04 13:25:05 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:19:07 +0000 linprocfs: Avoid using a sysctl to get the CPU model string This will fail if the reading process is in capability mode. Just copy the string directly. PR: 276043 Reviewed by: emaste, imp, kib Reported and tested by: Ricardo Branco MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43281 (cherry picked from commit d74a742704eb81f0c6f4aa83e4cb0de26a81c400) --- sys/compat/linprocfs/linprocfs.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 0e668b0edde6..5c60d4d8e713 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -201,10 +201,7 @@ linprocfs_domeminfo(PFS_FILL_ARGS) static int linprocfs_docpuinfo(PFS_FILL_ARGS) { - int hw_model[2]; - char model[128]; uint64_t freq; - size_t size; u_int cache_size[4]; u_int regs[4] = { 0 }; int fqmhz, fqkhz; @@ -304,12 +301,6 @@ linprocfs_docpuinfo(PFS_FILL_ARGS) "acc_power", }; - hw_model[0] = CTL_HW; - hw_model[1] = HW_MODEL; - model[0] = '\0'; - size = sizeof(model); - if (kernel_sysctl(td, hw_model, 2, &model, &size, 0, 0, 0, 0) != 0) - strcpy(model, "unknown"); #ifdef __i386__ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: @@ -353,7 +344,7 @@ linprocfs_docpuinfo(PFS_FILL_ARGS) "cpuid level\t: %d\n" "wp\t\t: %s\n", i, cpu_vendor, CPUID_TO_FAMILY(cpu_id), - CPUID_TO_MODEL(cpu_id), model, cpu_id & CPUID_STEPPING, + CPUID_TO_MODEL(cpu_id), cpu_model, cpu_id & CPUID_STEPPING, fqmhz, fqkhz, (cache_size[2] >> 16), 0, mp_ncpus, i, mp_ncpus, i, i, /*cpu_id & CPUID_LOCAL_APIC_ID ??*/