x86: Export cpu_model[]
ClosedPublic
Actions

Authored by markj on Jan 2 2024, 10:56 PM.

Details

Reviewers

emaste
kib
andrew
manu
imp

Commits

rG337b2a037299: identcpu: Let the hw.model be readable in capability mode
rGe3212b779ae2: linprocfs: Avoid using a sysctl to get the CPU model string
rGd5063a91ce0d: x86: Make cpu_model[] public
rGe24406084951: identcpu: Let the hw.model be readable in capability mode
rGb2dfbd772e88: linprocfs: Avoid using a sysctl to get the CPU model string
rG675c24cd01f7: x86: Make cpu_model[] public
rG0aba5dd2af57: identcpu: Let the hw.model be readable in capability mode
rGd74a742704eb: linprocfs: Avoid using a sysctl to get the CPU model string
rGd63ea0367400: x86: Make cpu_model[] public

Summary

... and use it in linprocfs_docpuinfo(), rather than reading the value
using a sysctl. Note that linprocfs_docpuinfo() is only compiled for
x86.

Otherwise, programs reading the file from within a capsicum sandbox get
different results from unsandboxed programs, which is rather confusing.
And since cpuinfo now lets a sandboxed program find the CPU model, we
might as well annotate the sysctl with CTLFLAG_CAPRD.

PR: 276043
Reported by: Ricardo Branco <rbranco@suse.com>

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 55204
Build 52093: arc lint + arc unit

Event Timeline

markj created this revision.Jan 2 2024, 10:56 PM

Herald added a reviewer: andrew. · View Herald TranscriptJan 2 2024, 10:56 PM

Herald added a reviewer: andrew. · View Herald Transcript

Herald added a reviewer: manu. · View Herald Transcript

Herald added subscribers: jhibbits, imp. · View Herald Transcript

markj requested review of this revision.Jan 2 2024, 10:56 PM

Harbormaster completed remote builds in B55204: Diff 132160.Jan 2 2024, 10:56 PM

(Yes, this should not be all in the same commit. I'll split it up before pushing.)

imp accepted this revision.Jan 2 2024, 11:27 PM

This revision is now accepted and ready to land.Jan 2 2024, 11:27 PM

Discussed with Mark on IRC the suitability of making hw.model available in capability mode.

I'd like to expand capsicum.4 with some more of the design intent of Capsicum, so that folks who don't have long experience with Capsicum can understand what sorts of sysctls should be expected to be available and why certain choices were made. But that need is present with or without this change.

Aside, note that hw.machine was only made available relatively recently, in 4a1c4de232af202aa5fa02c7adaa97174997ae61 (D28703).

zlei added a subscriber: zlei.Jan 3 2024, 3:47 AM

I successfully tested the patch on a QEMU VM.

kib accepted this revision.Jan 4 2024, 3:34 AM

Closed by commit rGd63ea0367400: x86: Make cpu_model[] public (authored by markj). · Explain WhyJan 4 2024, 1:41 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGd63ea0367400: x86: Make cpu_model[] public.

markj added a commit: rGd74a742704eb: linprocfs: Avoid using a sysctl to get the CPU model string.

markj added a commit: rG0aba5dd2af57: identcpu: Let the hw.model be readable in capability mode.

markj added a commit: rG675c24cd01f7: x86: Make cpu_model[] public.Jan 11 2024, 2:33 PM

markj added a commit: rGb2dfbd772e88: linprocfs: Avoid using a sysctl to get the CPU model string.

markj added a commit: rGe24406084951: identcpu: Let the hw.model be readable in capability mode.