From nobody Wed Oct 14 16:02:21 2026 X-Original-To: dev-commits-src-main@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 4j4bZ56khzz6vltw for ; Wed, 14 Oct 2026 16:02:21 +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 4j4bZ51xb0z4WQV for ; Wed, 14 Oct 2026 16:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993741; 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=ppVznOXxt/xzliiQcmN1l7Ly7V5kFUqbteDLBJU+y9M=; b=ksx+3SUDC5mokKyY/e2Jj7jHNj84ZBQDfdZeRA2Pu/asRgixldOTSvr+NM8b6nJgRrjMEx xnP58r5G163X/gHMvbRJo4/7LN004T7JKiVRbe1gQ33uu4uauAsnB3Oa3MdbE182xrpJ/A 5pLOf4y1SwhHiBy6cS2AjIWmr2vxKjjEJY/HmIUplGAp65N3X62mf2DKLV+clQUS7Fixl/ mRmDnDScfUhmXBfM3PE2+D7ALdKre8rlES5KyaXSlVRvge6NsU+Qw5Hr9FKPD6eCmeClFB 7La6jzfDej2RMF4LO+xXvAORJOpfnR6PSkoS0x5wS4iBBllntNyDEaeNyreWyQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993741; b=oWUcWDyKXutyS19dMwa/wwbDmw+qWnkkyqKDf87vJgvSgZBAuP6ZwhbYu3slNmSR15n8lG VJCwj97mwtJToGtueguc6aqqVUJ/QuUd3X/Wl6aMGCCF+dx1waKVMkIWIgfHTP5yUTwPx1 fZ0HbOvTQZimH5FiZE4YvG1nOvbq1fBlppB5wlxM+wVcabULe5m4F1qOBQsaLOLqBhPSLU Uq7cqKvQ4k+8bzV+2FlzNWcFwEqWF0psUHtpHEna2I5ForCAMgwZvTrG7gw+cioodwveUJ uKotMeZg2u/8yQTxXVcR/bdHgvQROfsaFrRoyIW4x+eFo7d9ryWwIfarocYrIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993741; 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=ppVznOXxt/xzliiQcmN1l7Ly7V5kFUqbteDLBJU+y9M=; b=aGAmUnC1ZFZYTZRQ3738OPTtXtS6oFBroYAnb36e/U6AZSiveKf6X8Ex/e1yVTj59O1bR8 4Wc3LoGr+KFtEKqHFeXz7/3/7xWKOsbOAkUvJ7JLC9MLl932p+NNB4enuH+M//JHHA+Z3S alAbL1c5bEDqL1hcJbp+gpwHAQQowuX7cz0wA1IAuFL95WiJDLWuYubGtORKmYOBJoPt0M rQpFvIsHdodg3DJLPbwOsvWz9dbfjp+2V48N5kn5f2Hvs5S3sDGW6lTvCJUitGRpx40A3W g4zq3hTgSeRV+AK7zTLnht9WFUWZUazfr+Pla1PUX2f6k+wZtZLuZp2ucWnbBg== 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 4j4bZ50t0mz1898 for ; Wed, 14 Oct 2026 16:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27a2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:02:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 81b9fcfa0bbc - main - bhyve: Improve HDA stream descriptor validation List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: 81b9fcfa0bbca2f9931a9b9a5e6fde0972f08cfa Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:02:21 +0000 Message-Id: <6acfa78d.27a2a.7ea3baf4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=81b9fcfa0bbca2f9931a9b9a5e6fde0972f08cfa commit 81b9fcfa0bbca2f9931a9b9a5e6fde0972f08cfa Author: Mark Johnston AuthorDate: 2026-10-13 19:58:36 +0000 Commit: Mark Johnston CommitDate: 2026-10-14 16:00:47 +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 Reviewed by: christos Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60678 --- usr.sbin/bhyve/pci_hda.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c index 92e347f641d9..5fd6d6f557d4 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; @@ -630,8 +633,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); } @@ -642,14 +646,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; - if ((bdle_sz % HDA_DMA_ACCESS_LEN) != 0) { + 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); @@ -661,7 +665,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); }