diff options
| author | Dave Voutila <dv@cvs.openbsd.org> | 2023-05-12 16:18:18 +0000 |
|---|---|---|
| committer | Dave Voutila <dv@cvs.openbsd.org> | 2023-05-12 16:18:18 +0000 |
| commit | b254f105877fcbee7a498761ddbeb87484852fb3 (patch) | |
| tree | 1f1f6ee4997ca2cd2ad3cc2365eeabfe75c0b56d | |
| parent | f74e6e749e56a8c75ae6b0e9fcd59eb1aa476e20 (diff) | |
vmd(8): fix segfault on vm creation.
vm_instance was using the wrong vm instance for checking the
vm_kernel_path member. Switch to using the value from the parent
vm instance in the check for if a kernel is known.
Issue reported by kn@. OK mlarkin@, kn@.
| -rw-r--r-- | usr.sbin/vmd/vmd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c index b2e8fecfc8b..b8cc0a09fe3 100644 --- a/usr.sbin/vmd/vmd.c +++ b/usr.sbin/vmd/vmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmd.c,v 1.147 2023/05/12 14:42:30 dv Exp $ */ +/* $OpenBSD: vmd.c,v 1.148 2023/05/12 16:18:17 dv Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -1502,7 +1502,6 @@ vm_instance(struct privsep *ps, struct vmd_vm **vm_parent, struct vm_create_params *vcp = &vmc->vmc_params; struct vmop_create_params *vmcp; struct vm_create_params *vcpp; - struct vmd_vm *vm = NULL; unsigned int i, j; /* return without error if the parent is NULL (nothing to inherit) */ @@ -1526,8 +1525,8 @@ vm_instance(struct privsep *ps, struct vmd_vm **vm_parent, name = vcp->vcp_name; - if ((vm = vm_getbyname(vcp->vcp_name)) != NULL || - (vm = vm_getbyvmid(vcp->vcp_id)) != NULL) { + if (vm_getbyname(vcp->vcp_name) != NULL || + vm_getbyvmid(vcp->vcp_id) != NULL) { return (EPROCLIM); } @@ -1616,8 +1615,8 @@ vm_instance(struct privsep *ps, struct vmd_vm **vm_parent, } /* kernel */ - if (vmc->vmc_kernel > -1 || (vm->vm_kernel_path != NULL && - strnlen(vm->vm_kernel_path, PATH_MAX) < PATH_MAX)) { + if (vmc->vmc_kernel > -1 || ((*vm_parent)->vm_kernel_path != NULL && + strnlen((*vm_parent)->vm_kernel_path, PATH_MAX) < PATH_MAX)) { if (vm_checkinsflag(vmcp, VMOP_CREATE_KERNEL, uid) != 0) { log_warnx("vm \"%s\" no permission to set boot image", name); |