From nobody Wed Oct 14 16:02:59 2026 X-Original-To: dev-commits-src-branches@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 4j4bZr4N9yz6vlxl for ; Wed, 14 Oct 2026 16:03:00 +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 4j4bZq6zxtz4Y1k for ; Wed, 14 Oct 2026 16:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993780; 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=JF7JEtJW7pyyPA7N0SwgamKTX+UAAeCa74DrP42/9MM=; b=xkIpGLucZSW+eZeF34FSD0C0gyj8dUg8YDEpcNMHBACGNuYdP5CwbknJL1PK7iJbcRFwxT seT9EoH67MfxNdZq+kXs9YSnp0HaJYX4KqjXKXJ1li9nKD6QC6Se9rv28whUP2L445pO1U aIq10SLvKsUtOAscE8Q3HJyLsFmGBdXbb5MlPOf/g0Nd2MDes++eAdkKD+6FK9zhLUIViM /bc2O7TDmJj4s4Y+MG0hspeo58wbh+woszR5Ys5xKaCjPxcpd/lsdmNeU2C1H53zUzirGL nFMsRHIzKS2eBePL4QYM3q9vigwQADyG90DWKPXYL4f+qdAVfqgOAYtQFNs+EQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993780; b=A162HPLpkLyh67FBBPn9yWdpECDkXtCI7z6k8xIDqcZ/oz0Mq8l7RZ/XptN7vhoc0Do10/ kEumXZi1u/xw6FvqZLnwRlLcgsR3dnv48/JiVow129LSE+meEGz3ZEcsuS66v6+q7LO8bo HZZmJCm7GAcwbObFHqDrUdEr98jjqu68Ywt+aJNGHUFkuUsj4O4S7uy4T+HSqy7z+0LLUh xkYIfG8iFw8R2ph1LSiDcLLvQy1gA1Fq6XJL9i5lK+GgWMSz0englKRcSURSHpTRbW5hrs 3OBVbi7dJITncFl0L3Xup3VY1uBUSv3JS3RSX+ms2oQho6fGV51aEsBBG5muRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993780; 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=JF7JEtJW7pyyPA7N0SwgamKTX+UAAeCa74DrP42/9MM=; b=VNAUAOhgNy9cGOFKCky+JCt0pu6U7hRjGhFQepGbO4o24CCVPOR05Ihv8voTeeHI3pimKf pEDVqYRMXYUc0eeVxCIWOkzwjl2YmITM19hUgb1UWBAOltwLM8NZEedISO0vh8/vHjFvej gF4VSWXWWBpfhDJNhqrLkG7yeQ1G3vRd+LjWmSzxhipWUmQx8tQbxiyowhxVApEQXSRWKs qmvRBatJZCQrWgiuSdFOiFV/CdYCKKKCkCIp1csSv8YtI0etizRGadXDoDqHmOLrOUOzR4 YpJxBHT82h9sO+rIPYdTXzKsJ9h/UY4vKbtcI4wTXvFFxQTYavSsMDYcw+Luzw== 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 4j4bZq4gQ0z187J for ; Wed, 14 Oct 2026 16:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 270c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:02:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6f22ca12fa0e - stable/15 - bhyve: Improve HDA stream descriptor validation List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6f22ca12fa0e806e814e3538805848f404789c5e Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:02:59 +0000 Message-Id: <6acfa7b3.270c8.4f5a8f5@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6f22ca12fa0e806e814e3538805848f404789c5e commit 6f22ca12fa0e806e814e3538805848f404789c5e 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 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); }