From ea102623e0736a121a5c67ffe5715ffdd48267bd Mon Sep 17 00:00:00 2001
From: reyk <reyk@openbsd.org>
Date: Tue, 7 Aug 2018 14:49:05 +0000
Subject: [PATCH] Post-g2k18 fix: unbreak the optional vmd-internal vmboot
 loader.

The new vm_checkaccess() call didn't account for the vmboot case.

OK ccardenas@ mikeb@
---
 usr.sbin/vmd/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/vmd/config.c b/usr.sbin/vmd/config.c
index 95d959da307..550b73c1a39 100644
--- a/usr.sbin/vmd/config.c
+++ b/usr.sbin/vmd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.49 2018/08/07 11:28:29 reyk Exp $	*/
+/*	$OpenBSD: config.c,v 1.50 2018/08/07 14:49:05 reyk Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -256,7 +256,7 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid, uid_t uid)
 			goto fail;
 		}
 
-		if (vm_checkaccess(kernfd,
+		if (!vmboot && vm_checkaccess(kernfd,
 		    vmc->vmc_checkaccess & VMOP_CREATE_KERNEL,
 		    uid, R_OK) == -1) {
 			log_warnx("vm \"%s\" no read access to kernel %s",
-- 
2.20.1