mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023 Q1 bsd-user upstreaming: bugfixes and sysctl

Browse Source 
[ letter edited -- need reviews for these hunks
      bsd-user: Helper routines h2g_old_sysctl
      bsd-user: various helper routines for sysctl
 ]
 
 This group of patches gets the basic framework for sysctl upstreamed. There's a
 lot more to translate far too many binary blobs the kernel publishes via
 sysctls, but I'm leaving those out in the name of simplicity.
 
 There's also a bug fix from Doug Rabson that fixes a long int confusion leading
 to a trunctation of addresses (oops)
 
 There's a fix for the -static option, since clang hates -no-pie and needs only
 -fno-pie.
 
 Finally, I'm changing how I'm upstreaming a little. I'm doing a little deeper
 dives into our rather chaotic repo to find a couple of authors I might have
 missed. From here on out, I'll be using the original author's name as the git
 author. I'll also tag the co-authors better as well when there's multiple people
 that did something (other than reformat and/or move code around). I've
 discovered more code moved about than I'd previously known. This seems more in
 line with standard practice.
 
 v3->pull:
 o minor	tweaks in the conditional reviews around formatting
 o fix all errors for check patch and am	OK with	remaining warnings for
   line length that's only slightly too long
 o edited letter for changes in review process
 
 v3:
 o Removed -strict, it's not ready and needs a complete rethink.
 o Add g_assert_not_reached()
 o target -> guest in most places
 o Use MIN() to simplify things
 o Better types in many places (abi_int instead of int32_t)
 o Use ARRAY_COUNT
 o fix tabs copied from FreeBSD sources to spaces
 
 v2:
 o Created various helper functions to make the code a little better
 o split a few patches that I thought would be approved together but
   that generated commentary. It's easier to manage 1 per patch for
   those.
 o Add/delete G_GNU_UNUSED to ensure all patches compile w/o warnings
 o Fix 64-bit running 32-bit binary to get a LONG or ULONG. Add a
   bounce buffer for these so we don't overflow anything on the target
   and return all the elements of arrays.
 o Fixed a number of nits noticed in the review.
 o Add or improve comments to explain things there were questions on
   during the review.
 o fix noted typos
 o fix host != target page size differences
 o Add pointers to FreeBSD source code, as appropriate
 o fix locking (mostly unlocking) on error paths
 o Note: -strict feedback not yet applied due to large numbers of changes
   from the rest. Next round.
 -----BEGIN PGP SIGNATURE-----
 Comment: GPGTools - https://gpgtools.org
 
 iQIzBAABCgAdFiEEIDX4lLAKo898zeG3bBzRKH2wEQAFAmP/l/4ACgkQbBzRKH2w
 EQACSA/+McBQE2IAw+OaAXwD9yOjN9YAEoitl1eUAYuRNGnODuA0mlsTdEaEOHXi
 0gzJ6qLqZxN0fzkQ6cdME3Tsft4bnwW/glRtIoOjfEYur/4VMJGCxcCmdF3DNUR9
 aDqr+SukhkMI3fy2CtPDViX8kH8RUlv1I4JM7vBkiu0XB2Joe0cKqGsSOlQvPOPc
 imhNX5Vw3A5RB/GoiJkoMBu42HwIqFUtMU3RkeraclHSeQfqgWiNu1TZyJtmsL9S
 qUPhc4+Ac1EeO9cA67j3t+vlYBR9RcvQHjtSFBpcNjYcJdchgB4Kk4E94/O0jgq4
 +ueV4bkPL0wNWi13mPwclK/VTMdobyLJsRzH5ulk1GF7bGFSbkYlr2Nbct7HLWMo
 DIkN8oCs/j2TqE5ZxTMmLnuA7N7mpdtGt2xM4VBgev9MRzF9nN09LmR/smOzechp
 /Jr9ujU3c6XTlWO0x+lQrKGo0BlNjiGJujoS21UpiWBKISxaelVxId2UTBA1BPGR
 UfNAD+eD1TFbDHFLBN8SsLNXam6BkIcOgQ5sbwde6Y+W4TVKZ1XpB0dxzmnftdt/
 iEIygOj3F2BGVbvPtpP+KzSfjMg7+s4mb1/oDI5D7bekY0RK8C6KRasF/L4QjMWN
 U08L2n+aQ7udcLZHmnzsd3Ifvu7+I/YaAR8gP/G7ZH2z3toMk5E=
 =HB1L
 -----END PGP SIGNATURE-----

