diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2022-10-24 21:32:04 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-10-24 21:33:13 +0000 |
| commit | fb7ce0a95ef1e796c10def3ed660e487ffb77c75 (patch) | |
| tree | f383f892627b60fa9777a7dc0be429a571137831 | |
| parent | 3e9b4532d174378624e4582637883736f7781851 (diff) | |
| download | src-fb7ce0a95ef1e796c10def3ed660e487ffb77c75.tar.gz src-fb7ce0a95ef1e796c10def3ed660e487ffb77c75.zip | |
bhyve: Use the new vm_limit_rights() interface
This addresses a compiler warning arising from the fact that bhyve
needs to cast away a const qualifier in order to call free().
No functional change intended.
Reviewed by: jhb
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D37099
| -rw-r--r-- | usr.sbin/bhyve/bhyverun.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 6e7eed747e97..a0261e755cfc 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1103,11 +1103,6 @@ do_open(const char *vmname) struct vmctx *ctx; int error; bool reinit, romboot; -#ifndef WITHOUT_CAPSICUM - cap_rights_t rights; - const cap_ioctl_t *cmds; - size_t ncmds; -#endif reinit = romboot = false; @@ -1147,16 +1142,8 @@ do_open(const char *vmname) } #ifndef WITHOUT_CAPSICUM - cap_rights_init(&rights, CAP_IOCTL, CAP_MMAP_RW); - if (caph_rights_limit(vm_get_device_fd(ctx), &rights) == -1) - errx(EX_OSERR, "Unable to apply rights for sandbox"); - vm_get_ioctls(&ncmds); - cmds = vm_get_ioctls(NULL); - if (cmds == NULL) - errx(EX_OSERR, "out of memory"); - if (caph_ioctls_limit(vm_get_device_fd(ctx), cmds, ncmds) == -1) - errx(EX_OSERR, "Unable to apply rights for sandbox"); - free((cap_ioctl_t *)cmds); + if (vm_limit_rights(ctx) != 0) + err(EX_OSERR, "vm_limit_rights"); #endif if (reinit) { |