| Message ID | 20230214002757.99240-6-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | 2023 Q1 bsd-user upstreaming: bugfixes and sysctl | expand |
On 2/13/23 14:27, Warner Losh wrote: > From: Stacey Son<sson@FreeBSD.org> > > oidfmt uses undocumented system call to get the type of the sysctl. > > Co-Authored-by: Sean Bruno<sbruno@FreeBSD.org> > Signed-off-by: Sean Bruno<sbruno@FreeBSD.org> > Co-Authored-by: Juergen Lock<nox@jelal.kn-bremen.de> > Signed-off-by: Juergen Lock<nox@jelal.kn-bremen.de> > Co-Authored-by: Raphael Kubo da Costa<rakuco@FreeBSD.org> > Signed-off-by: Raphael Kubo da Costa<rakuco@FreeBSD.org> > Signed-off-by: Stacey Son<sson@FreeBSD.org> > Reviewed-by: Warner Losh<imp@bsdimp.com> > Signed-off-by: Warner Losh<imp@bsdimp.com> > --- > bsd-user/freebsd/os-sys.c | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) Acked-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c index cfbc4148a5c..1df53a3e53b 100644 --- a/bsd-user/freebsd/os-sys.c +++ b/bsd-user/freebsd/os-sys.c @@ -121,6 +121,38 @@ static abi_ulong G_GNUC_UNUSED h2t_ulong_sat(u_long ul) */ #define bsd_get_ncpu() 1 +/* + * This uses the undocumented oidfmt interface to find the kind of a requested + * sysctl, see /sys/kern/kern_sysctl.c:sysctl_sysctl_oidfmt() (compare to + * src/sbin/sysctl/sysctl.c) + */ +static int G_GNUC_UNUSED oidfmt(int *oid, int len, char *fmt, uint32_t *kind) +{ + int qoid[CTL_MAXNAME + 2]; + uint8_t buf[BUFSIZ]; + int i; + size_t j; + + qoid[0] = CTL_SYSCTL; + qoid[1] = CTL_SYSCTL_OIDFMT; + memcpy(qoid + 2, oid, len * sizeof(int)); + + j = sizeof(buf); + i = sysctl(qoid, len + 2, buf, &j, 0, 0); + if (i) { + return i; + } + + if (kind) { + *kind = *(uint32_t *)buf; + } + + if (fmt) { + strcpy(fmt, (char *)(buf + sizeof(uint32_t))); + } + return 0; +} + /* sysarch() is architecture dependent. */ abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2) {