Merge tag 'bsd-user-2023q1-pull-request' of gitlab.com:bsdimp/qemu into staging

2023 Q1 bsd-user upstreaming: bugfixes and sysctl

[ letter edited -- need reviews for these hunks
     bsd-user: Helper routines h2g_old_sysctl
     bsd-user: various helper routines for sysctl
]

This group of patches gets the basic framework for sysctl upstreamed. There's a
lot more to translate far too many binary blobs the kernel publishes via
sysctls, but I'm leaving those out in the name of simplicity.

There's also a bug fix from Doug Rabson that fixes a long int confusion leading
to a trunctation of addresses (oops)

There's a fix for the -static option, since clang hates -no-pie and needs only
-fno-pie.

Finally, I'm changing how I'm upstreaming a little. I'm doing a little deeper
dives into our rather chaotic repo to find a couple of authors I might have
missed. From here on out, I'll be using the original author's name as the git
author. I'll also tag the co-authors better as well when there's multiple people
that did something (other than reformat and/or move code around). I've
discovered more code moved about than I'd previously known. This seems more in
line with standard practice.

v3->pull:
o minor	tweaks in the conditional reviews around formatting
o fix all errors for check patch and am	OK with	remaining warnings for
  line length that's only slightly too long
o edited letter for changes in review process

v3:
o Removed -strict, it's not ready and needs a complete rethink.
o Add g_assert_not_reached()
o target -> guest in most places
o Use MIN() to simplify things
o Better types in many places (abi_int instead of int32_t)
o Use ARRAY_COUNT
o fix tabs copied from FreeBSD sources to spaces

v2:
o Created various helper functions to make the code a little better
o split a few patches that I thought would be approved together but
  that generated commentary. It's easier to manage 1 per patch for
  those.
o Add/delete G_GNU_UNUSED to ensure all patches compile w/o warnings
o Fix 64-bit running 32-bit binary to get a LONG or ULONG. Add a
  bounce buffer for these so we don't overflow anything on the target
  and return all the elements of arrays.
o Fixed a number of nits noticed in the review.
o Add or improve comments to explain things there were questions on
  during the review.
o fix noted typos
o fix host != target page size differences
o Add pointers to FreeBSD source code, as appropriate
o fix locking (mostly unlocking) on error paths
o Note: -strict feedback not yet applied due to large numbers of changes
  from the rest. Next round.

# -----BEGIN PGP SIGNATURE-----
# Comment: GPGTools - https://gpgtools.org
#
# iQIzBAABCgAdFiEEIDX4lLAKo898zeG3bBzRKH2wEQAFAmP/l/4ACgkQbBzRKH2w
# EQACSA/+McBQE2IAw+OaAXwD9yOjN9YAEoitl1eUAYuRNGnODuA0mlsTdEaEOHXi
# 0gzJ6qLqZxN0fzkQ6cdME3Tsft4bnwW/glRtIoOjfEYur/4VMJGCxcCmdF3DNUR9
# aDqr+SukhkMI3fy2CtPDViX8kH8RUlv1I4JM7vBkiu0XB2Joe0cKqGsSOlQvPOPc
# imhNX5Vw3A5RB/GoiJkoMBu42HwIqFUtMU3RkeraclHSeQfqgWiNu1TZyJtmsL9S
# qUPhc4+Ac1EeO9cA67j3t+vlYBR9RcvQHjtSFBpcNjYcJdchgB4Kk4E94/O0jgq4
# +ueV4bkPL0wNWi13mPwclK/VTMdobyLJsRzH5ulk1GF7bGFSbkYlr2Nbct7HLWMo
# DIkN8oCs/j2TqE5ZxTMmLnuA7N7mpdtGt2xM4VBgev9MRzF9nN09LmR/smOzechp
# /Jr9ujU3c6XTlWO0x+lQrKGo0BlNjiGJujoS21UpiWBKISxaelVxId2UTBA1BPGR
# UfNAD+eD1TFbDHFLBN8SsLNXam6BkIcOgQ5sbwde6Y+W4TVKZ1XpB0dxzmnftdt/
# iEIygOj3F2BGVbvPtpP+KzSfjMg7+s4mb1/oDI5D7bekY0RK8C6KRasF/L4QjMWN
# U08L2n+aQ7udcLZHmnzsd3Ifvu7+I/YaAR8gP/G7ZH2z3toMk5E=
# =HB1L
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 01 Mar 2023 18:22:54 GMT
# gpg:                using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100
# gpg: Good signature from "Warner Losh <wlosh@netflix.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@bsdimp.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@freebsd.org>" [unknown]
# gpg:                 aka "Warner Losh <imp@village.org>" [unknown]
# gpg:                 aka "Warner Losh <wlosh@bsdimp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2035 F894 B00A A3CF 7CCD  E1B7 6C1C D128 7DB0 1100

