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
This commit is contained in:
parent
3e9b4532d1
commit
fb7ce0a95e
@ -1103,11 +1103,6 @@ do_open(const char *vmname)
|
|||||||
struct vmctx *ctx;
|
struct vmctx *ctx;
|
||||||
int error;
|
int error;
|
||||||
bool reinit, romboot;
|
bool reinit, romboot;
|
||||||
#ifndef WITHOUT_CAPSICUM
|
|
||||||
cap_rights_t rights;
|
|
||||||
const cap_ioctl_t *cmds;
|
|
||||||
size_t ncmds;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
reinit = romboot = false;
|
reinit = romboot = false;
|
||||||
|
|
||||||
@ -1147,16 +1142,8 @@ do_open(const char *vmname)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef WITHOUT_CAPSICUM
|
#ifndef WITHOUT_CAPSICUM
|
||||||
cap_rights_init(&rights, CAP_IOCTL, CAP_MMAP_RW);
|
if (vm_limit_rights(ctx) != 0)
|
||||||
if (caph_rights_limit(vm_get_device_fd(ctx), &rights) == -1)
|
err(EX_OSERR, "vm_limit_rights");
|
||||||
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);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (reinit) {
|
if (reinit) {
|
||||||
|
Loading…
Reference in New Issue
Block a user