From nobody Thu Jan 04 13:40:18 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 4T5SQC0MnCz56QLQ; Thu, 4 Jan 2024 13:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T5SQB63v9z41km; Thu, 4 Jan 2024 13:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704375618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N/oPSErPEKrKtEqPsiuZd8FgE3xCYwZZO9iIZIAkqvo=; b=P91OukhxWt3y71wT5kiwJ8zDDXDLFngUYPZdVXvPMBVPNCwQ0uQtEl+2B1aY9e+vWIqE0A e9Oj0GgGDa0b2ETmjYgxPf0vCgccnxeYnnFznFR8PPwo/LfAZ5jcCH+9XSNDxFfA4qQjxZ X1FbNCOzAmk1n3SisB3VJYKpSfePf0UHOe6PyedNHngMBvfB7ky5ZGtGxmeUxeFiuuLuby bD0jDjORFJErnG14sD35G+pSEyJ3MpuzZoitYnrTW2Li9FeuD6ZBj5uFqV0oq6MZa929h7 vbWzOKZoI5WTnzEqHJHF8yoWkuVD1A3TPnFu9QRdXSkQg9FooABDmm8qLsy1jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704375618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N/oPSErPEKrKtEqPsiuZd8FgE3xCYwZZO9iIZIAkqvo=; b=exMVM748lWn66+T9yRlBR1tRSszM2awAuXUfvaEYSVvWJ3SoVckeSns91pp2aXv7nDp5ob 9c/mvcoG+03uBwC2X4CijabLq1m4nzwx84UcZBpmKz0lWs6+7ENL6BjwZMrqLrD9ah+KlI ggY5jsIaQBR8XBU1XF5NE2tSjXr12yoNchroR4j0Sg2VFKXLSw1Tg1owHBLuProvqOYjLD ntHtOCTCcHiwOK9PgPCOTy/+LOAgxLc53EXL5BJM63HIHCjMEYPxu+pR6IRmss7E1kd0Ds wFfBfdt9PpucbASmn42RFma41DjT8el0bXDsM3zuQOyLYW/yxbgbuSIj3UnyLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704375618; a=rsa-sha256; cv=none; b=RtAn/Vc6epYYtZFX7+YtuJkVl5aDI3Fnh4eLm6FzJOU9g6QlAo7KXaktkFeAt8BePUZzmU vBV5LDWKKe1cEKNVGxxxgdoXiQrWpTRsMex/EDZzZdpg0G+LTEBHtAbTxaFI3ZHKC6Dvlh 0tk3UyqXKfhLFvbPcRE68PvMLJgg2+TUsE70qqELMUo1Gdatd1D+2wx65Jcn2Ff5w95UUt fYfwUw3XsdN4WzWma1c+XtVAnA+tTuXXh+vWwte33cx5AxuFaq7YA0XVGOW4xyDLlq0DWv i4mJb5uu4Kz1OgqfPqhMgTNXw6V5M+7WnrBvn2pdMjCWAchuLMZFBH1iPofLlQ== 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 4T5SQB59lqzFwk; Thu, 4 Jan 2024 13:40:18 +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 404DeIV6041874; Thu, 4 Jan 2024 13:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 404DeIFG041871; Thu, 4 Jan 2024 13:40:18 GMT (envelope-from git) Date: Thu, 4 Jan 2024 13:40:18 GMT Message-Id: <202401041340.404DeIFG041871@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: d74a742704eb - main - 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/main X-Git-Reftype: branch X-Git-Commit: d74a742704eb81f0c6f4aa83e4cb0de26a81c400 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d74a742704eb81f0c6f4aa83e4cb0de26a81c400 commit d74a742704eb81f0c6f4aa83e4cb0de26a81c400 Author: Mark Johnston AuthorDate: 2024-01-04 13:25:05 +0000 Commit: Mark Johnston CommitDate: 2024-01-04 13:39:53 +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 --- 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 3504b83dfde6..391d5f679ee5 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -199,10 +199,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; @@ -302,12 +299,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: @@ -351,7 +342,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 ??*/