From nobody Wed Oct 14 16:04:13 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 4j4bcF4SsFz6vmZW for ; Wed, 14 Oct 2026 16:04:13 +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 4j4bcF24fCz4Zy4 for ; Wed, 14 Oct 2026 16:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993853; 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=Knyhp3lNT5xctT3F1Bi69eiY3zIJEl+kGQVYRSZYJJE=; b=N8sfzZ7YvzLWj8lKzqtmyXEd7LkCUHGaMt3FNJMq4IVRXMkh6IsKCeXd7o0qqqMFTNBoT3 mzAdLUmpX/H9nbdAoq5Jyl8Pw60PS7QLrn5k9/XfnFkHlDRgtKhNfxs7jueEBwC9HrjUS5 X9Yd2Gw8CHFJCB8Z9c9ZZJp83wkzIXfXtU8Kfsz3yljvzBS/mApyiIyJaFjrWHmJCwicVz TaegOvzDY6mgHCf3IQPM+C9HLBd7V855BhSpQnP4y6nac9Or+vVxDlIz1BoonnBunIp8Mf Mm/08AjQC7lK+5yUlxJD0K5/BB7xM/WqvnNM12bPJ2ERbHl+t/tXfTp4XnBzjQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993853; b=kQxma2Z0iDZCAye8cT18FiRdmv+VdDU2pGCt1KH+sU/7oplzecCHGsumk90MeV6V+nr35r K5r5wEfbY0QQK/OTMfcM9ji5ZGRe6Rm+kR1gM8MnIglxc1S8yGZGEjSIK+AeMRpYvlUFtT rxaS/seMPj80NvG5u7q7rRi71vXjdjf8MJZBT0+9DNYapCDkkQNVXJopXyDwYNIU7swyFU HVbEI4ArxE+fLYZqOPCJJbzOVtUYVnSP3R9w+/wLOLVyz9yc3PK2ClQx0WbfV5y6j7OFXE v4fh/zLUNxGt3a1e23cz1RfZNRe9WmeNrkGVWANr8hw7NMYupEEKCZ3FvZdRcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993853; 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=Knyhp3lNT5xctT3F1Bi69eiY3zIJEl+kGQVYRSZYJJE=; b=j0BNreDb+QITCBqMEyY1hX6i1/A+RCfpEYCTj+Zt4mySiLNyfPQxIlcH50SmGWUWzwsOU5 8oQuFf9cLTbAxYjd4/lahpoXWKuJHyeHshQpaG9GpvfC/2kidnG7FMI97en3H1Xn1kgM9Y NsfH+r+vYldkFTMOh5YH4GTX0i6oJ/t+3trDAN66QH6sFlm6XGD0nbENYns9y5OJKLZOE8 MqplI28XinlEkY0BKtR2e7pdj/wo4gooMQe930ldEHcCGrNAWs+0Ai+3hD2fQy+M1dH+px pAALrrePQipTqGKJn0ELNM5n0oYoXqQ5mOtaa9RNcTNNXGXq1I2GRFeY1pcF4Q== 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 4j4bcF183Wz18Tf for ; Wed, 14 Oct 2026 16:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30df2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:04:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 468babfa680f - releng/14.5 - bhyve: Improve HDA stream descriptor validation List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 468babfa680f55c576efdf81d90e7622b08c1ff1 Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:04:13 +0000 Message-Id: <6acfa7fd.30df2.441b4b3e@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=468babfa680f55c576efdf81d90e7622b08c1ff1 commit 468babfa680f55c576efdf81d90e7622b08c1ff1 Author: Mark Johnston AuthorDate: 2026-10-13 19:58:36 +0000 Commit: Mark Johnston CommitDate: 2026-10-13 20:23:06 +0000 bhyve: Improve HDA stream descriptor validation The length of each block in the stream must be non-zero. This is assumed in hda_transfer(), otherwise an out-of-bounds read or write is possible. Use atomic loads to access stream descriptor fields, since they are guest-controlled. Make sure that the descriptor array is suitably aligned so that we can drop the __packed annotation from the structure definition; per section 3.3.42 of the HDA spec the BDL pointer is supposed to be 128-byte aligned, in fact. Approved by: so Security: FreeBSD-SA-26:72.bhyve Security: CVE-2026-101310 Reported by: Brian Delgado from Intel using Anthropic Opus 4.8 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60678 --- usr.sbin/bhyve/pci_hda.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c index 58481af71a4c..3a29ee386f8f 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -29,6 +29,9 @@ #include #include + +#include + #include #include "pci_hda.h" @@ -82,7 +85,7 @@ struct hda_bdle { uint32_t addrh; uint32_t len; uint32_t ioc; -} __packed; +}; struct hda_bdle_desc { void *addr; @@ -625,8 +628,9 @@ hda_stream_start(struct hda_softc *sc, uint8_t stream_ind) bdl_paddr = bdpl | (bdpu << 32); bdl_vaddr = hda_dma_get_vaddr(sc, bdl_paddr, HDA_BDL_ENTRY_LEN * bdl_cnt); - if (!bdl_vaddr) { - DPRINTF("Fail to get the guest virtual address"); + if (bdl_vaddr == NULL || + (uintptr_t)bdl_vaddr % HDA_DMA_ACCESS_LEN != 0) { + DPRINTF("Invalid guest virtual address %p", bdl_vaddr); return (-1); } @@ -637,11 +641,14 @@ hda_stream_start(struct hda_softc *sc, uint8_t stream_ind) bdle = (struct hda_bdle *)bdl_vaddr; for (size_t i = 0; i < bdl_cnt; i++, bdle++) { - bdle_sz = bdle->len; - assert(!(bdle_sz % HDA_DMA_ACCESS_LEN)); + bdle_sz = atomic_load_32(&bdle->len); + if (bdle_sz % HDA_DMA_ACCESS_LEN != 0 || bdle_sz == 0) { + DPRINTF("Invalid BDLE length: 0x%x", bdle_sz); + return (-1); + } - bdle_addrl = bdle->addrl; - bdle_addrh = bdle->addrh; + bdle_addrl = atomic_load_32(&bdle->addrl); + bdle_addrh = atomic_load_32(&bdle->addrh); bdle_paddr = bdle_addrl | (bdle_addrh << 32); bdle_vaddr = hda_dma_get_vaddr(sc, bdle_paddr, bdle_sz); @@ -653,7 +660,7 @@ hda_stream_start(struct hda_softc *sc, uint8_t stream_ind) bdle_desc = &st->bdl[i]; bdle_desc->addr = bdle_vaddr; bdle_desc->len = bdle_sz; - bdle_desc->ioc = bdle->ioc; + bdle_desc->ioc = atomic_load_32(&bdle->ioc); DPRINTF("bdle: 0x%zx bdle_sz: 0x%x", i, bdle_sz); }