From nobody Mon Sep 28 16:01:19 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 4htmJN6N6nz6Wrvv for ; Mon, 28 Sep 2026 16:01:24 +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 4htmJN5MvLz4THr for ; Mon, 28 Sep 2026 16:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790611284; 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=s0sOHprK95ya25qJl1BcESkZcTmdNzew7JK6JTL7jtc=; b=jzgsTIzmIrSiVSSPzzJyUZZZnT7XFcDq11WYPq44+i+S4V9nznIyrPQAWJItnk7StShLju qoJMuh7GC3V/lGhoVNXJ6j0uGu5gfzc3a3gvJQGOqIvn6D3TjytE8TVFZRPicbLnQNbnmf elGrXxc9V8QjsHItij7UPAjMJZNXbZlIqX8LXBwH2BWxnkUkJLEto7rQM6qHbP1zMqfOIr /dg4exBIrFGUvNSnt/Ad1FU6F1Ykvbh5PGILREx5Lx8DhJJbyiVXriNAR4ctvxen84x5VZ cls08ydx/pUN8wY9U4KsSH3S+nTi+1RTkI0BDJVlKKHjtFEQHw9jWVQi5X0cgg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790611284; b=RaMOFY21M28QKdG1ixIK8KhshHTiQoGeYszOeqN8qdxMpsuT0jeYhD5FlK0z1X6K9GABGb mLjGNypvSgeVQKqChZpWWEPBRtoDjXvB8QeHnGpBf89SSST5lwi3JLw/kLurNhIjJIitkP 3M7hKr/mVOaL1IwKTf+hqAy8xskMH9BJM2uV/xCfQlRn31MzAbtZJoLWDwgooIDNAoue3F 3p8zXWemtyr/Ruta4qjsxZOef3cubtcln67YuB8+5lLbRMg3XnWLdI9P71nvCHkak0eq5O 9Exw6qpi6WJC27KJSleWUSzyMgy14kkZ95kt/RWufuHYAm2V3ETib4laiY6uEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790611284; 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=s0sOHprK95ya25qJl1BcESkZcTmdNzew7JK6JTL7jtc=; b=OQJzIorDSupt4av0EdgH+uPZDYTOqlEgu25FT6CHizKUvFRv1axGMQWsO27VuME72CEpOh GUFNPaKOZbTC1c3YNTvOWoigAL/xte8J+dXj3VesmiShRylwS0khao0C0mkpuInTXQ4k0S 8SPIVxH/KzusDGFxRYH8bKcmCzbY99W5bZK8kBv/PzMdRkaE+nKl07AP2CNojxDIeScFj3 EL+zkRxFaVLyQ5NNl6g+hXeNQa54VUERdIbv+v0//obGWz7boAoT/LuYzJksd1m96NvgTo MZCNX+JlmHxTBfmVje7/pwIASNI7cOh314TMhYHld1xTULfNk/KM4pJF4ticnQ== 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 4htmJN4Sx4zZgk for ; Mon, 28 Sep 2026 16:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 28 Sep 2026 16:01:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 1a6e0c38d023 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 1a6e0c38d023f975d6015570b9fc34f09175dc03 Auto-Submitted: auto-generated Date: Mon, 28 Sep 2026 16:01:19 +0000 Message-Id: <6aba8f4f.25ae5.566d07ed@gitrepo.freebsd.org> The branch stable/15 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6e0c38d023f975d6015570b9fc34f09175dc03 commit 1a6e0c38d023f975d6015570b9fc34f09175dc03 Author: Roman Bogorodskiy AuthorDate: 2026-09-20 14:41:55 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-09-28 15:59:17 +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 538e4f284bec..228f797f8a86 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1512,7 +1512,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