diff options
| author |   gnezdo <gnezdo@openbsd.org> | 2020-11-16 06:42:12 +0000 |
|---|---|---|
| committer | gnezdo <gnezdo@openbsd.org> | 2020-11-16 06:42:12 +0000 |
| commit | af3377b3f28feca65413ece6199cb6bee8901c77 (patch) | |
| tree | f0a5dcf3262588dade679cef00011e84fdc2d24d /sys | |
| parent | Remove the cases folded into sysctl_bounded_args but left behind (diff) | |
| download | wireguard-openbsd-af3377b3f28feca65413ece6199cb6bee8901c77.tar.xz wireguard-openbsd-af3377b3f28feca65413ece6199cb6bee8901c77.zip | |
Convert hw_sysctl to sysctl_bounded_args
This one is surprisingly a minor loss if one were to simply add bytes
on amd64:
.text+.data+.bss+.rodata
before 0x64b0+0x40+0x14+0x338 = 0x683c
after 0x6440+0x48+0x14+0x3b8 = 0x6854
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index d76c15cc4e2..a275fa7b6a9 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.382 2020/11/16 06:37:07 gnezdo Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.383 2020/11/16 06:42:12 gnezdo Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -666,6 +666,18 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, char *hw_vendor, *hw_prod, *hw_uuid, *hw_serial, *hw_ver; int allowpowerdown = 1; +/* morally const values reported by sysctl_bounded_arr */ +static int byte_order = BYTE_ORDER; +static int page_size = PAGE_SIZE; + +const struct sysctl_bounded_args hw_vars[] = { + {HW_NCPU, &ncpus, 1, 0}, + {HW_NCPUFOUND, &ncpusfound, 1, 0}, + {HW_BYTEORDER, &byte_order, 1, 0}, + {HW_PAGESIZE, &page_size, 1, 0}, + {HW_DISKCOUNT, &disk_count, 1, 0}, +}; + int hw_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen, struct proc *p) @@ -682,22 +694,14 @@ hw_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return (sysctl_rdstring(oldp, oldlenp, newp, machine)); case HW_MODEL: return (sysctl_rdstring(oldp, oldlenp, newp, cpu_model)); - case HW_NCPU: - return (sysctl_rdint(oldp, oldlenp, newp, ncpus)); - case HW_NCPUFOUND: - return (sysctl_rdint(oldp, oldlenp, newp, ncpusfound)); case HW_NCPUONLINE: return (sysctl_rdint(oldp, oldlenp, newp, sysctl_hwncpuonline())); - case HW_BYTEORDER: - return (sysctl_rdint(oldp, oldlenp, newp, BYTE_ORDER)); case HW_PHYSMEM: return (sysctl_rdint(oldp, oldlenp, newp, ptoa(physmem))); case HW_USERMEM: return (sysctl_rdint(oldp, oldlenp, newp, ptoa(physmem - uvmexp.wired))); - case HW_PAGESIZE: - return (sysctl_rdint(oldp, oldlenp, newp, PAGE_SIZE)); case HW_DISKNAMES: err = sysctl_diskinit(0, p); if (err) @@ -713,8 +717,6 @@ hw_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return err; return (sysctl_rdstruct(oldp, oldlenp, newp, diskstats, disk_count * sizeof(struct diskstats))); - case HW_DISKCOUNT: - return (sysctl_rdint(oldp, oldlenp, newp, disk_count)); case HW_CPUSPEED: if (!cpu_cpuspeed) return (EOPNOTSUPP); @@ -775,7 +777,8 @@ hw_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return (sysctl_hwsmt(oldp, oldlenp, newp, newlen)); #endif default: - return (EOPNOTSUPP); + return sysctl_bounded_arr(hw_vars, nitems(hw_vars), name, + namelen, oldp, oldlenp, newp, newlen); } /* NOTREACHED */ } |