From nobody Wed Oct 14 16:04:39 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 4j4bcl5b1Fz6vmd7 for ; Wed, 14 Oct 2026 16:04:39 +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 4j4bcl2vBwz4bl8 for ; Wed, 14 Oct 2026 16:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993879; 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=6YE84UrRLvx21g4noGM4mZ7ouvk62HEyEalNKz8h9JQ=; b=ubJ94O+ooU5AyCCu21DHBo5cFQ1toBtN2UhRNd6UHZuIbTcVs47au4cfOMBT2sBqV+TeSw BRdJIdj/W1JJ5Y/VoxIx50VDaGJg3JwFAGomckfd8GQchjK6z3FCFa8GhkC7BqbBslMLZE ZziivNTK5JpRxyp5OrCkGDdNE6CnXCh/V6RMgNgS9gG9W4HJo+bKMXGtFgmThMMPFvqfA7 5Xu/kVmGaXGvUoHsD09oGsneVw6XMN8ok178H/hM7hW9fxHTmP2B6oRoRkbmf9W3prbjCO loSR0OEncjAqghLWFmoaHAzN86j9HaWaY1Xx80tg93W18p5eaFn7H5iJ2tlUkA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993879; b=bokNMlGpK/X9dShPlDCjEFDhIs+xIGuJVTfkxGcNRKX93YmmoQYAaV2KNOUGZsSQlBA5g8 3jCoGrdc/f3lq7KGTMoyVKRsj5FyuT4KANmyCYk8NZqX45CL4h5Spw3Cre3PL+h97KLau8 4RAsolGaP/mtoVQEWg3E/ts74nI5ZsQwzDd81D2gZ/H/9JOLbTBL36wh2d3MxgD79y3J54 UibjzK78SAAihD9QSOfBnKQMZCgIAMgYzUVFhWJqyGcY74M8DlVWZ5pvC9iINP2R/lsQar fhDFjW7NZt24HevVh4jIOkR9jobCAHwh/FmP4ee79L9xn0RJQg6glJopb5h+/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993879; 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=6YE84UrRLvx21g4noGM4mZ7ouvk62HEyEalNKz8h9JQ=; b=n0JDSlS2lTGIIM4OnlUEE2K0mqz7g8myAPqC7ZSOIQ2oPlEEc3VQJY3ieato90OoeiYcpJ MlNliVZG9oQrQwivgqNH46ctfMNVtyrjWFaT0Qs4aI1pm5Yydf0Ze//jz2UZa4c5Ab05Zn nGrM1VdzEEUWnXfnEc8Rv6Z5iNV/XujndHBq8BD8Xi9V4MCMSrK+B5wbVMbpIrDFTiK2VW ZKRtkUj17nHf2A1nC9Bq/8Xclx/4PAgLZ22mIZA6zl181zJacuKCB4Uv0CKOj5HrA5C3gx oW97E5nVTArJst9GzVadjbRbFc6xnKG8mZsFtfqKmoTSHj6jAw7CcMXNMTBqzQ== 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 4j4bcl1gWGz189r for ; Wed, 14 Oct 2026 16:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:04:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 016433c79df6 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 016433c79df668c71bd47dc64a00e6499a9536ee Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:04:39 +0000 Message-Id: <6acfa817.30f0f.6805dc7b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=016433c79df668c71bd47dc64a00e6499a9536ee commit 016433c79df668c71bd47dc64a00e6499a9536ee Author: Mark Johnston AuthorDate: 2026-10-13 19:58:36 +0000 Commit: Mark Johnston CommitDate: 2026-10-13 20:20:45 +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 97d6264413e0..42612197ab59 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -28,6 +28,9 @@ */ #include + +#include + #include #include "pci_hda.h" @@ -81,7 +84,7 @@ struct hda_bdle { uint32_t addrh; uint32_t len; uint32_t ioc; -} __packed; +}; struct hda_bdle_desc { void *addr; @@ -624,8 +627,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); } @@ -636,11 +640,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); @@ -652,7 +659,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); }