diff options
| author | Dave Voutila <dv@cvs.openbsd.org> | 2023-11-09 12:26:09 +0000 |
|---|---|---|
| committer | Dave Voutila <dv@cvs.openbsd.org> | 2023-11-09 12:26:09 +0000 |
| commit | fc91ed1e6e4f1cbbaaa6f308c70e9b5b10fb5f9b (patch) | |
| tree | 9eeec86a1760d8a7916c165676bde795e26a064e /usr.sbin/vmctl | |
| parent | 6c44d6d0d8327a8f07083edb64eacba43daef922 (diff) | |
vmctl(8): avoid abort when given an invalid "kernel" file.
The vmctl `start` command allows the user to pass an optional
"kernel" file (either a ramdisk kernel or a SeaBIOS image). This
file is opened by vmctl and the descriptor passed via imsg.
If the file provided isn't a regular file, the attempt to send the
start message to vmd(8)'s control socket will fail and results in
a the vmctl process aborting.
Check the file type after open and fail gracefully if not a regular
file.
reported by and ok gnezdo@
Diffstat (limited to 'usr.sbin/vmctl')
| -rw-r--r-- | usr.sbin/vmctl/vmctl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c index 9f323b677ea..ba05a7322bb 100644 --- a/usr.sbin/vmctl/vmctl.c +++ b/usr.sbin/vmctl/vmctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.c,v 1.88 2023/05/02 13:02:51 jsg Exp $ */ +/* $OpenBSD: vmctl.c,v 1.89 2023/11/09 12:26:08 dv Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> @@ -77,6 +77,7 @@ vm_start(uint32_t start_id, const char *name, size_t memsize, int nnics, { struct vmop_create_params *vmc; struct vm_create_params *vcp; + struct stat sb; unsigned int flags = 0; int i; const char *s; @@ -188,6 +189,11 @@ vm_start(uint32_t start_id, const char *name, size_t memsize, int nnics, vmc->vmc_kernel = open(kernel, O_RDONLY); if (vmc->vmc_kernel == -1) err(1, "cannot open kernel '%s'", kernel); + memset(&sb, 0, sizeof(sb)); + if (fstat(vmc->vmc_kernel, &sb) == -1) + err(1, "fstat kernel"); + if (!S_ISREG(sb.st_mode)) + errx(1, "kernel must be a regular file"); } if (iso != NULL) if (strlcpy(vmc->vmc_cdrom, iso, |