* tag 'bsd-user-2023q1-pull-request' of gitlab.com:bsdimp/qemu:
  bsd-user: implement sysctlbyname(2)
  bsd-user: do_freebsd_sysctl helper for sysctl(2)
  bsd-user: Start translation of arch-specific sysctls
  bsd-user: common routine do_freebsd_sysctl_oid for all sysctl variants
  bsd-user: sysctl helper funtions: sysctl_name2oid and sysctl_oidfmt
  bsd-user: Helper routines oidfmt
  bsd-user: various helper routines for sysctl
  bsd-user: Add sysarch syscall
  build: Don't specify -no-pie for --static user-mode programs
  bsd-user: Don't truncate the return value from freebsd_syscall

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2023-03-02 10:54:08 +00:00
commit 2461c0b6eb
4 changed files with 593 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

571
bsd-user/freebsd/os-sys.c
View File

@ -21,6 +21,577 @@
#include "qemu.h"
#include "target_arch_sysarch.h"
#include <sys/sysctl.h>
/*
* Length for the fixed length types.
* 0 means variable length for strings and structures
* Compare with sys/kern_sysctl.c ctl_size
* Note: Not all types appear to be used in-tree.
*/
static const int guest_ctl_size[CTLTYPE + 1] = {
[CTLTYPE_INT] = sizeof(abi_int),
[CTLTYPE_UINT] = sizeof(abi_uint),
[CTLTYPE_LONG] = sizeof(abi_long),
[CTLTYPE_ULONG] = sizeof(abi_ulong),
[CTLTYPE_S8] = sizeof(int8_t),
[CTLTYPE_S16] = sizeof(int16_t),
[CTLTYPE_S32] = sizeof(int32_t),
[CTLTYPE_S64] = sizeof(int64_t),
[CTLTYPE_U8] = sizeof(uint8_t),
[CTLTYPE_U16] = sizeof(uint16_t),
[CTLTYPE_U32] = sizeof(uint32_t),
[CTLTYPE_U64] = sizeof(uint64_t),
};
static const int host_ctl_size[CTLTYPE + 1] = {
[CTLTYPE_INT] = sizeof(int),
[CTLTYPE_UINT] = sizeof(u_int),
[CTLTYPE_LONG] = sizeof(long),
[CTLTYPE_ULONG] = sizeof(u_long),
[CTLTYPE_S8] = sizeof(int8_t),
[CTLTYPE_S16] = sizeof(int16_t),
[CTLTYPE_S32] = sizeof(int32_t),
[CTLTYPE_S64] = sizeof(int64_t),
[CTLTYPE_U8] = sizeof(uint8_t),
[CTLTYPE_U16] = sizeof(uint16_t),
[CTLTYPE_U32] = sizeof(uint32_t),
[CTLTYPE_U64] = sizeof(uint64_t),
};
#ifdef TARGET_ABI32
/*
* Limit the amount of available memory to be most of the 32-bit address
* space. 0x100c000 was arrived at through trial and error as a good
* definition of 'most'.
*/
static const abi_ulong guest_max_mem = UINT32_MAX - 0x100c000 + 1;
static abi_ulong cap_memory(uint64_t mem)
{
return MIN(guest_max_mem, mem);
}
#endif
static abi_ulong scale_to_guest_pages(uint64_t pages)
{
/* Scale pages from host to guest */
pages = muldiv64(pages, qemu_real_host_page_size(), TARGET_PAGE_SIZE);
#ifdef TARGET_ABI32
/* cap pages if need be */
pages = MIN(pages, guest_max_mem / (abi_ulong)TARGET_PAGE_SIZE);
#endif
return pages;
}
#ifdef TARGET_ABI32
/* Used only for TARGET_ABI32 */
static abi_long h2g_long_sat(long l)
{
if (l > INT32_MAX) {
l = INT32_MAX;
} else if (l < INT32_MIN) {
l = INT32_MIN;
}
return l;
}
static abi_ulong h2g_ulong_sat(u_long ul)
{
return MIN(ul, UINT32_MAX);
}
#endif
/*
* placeholder until bsd-user downstream upstreams this with its thread support
*/
#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 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;
}
/*
* Convert the old value from host to guest.
*
* For LONG and ULONG on ABI32, we need to 'down convert' the 8 byte quantities
* to 4 bytes. The caller setup a buffer in host memory to get this data from
* the kernel and pass it to us. We do the down conversion and adjust the length
* so the caller knows what to write as the returned length into the target when
* it copies the down converted values into the target.
*
* For normal integral types, we just need to byte swap. No size changes.
*
* For strings and node data, there's no conversion needed.
*
* For opaque data, per sysctl OID converts take care of it.
*/
static void h2g_old_sysctl(void *holdp, size_t *holdlen, uint32_t kind)
{
size_t len;
int hlen, glen;
uint8_t *hp, *gp;
/*
* Although rare, we can have arrays of sysctl. Both sysctl_old_ddb in
* kern_sysctl.c and show_var in sbin/sysctl/sysctl.c have code that loops
* this way. *holdlen has been set by the kernel to the host's length.
* Only LONG and ULONG on ABI32 have different sizes: see below.
*/
gp = hp = (uint8_t *)holdp;
len = 0;
hlen = host_ctl_size[kind & CTLTYPE];
glen = guest_ctl_size[kind & CTLTYPE];
/*
* hlen == 0 for CTLTYPE_STRING and CTLTYPE_NODE, which need no conversion
* as well as CTLTYPE_OPAQUE, which needs special converters.
*/
if (hlen == 0) {
return;
}
while (len < *holdlen) {
if (hlen == glen) {
switch (hlen) {
case 1:
/* Nothing needed: no byteswapping and assigning in place */
break;
case 2:
*(uint16_t *)gp = tswap16(*(uint16_t *)hp);
break;
case 4:
*(uint32_t *)gp = tswap32(*(uint32_t *)hp);
break;
case 8:
*(uint64_t *)gp = tswap64(*(uint64_t *)hp);
break;
default:
g_assert_not_reached();
}
} else {
#ifdef TARGET_ABI32
/*
* Saturating assignment for the only two types that differ between
* 32-bit and 64-bit machines. All other integral types have the
* same, fixed size and will be converted w/o loss of precision
* in the above switch.
*/
switch (kind & CTLTYPE) {
case CTLTYPE_LONG:
*(abi_long *)gp = tswap32(h2g_long_sat(*(long *)hp));
break;
case CTLTYPE_ULONG:
*(abi_ulong *)gp = tswap32(h2g_ulong_sat(*(u_long *)hp));
break;
default:
g_assert_not_reached();
}
#else
g_assert_not_reached();
#endif
}
gp += glen;
hp += hlen;
len += hlen;
}
#ifdef TARGET_ABI32
if (hlen != glen) {
*holdlen = (*holdlen / hlen) * glen;
}
#endif
}
/*
* Convert the undocmented name2oid sysctl data for the target.
*/
static inline void sysctl_name2oid(uint32_t *holdp, size_t holdlen)
{
size_t i, num = holdlen / sizeof(uint32_t);
for (i = 0; i < num; i++) {
holdp[i] = tswap32(holdp[i]);
}
}
static inline void sysctl_oidfmt(uint32_t *holdp)
{
/* byte swap the kind */
holdp[0] = tswap32(holdp[0]);
}
static abi_long do_freebsd_sysctl_oid(CPUArchState *env, int32_t *snamep,
int32_t namelen, void *holdp, size_t *holdlenp, void *hnewp,
size_t newlen)
{
uint32_t kind = 0;
abi_long ret;
size_t holdlen, oldlen;
#ifdef TARGET_ABI32
void *old_holdp;
#endif
holdlen = oldlen = *holdlenp;
oidfmt(snamep, namelen, NULL, &kind);
/* Handle some arch/emulator dependent sysctl()'s here. */
switch (snamep[0]) {
case CTL_KERN:
switch (snamep[1]) {
case KERN_USRSTACK:
if (oldlen) {
(*(abi_ulong *)holdp) = tswapal(TARGET_USRSTACK);
}
holdlen = sizeof(abi_ulong);
ret = 0;
goto out;
case KERN_PS_STRINGS:
if (oldlen) {
(*(abi_ulong *)holdp) = tswapal(TARGET_PS_STRINGS);
}
holdlen = sizeof(abi_ulong);
ret = 0;
goto out;
default:
break;
}
break;
case CTL_HW:
switch (snamep[1]) {
case HW_MACHINE:
holdlen = sizeof(TARGET_HW_MACHINE);
if (holdp) {
strlcpy(holdp, TARGET_HW_MACHINE, oldlen);
}
ret = 0;
goto out;
case HW_MACHINE_ARCH:
{
holdlen = sizeof(TARGET_HW_MACHINE_ARCH);
if (holdp) {
strlcpy(holdp, TARGET_HW_MACHINE_ARCH, oldlen);
}
ret = 0;
goto out;
}
case HW_NCPU:
if (oldlen) {
(*(abi_int *)holdp) = tswap32(bsd_get_ncpu());
}
holdlen = sizeof(int32_t);
ret = 0;
goto out;
#if defined(TARGET_ARM)
case HW_FLOATINGPT:
if (oldlen) {
ARMCPU *cpu = env_archcpu(env);
*(abi_int *)holdp = cpu_isar_feature(aa32_vfp, cpu);
}
holdlen = sizeof(abi_int);
ret = 0;
goto out;
#endif
#ifdef TARGET_ABI32
case HW_PHYSMEM:
case HW_USERMEM:
case HW_REALMEM:
holdlen = sizeof(abi_ulong);
ret = 0;
if (oldlen) {
int mib[2] = {snamep[0], snamep[1]};
unsigned long lvalue;
size_t len = sizeof(lvalue);
if (sysctl(mib, 2, &lvalue, &len, NULL, 0) == -1) {
ret = -1;
} else {
lvalue = cap_memory(lvalue);
(*(abi_ulong *)holdp) = tswapal((abi_ulong)lvalue);
}
}
goto out;
#endif
default:
{
static int oid_hw_availpages;
static int oid_hw_pagesizes;
if (!oid_hw_availpages) {
int real_oid[CTL_MAXNAME + 2];
size_t len = sizeof(real_oid) / sizeof(int);
if (sysctlnametomib("hw.availpages", real_oid, &len) >= 0) {
oid_hw_availpages = real_oid[1];
}
}
if (!oid_hw_pagesizes) {
int real_oid[CTL_MAXNAME + 2];
size_t len = sizeof(real_oid) / sizeof(int);
if (sysctlnametomib("hw.pagesizes", real_oid, &len) >= 0) {
oid_hw_pagesizes = real_oid[1];
}
}
if (oid_hw_availpages && snamep[1] == oid_hw_availpages) {
long lvalue;
size_t len = sizeof(lvalue);
if (sysctlbyname("hw.availpages", &lvalue, &len, NULL, 0) == -1) {
ret = -1;
} else {
if (oldlen) {
lvalue = scale_to_guest_pages(lvalue);
(*(abi_ulong *)holdp) = tswapal((abi_ulong)lvalue);
}
holdlen = sizeof(abi_ulong);
ret = 0;
}
goto out;
}
if (oid_hw_pagesizes && snamep[1] == oid_hw_pagesizes) {
if (oldlen) {
(*(abi_ulong *)holdp) = tswapal((abi_ulong)TARGET_PAGE_SIZE);
((abi_ulong *)holdp)[1] = 0;
}
holdlen = sizeof(abi_ulong) * 2;
ret = 0;
goto out;
}
break;
}
}
break;
default:
break;
}
#ifdef TARGET_ABI32
/*
* For long and ulong with a 64-bit host and a 32-bit target we have to do
* special things. holdlen here is the length provided by the target to the
* system call. So we allocate a buffer twice as large because longs are
* twice as big on the host which will be writing them. In h2g_old_sysctl
* we'll adjust them and adjust the length.
*/
if (kind == CTLTYPE_LONG || kind == CTLTYPE_ULONG) {
old_holdp = holdp;
holdlen = holdlen * 2;
holdp = g_malloc(holdlen);
}
#endif
ret = get_errno(sysctl(snamep, namelen, holdp, &holdlen, hnewp, newlen));
if (!ret && (holdp != 0)) {
if (snamep[0] == CTL_SYSCTL) {
switch (snamep[1]) {
case CTL_SYSCTL_NEXT:
case CTL_SYSCTL_NAME2OID:
case CTL_SYSCTL_NEXTNOSKIP:
/*
* All of these return an OID array, so we need to convert to
* target.
*/
sysctl_name2oid(holdp, holdlen);
break;
case CTL_SYSCTL_OIDFMT:
/* Handle oidfmt */
sysctl_oidfmt(holdp);
break;
case CTL_SYSCTL_OIDDESCR:
case CTL_SYSCTL_OIDLABEL:
default:
/* Handle it based on the type */
h2g_old_sysctl(holdp, &holdlen, kind);
/* NB: None of these are LONG or ULONG */
break;
}
} else {
/*
* Need to convert from host to target. All the weird special cases
* are handled above.
*/
h2g_old_sysctl(holdp, &holdlen, kind);
#ifdef TARGET_ABI32
/*
* For the 32-bit on 64-bit case, for longs we need to copy the
* now-converted buffer to the target and free the buffer.
*/
if (kind == CTLTYPE_LONG || kind == CTLTYPE_ULONG) {
memcpy(old_holdp, holdp, holdlen);
g_free(holdp);
holdp = old_holdp;
}
#endif
}
}
out:
*holdlenp = holdlen;
return ret;
}
/*
* This syscall was created to make sysctlbyname(3) more efficient, but we can't
* really provide it in bsd-user. Notably, we must always translate the names
* independently since some sysctl values have to be faked for the target
* environment, so it still has to break down to two syscalls for the underlying
* implementation.
*/
abi_long do_freebsd_sysctlbyname(CPUArchState *env, abi_ulong namep,
int32_t namelen, abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp,
abi_ulong newlen)
{
abi_long ret = -TARGET_EFAULT;
void *holdp = NULL, *hnewp = NULL;
char *snamep = NULL;
int oid[CTL_MAXNAME + 2];
size_t holdlen, oidplen;
abi_ulong oldlen = 0;
/* oldlenp is read/write, pre-check here for write */
if (oldlenp) {
if (!access_ok(VERIFY_WRITE, oldlenp, sizeof(abi_ulong)) ||
get_user_ual(oldlen, oldlenp)) {
goto out;
}
}
snamep = lock_user_string(namep);
if (snamep == NULL) {
goto out;
}
if (newp) {
hnewp = lock_user(VERIFY_READ, newp, newlen, 1);
if (hnewp == NULL) {
goto out;
}
}
if (oldp) {
holdp = lock_user(VERIFY_WRITE, oldp, oldlen, 0);
if (holdp == NULL) {
goto out;
}
}
holdlen = oldlen;
oidplen = ARRAY_SIZE(oid);
if (sysctlnametomib(snamep, oid, &oidplen) != 0) {
ret = -TARGET_EINVAL;
goto out;
}
ret = do_freebsd_sysctl_oid(env, oid, oidplen, holdp, &holdlen, hnewp,
newlen);
/*
* writeability pre-checked above. __sysctl(2) returns ENOMEM and updates
* oldlenp for the proper size to use.
*/
if (oldlenp && (ret == 0 || ret == -TARGET_ENOMEM)) {
put_user_ual(holdlen, oldlenp);
}
out:
unlock_user(snamep, namep, 0);
unlock_user(holdp, oldp, ret == 0 ? holdlen : 0);
unlock_user(hnewp, newp, 0);
return ret;
}
abi_long do_freebsd_sysctl(CPUArchState *env, abi_ulong namep, int32_t namelen,
abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp, abi_ulong newlen)
{
abi_long ret = -TARGET_EFAULT;
void *hnamep, *holdp = NULL, *hnewp = NULL;
size_t holdlen;
abi_ulong oldlen = 0;
int32_t *snamep = g_malloc(sizeof(int32_t) * namelen), *p, *q, i;
/* oldlenp is read/write, pre-check here for write */
if (oldlenp) {
if (!access_ok(VERIFY_WRITE, oldlenp, sizeof(abi_ulong)) ||
get_user_ual(oldlen, oldlenp)) {
goto out;
}
}
hnamep = lock_user(VERIFY_READ, namep, namelen, 1);
if (hnamep == NULL) {
goto out;
}
if (newp) {
hnewp = lock_user(VERIFY_READ, newp, newlen, 1);
if (hnewp == NULL) {
goto out;
}
}
if (oldp) {
holdp = lock_user(VERIFY_WRITE, oldp, oldlen, 0);
if (holdp == NULL) {
goto out;
}
}
holdlen = oldlen;
for (p = hnamep, q = snamep, i = 0; i < namelen; p++, i++, q++) {
*q = tswap32(*p);
}
ret = do_freebsd_sysctl_oid(env, snamep, namelen, holdp, &holdlen, hnewp,
newlen);
/*
* writeability pre-checked above. __sysctl(2) returns ENOMEM and updates
* oldlenp for the proper size to use.
*/
if (oldlenp && (ret == 0 || ret == -TARGET_ENOMEM)) {
put_user_ual(holdlen, oldlenp);
}
unlock_user(hnamep, namep, 0);
unlock_user(holdp, oldp, ret == 0 ? holdlen : 0);
out:
g_free(snamep);
return ret;
}
/* sysarch() is architecture dependent. */
abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2)
{

17
bsd-user/freebsd/os-syscall.c
View File

@ -491,6 +491,21 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_bsd_undelete(arg1);
break;
/*
* sys{ctl, arch, call}
*/
case TARGET_FREEBSD_NR___sysctl: /* sysctl(3) */
ret = do_freebsd_sysctl(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
break;
case TARGET_FREEBSD_NR___sysctlbyname: /* sysctlbyname(2) */
ret = do_freebsd_sysctlbyname(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
break;
case TARGET_FREEBSD_NR_sysarch: /* sysarch(2) */
ret = do_freebsd_sysarch(cpu_env, arg1, arg2);
break;
default:
qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
ret = -TARGET_ENOSYS;
@ -512,7 +527,7 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1,
abi_long arg8)
{
CPUState *cpu = env_cpu(cpu_env);
int ret;
abi_long ret;
trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
if (do_strace) {

5
bsd-user/qemu.h
View File

@ -253,6 +253,11 @@ bool is_error(abi_long ret);
int host_to_target_errno(int err);
/* os-sys.c */
abi_long do_freebsd_sysctl(CPUArchState *env, abi_ulong namep, int32_t namelen,
abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp, abi_ulong newlen);
abi_long do_freebsd_sysctlbyname(CPUArchState *env, abi_ulong namep,
int32_t namelen, abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp,
abi_ulong newlen);
abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2);
/* user access */

2
configure vendored
View File

@ -1347,7 +1347,7 @@ if test "$static" = "yes"; then
error_exit "-static-pie not available due to missing toolchain support"
else
pie="no"
QEMU_CFLAGS="-fno-pie -no-pie $QEMU_CFLAGS"
QEMU_CFLAGS="-fno-pie $QEMU_CFLAGS"
fi
elif test "$pie" = "no"; then
if compile_prog "-Werror -fno-pie" "-no-pie"; then