diff options
| author | Dave Voutila <dv@cvs.openbsd.org> | 2024-02-04 14:57:01 +0000 |
|---|---|---|
| committer | Dave Voutila <dv@cvs.openbsd.org> | 2024-02-04 14:57:01 +0000 |
| commit | ae991a7a41d751628e81fa1b9cc1a0e6cff7847c (patch) | |
| tree | 6b91261eb5ff60d5eec53a32332b749e8bca3c0f | |
| parent | 9d0e7ef7456008591f1441a0abec09c0d6e5db2a (diff) | |
Remove dead code and fix null deref if vm is not found.
Return early if no vm is found in vmd(8)'s primary vm fork/exec
function, preventing null deref in the 'fail' section. Also remove
inner return from the parent routine to prevent unreachable code.
Found by smatch, reported by and ok jsg@.
| -rw-r--r-- | usr.sbin/vmd/vmm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/vmd/vmm.c b/usr.sbin/vmd/vmm.c index 917c7a22d1a..1f7678fbaff 100644 --- a/usr.sbin/vmd/vmm.c +++ b/usr.sbin/vmd/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.117 2024/01/18 14:49:59 claudio Exp $ */ +/* $OpenBSD: vmm.c,v 1.118 2024/02/04 14:57:00 dv Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -650,8 +650,7 @@ vmm_start_vm(struct imsg *imsg, uint32_t *id, pid_t *pid) if ((vm = vm_getbyvmid(imsg->hdr.peerid)) == NULL) { log_warnx("%s: can't find vm", __func__); - ret = ENOENT; - goto err; + return (ENOENT); } vcp = &vm->vm_params.vmc_params; @@ -747,7 +746,6 @@ vmm_start_vm(struct imsg *imsg, uint32_t *id, pid_t *pid) if (vmm_pipe(vm, fds[0], vmm_dispatch_vm) == -1) fatal("setup vm pipe"); - return (0); } else { /* Child. Create a new session. */ if (setsid() == -1) |