From nobody Mon Sep 28 18:43:59 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 4htqvz25sYz6cX3g for ; Mon, 28 Sep 2026 18:43:59 +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 4htqvz1G5sz4sR7 for ; Mon, 28 Sep 2026 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790621039; 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=A7CA8aB+UoEDFnT4N5W8+l7ikyOBANedHfAcZga9wwU=; b=IzKSEPh+0HIkxcwWEj1M0uz8DJ4Ii6JKhEzQEsJhG3IfqS9yT7HRn6cqynSEt1XMgqtTCa RkLTzSWWa5h16o4vmQQsDvNSwApq2HuuC3Vwydas363LZtIcO0WANjenQ8f3nYromDd5Oy /vXVSnMvxUE8AsFetc33bgWqiODwQbn7sZaGpeYrCUWfCWoSWJqx1q9eWJEGc2WP6bIGC6 8kGjSZ3Ew6a+pV77wXBZSpZ8ZSSRvkPuPW4/wogYTGxaV4JJbQ9bGxxtVHGsYQZUxzCUhh +Snpd+HbuUlLR4qlDq/EHg6i8w9jCh74BUg6godQ4RU9Fy4pjdVwV6MiHoh/4A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790621039; b=p6ChVt264hO50ZRLJdkcVaozaDwsOQS9RRANgg+EwwTCdg40EbInTXV55hajCDdtF0EYgV sKHB6LrnTNgtwqB7qdsbMzmFfCCIqBZA9zpw1zDmpJVkZKp4zrOWDUdDzaezQHF3hRF2sA 5gaga0lK132FXVNsSWXB6UW15xggeZCuN+JzidPCD1tmCX14hjmaZWZnkyRsJApVdc+0Nb AGve2pCCTSkKujERwyxLFT6UdrHtxECNk6oRFQuyj+HmaWX8zpO2Tfyl5DwIfpy4Ag5VW2 nwnTY1p+yPZ5Y92OW88xJd3AbnRaAq+7anm5vM9fEIsiCfkorZHlWjUI7/nbvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790621039; 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=A7CA8aB+UoEDFnT4N5W8+l7ikyOBANedHfAcZga9wwU=; b=lZsl4zrKKPL8FmfJXoyCsuWPRk8CYFwQHF4rOedt3mWwtBnTuviG9/MwYlDLyF2+rFoYxG b2MI/iWFKjeK0YlhWWxKclxLDykvvmcbci2imqlNC1Kabc8heX4GsiuotjTxzLlQHVGbwp 3KSWFYzVIs57hsV3mK+riiE9SW56s+kXJHIntMKVJCflLo6cPhrL3PgnfQgakvbkHnyD2z uLfPH4weo6+bvSNnbG7piDXxL49KU8BIHi8xFEJMb4G6qidf4bNvOw4bjX5I1i2qqmCpov 2CxO4JaLbRrIYBZB9uMVMrK9PVe8RM1j6DuqrIR167EpRgUKa4ak77bFUOatEw== 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 4htqvz0Jvkzfvq for ; Mon, 28 Sep 2026 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 28 Sep 2026 18:43:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: c901f931f6eb - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c901f931f6eb102cc0347fddb71bdb409374bdf9 Auto-Submitted: auto-generated Date: Mon, 28 Sep 2026 18:43:59 +0000 Message-Id: <6abab56f.3ef9e.48c47568@gitrepo.freebsd.org> The branch stable/14 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=c901f931f6eb102cc0347fddb71bdb409374bdf9 commit c901f931f6eb102cc0347fddb71bdb409374bdf9 Author: Roman Bogorodskiy AuthorDate: 2026-09-20 14:41:55 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-09-28 18:39:05 +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 (cherry picked from commit b27a221ef79d6d77d6173897f12118e1126453d8) --- 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 238c4780088e..49e6b6136ff8 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1482,7 +1482,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