From nobody Mon Sep 21 16:56:21 2026 X-Original-To: dev-commits-src-all@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 4hpTs63kZrz6ssSD for ; Mon, 21 Sep 2026 16:56:26 +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 4hpTs639xsz4tj8 for ; Mon, 21 Sep 2026 16:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790009786; 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=8xhkcbPLg7QeW6xWmoBMVfcy6J+CcomtJ2o0ZmmQUlg=; b=Hrj4UMk/epIKy+0WgWKLrGx4lEpSsl4b3b0fiX/x0MnjsXXQ8SzIGXp52aB3BiDRIQjnp/ MVtNQR/fRHbDV9bK6fE/04sAgfgMLznLo4XfagV/jD5MtYcxmlfe/3rcpWv5gOxFPWwzg9 OXgiKpPIce6Nl5CIhbtNq1uNQlKxwdPqBNDye74DB7DcW7RNCxV49nh7G3M0x5xYSIQjkI rxBZeqOx1AGQXV+5Py4YCtVmiHh5TnwTz23+Lp1AHmj9DY/rS+lrFDni2uHNUTK+1sVGAG jc7qTCOhujI8woNKsLH8zJbDCBofBNA5ftT128aVxtxKxKOLoitrnCXHcwrkVA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790009786; b=xU7y+dOdSx8LwcKFl2x+KUOudVGlBL7ZlpV+ahsMWsAaO9XcWDVI2DmU09J4W7iXQec0pH PLpcHk2f74xfE7dCxFlFSWWPt+iAbjP+Zs3gfNwI7faCs5vIyyjEzIkjZfLLT2LDVyKNQt YinrhO1l+oSmTvbdeZjFExol3qI2r7MPyl5vbDbcIfDvciAizsJeyDHMAoM475HkmRlbLT NM4xO06iCsEGwwyXbOqDNElGYiGUqDzpVe5FcoWk8H2wRgHAA3GyPMRud/KYVcYKVckJH/ xx8qhZFA/gXRTRDbWlkIS4IBCTGnYXpDiGt+DYf4XSilz0fJ3BRqYNOX8t30Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790009786; 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=8xhkcbPLg7QeW6xWmoBMVfcy6J+CcomtJ2o0ZmmQUlg=; b=Zt44rC7GaEoDwgiLvANpSXkTL42LWaUCvIrDir7mDUTWUlRYMUSrEp3DliX+paswxa5kSY hqEwNBGaZ6szlypTYiRII07ss818VrIAR6YWvNw4MZVxYJCch9NPcKf9YXhXr2s5HcGDZ0 F6kkLYswHtUYKQavIDP3qGnbDfB7x2D4y6vG7V58yk2JJ9+CYXbcsLU8sHWfzBmLe14jwX nTI+78wDy8wcPhhwPEu016HC41bFsuQIZvPWk8Hqu0+evT10v1ttNmu2253mHD2Us8b5t5 bHMuDtB+HHoXbeG9Z60jM5LHT8UQotZgOrTxuZOCpI+CCPkSDKvmoWWF3jj4sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hpTs61bL4zSjK for ; Mon, 21 Sep 2026 16:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 16:56:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: b27a221ef79d - main - bhyve: fix boot device ordering List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: novel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b27a221ef79d6d77d6173897f12118e1126453d8 Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 16:56:21 +0000 Message-Id: <6ab161b5.39f5b.73544cea@gitrepo.freebsd.org> The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=b27a221ef79d6d77d6173897f12118e1126453d8 commit b27a221ef79d6d77d6173897f12118e1126453d8 Author: Roman Bogorodskiy AuthorDate: 2026-09-20 14:41:55 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-09-21 16:54:45 +0000 bhyve: fix boot device ordering EDK2's QemuBootOrderLib inspects the bootorder file provided via fw_cfg and requires it to be NUL-terminated. Otherwise, it rejects the supplied bootorder and falls back to its default boot order. Currently, bhyve registers bootorder with qemu_fwcfg_add_file() using bootorder_len returned by open_memstream(), which excludes the trailing NUL byte. Fix that by passing bootorder_len + 1 to qemu_fwcfg_add_file() so the fw_cfg payload is properly NUL-terminated. PR: 279720 Reviewed by: markj Found with: codex (gpt-5.6-sol) MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59859 --- usr.sbin/bhyve/pci_emul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 2baeaa0c76b7..9170e0b6b93c 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1516,7 +1516,7 @@ init_bootorder(void) } fclose(fp); - return (qemu_fwcfg_add_file("bootorder", bootorder_len, bootorder)); + return (qemu_fwcfg_add_file("bootorder", bootorder_len + 1, bootorder)); } #define BUSIO_ROUNDUP 32