From nobody Fri Sep 04 15:26:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hc0gg5F7pz6qqyf for ; Fri, 04 Sep 2026 15:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hc0gg48nVz3kqk for ; Fri, 04 Sep 2026 15:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788535615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asuFCxNx9qHYnkNZ1QUWHHo49bI8295fWBbrhZY/T0w=; b=JCT01JWYRDkQDTqQAnSCKEK+e1EdcDIovt3xmYwn3n0Lwe5Tr5l0pfhkKqzjf1yBIEWd40 aVIRRVLgMmUCN1DZ5uuQwHaRu5f28Pm41RXul9nrSLEhfux8gL1MGCAVlbnmQEnQEmKjiD YggGyosjJh+5u0MMYSCMsju5WmKW7OwKe8e++z38TvOwUlTgGiQbqgtQmBV0GaMKigQYSN BzhqgAeHnP0nmOhmeZDHInfdIIbcJN+qcDTcdFtzL/nsfvM8GFv6QRMZys6h6XF0+8MvOT cTA3ATwN/XG74MWbCltA+JcEGxkd0fpnFDEo5wVVnHifeMZo6XGMFL74LsAQ0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788535615; a=rsa-sha256; cv=none; b=YBAH8CHCR18CMihO2+AjouvUQrSsBS8Gw61HhRlT95zWKnOCD5zOCJJYtJEAheUHa1o0wb hVNjb2uIBBcBr5/QABNLbsO2MvBSU/NorEQZYgSG51C/awi1dHfLAdjsMwge5I5/OxD3f4 NDSa8kWE6tPfojSCddQZ38tCO6ZgVAgbRQtCZIKwcoeid4T9sWRHYiIRditkVbaN78njZI LwVDuET1FLjHB4oZ0iJcAnuXart3aoCK0TBdFpPjIyXsgXEj0hW65pbN3XQhiYwC0tFucp R3fNnZVrRtrn1GVZNJOnKP2poduWts9yacpvktgzHOCyVINqGdrLTMATP9iroA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788535615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asuFCxNx9qHYnkNZ1QUWHHo49bI8295fWBbrhZY/T0w=; b=AWSUVnNX7sls8ALvfs3eDgosH3eDxLWVaSrqr2pYEE1tiV5CYymODaBLac2XLZOOlkaLz0 1isFb2lLo3fa9M1bYJdjJlqbYZ8uPCaDMYxyXxBp8fIPC0hRDaEOrK/udNGNE5LT8p35AW gzx7hYx1hGLCI4309KIBjnfy08R4GncHotgHPL/KI1Ck4+wCRS7AVTJqtAbqyHGTjKG1ah nfmY7+8ZNizX4SWVb/2EIvulNJTy+dlREStmktQl1WVmxlyPeSII75AV919HFPUKTgGQ1o Wqg+bZ3hDPw1JWbfOsZUyANYKKtOtYNAE7OrgSvFP9M1lj9msEGA12xXrVdWjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hc0gg2ghrz15HX for ; Fri, 04 Sep 2026 15:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cee9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 15:26:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 619d09217720 - main - iuserboot: bump the interface to v6, add an accept_interpreter callback List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 619d09217720cb82f562b51e98576438dc11c830 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 15:26:55 +0000 Message-Id: <6a9ae33f.3cee9.1e268ec4@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=619d09217720cb82f562b51e98576438dc11c830 commit 619d09217720cb82f562b51e98576438dc11c830 Author: Kyle Evans AuthorDate: 2026-09-04 15:26:35 +0000 Commit: Kyle Evans CommitDate: 2026-09-04 15:26:35 +0000 iuserboot: bump the interface to v6, add an accept_interpreter callback If an explicit loader wasn't requested, then bhyveload(8) maintains a /boot handle that it can use for swapping to a different flavor. This means that we expose all of the host /boot to the sandbox for the duration of script execution. Add a callback to ack that we're OK with the interpreter so that bhyveload(8) can release the bootfd. This is worth doing because it's prior to guest script execution, so we're still running a reasonably untainted process. Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D58771 --- stand/userboot/userboot.h | 12 ++++++++++++ stand/userboot/userboot/main.c | 2 ++ usr.sbin/bhyveload/bhyveload.c | 23 ++++++++++++++++++----- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/stand/userboot/userboot.h b/stand/userboot/userboot.h index 34e8cb1d4bb2..1204f5e87f6f 100644 --- a/stand/userboot/userboot.h +++ b/stand/userboot/userboot.h @@ -46,6 +46,13 @@ */ #define USERBOOT_VERSION_5 5 +/* + * Version 6 added a callback for indicating that the guest + * is OK with the existing interpreter, so the host can close associated + * resources. The callback structure is still backward compatible. + */ +#define USERBOOT_VERSION_6 6 + /* * Exit codes from the loader */ @@ -225,4 +232,9 @@ struct loader_callbacks { * Version 5 addition. */ void (*swap_interpreter)(void *arg, const char *interp); + + /* + * Version 6 addition. + */ + void (*accept_interpreter)(void *arg); }; diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 03f226c08bb9..d1f231a12e97 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -217,6 +217,8 @@ loader_main(struct loader_callbacks *cb, void *arg, int version, int ndisks) */ if (version >= USERBOOT_VERSION_5) check_interpreter(); + if (version >= USERBOOT_VERSION_6) + CALLBACK(accept_interpreter); if (setjmp(jb)) return; diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 3b416b7a5ad5..5cf05b97a00c 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -102,6 +102,7 @@ enum { static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; +static int bootfd = -1; static int consin_fd, consout_fd; static int hostbase_fd = -1; @@ -641,6 +642,16 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) longjmp(jb, JMP_SWAPLOADER); } +static void +cb_accept_interpreter(void *arg __unused) +{ + if (bootfd == -1) + return; + + close(bootfd); + bootfd = -1; +} + static struct loader_callbacks cb = { .getc = cb_getc, .putc = cb_putc, @@ -678,6 +689,9 @@ static struct loader_callbacks cb = { /* Version 5 additions */ .swap_interpreter = cb_swap_interpreter, + + /* Version 6 additions */ + .accept_interpreter = cb_accept_interpreter, }; static int @@ -760,7 +774,7 @@ hostbase_open(const char *base) } static void -loader_open(int bootfd) +loader_open(void) { int fd; @@ -790,9 +804,8 @@ main(int argc, char** argv) { void (*func)(struct loader_callbacks *, void *, int, int); uint64_t mem_size; - int bootfd, opt, error, memflags, need_reinit; + int opt, error, memflags, need_reinit; - bootfd = -1; progname = basename(argv[0]); memflags = 0; @@ -922,7 +935,7 @@ main(int argc, char** argv) if (error) err(1, "vm_setup_memory"); - loader_open(bootfd); + loader_open(); func = dlsym(loader_hdl, "loader_main"); if (!func) errx(1, "dlsym: %s", dlerror()); @@ -937,7 +950,7 @@ main(int argc, char** argv) addenv("smbios.bios.vendor=BHYVE"); addenv("boot_serial=1"); - func(&cb, NULL, USERBOOT_VERSION_5, ndisks); + func(&cb, NULL, USERBOOT_VERSION_6, ndisks); free(loader); return (0);