From nobody Wed Sep 04 15:45:38 2024 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 4WzRfB3rKJz5V7KR; Wed, 04 Sep 2024 15:45:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzRfB3HVNz4Skq; Wed, 4 Sep 2024 15:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725464738; 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=9ugbHlU9xFuCTVLuOPK2N/tPsnqta10PKsAq/BlWbzc=; b=q/ZpDF9kBMyTXaEuG/sCoq4DWB+fVYWMf0ZssFj/jztF5GGX5NxMK1Auo2mq/iui2/RW5l WDXSqsy6DPGZa/JHnFgp+li25D2IDtFllm5qHX/yv+zwxPNA4jnd8jHR3VBrOx3AI8UEtt 3x9UTm+7e4kV929XmnDj82GF220wFOaVNPsSPIM42qdAT7HzLTWeCJd/s2N6lSEI34UBBs 7ygCov0E25Umanjcbj4X685dKfXKJ1TYI46M2W+8TRA56zXf4YI6YiQhxCj0LAPN2vonVW 9Gcguxa33CnR+6pV9YM+Is+kVOYBbybKnGJb2TjZ+PSOvRWpdKAzulntEIy6Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725464738; a=rsa-sha256; cv=none; b=b1ua4QaaCfDk/bIDlnaspKWOQNa91g9hi37QufOoNmjBCCi1QhPW4icrQueMDKfs4tlMQD xFZUT3JI17KPzu3Vky5RuiXSO6xKhcexjfBnDVlyAhF7lxKjOR8Q9VP6sC1fUf8otw1gTP 9RsA6SNS6IJ1pDbud6FyK0vyb6+xbl+YSvreUpL2qqox1TVTvAYuxaouxz86UpyP8Rqpex rkg2KfmuaYPNE0lvE7K0/4VrfULXu4xFot2JvsP7QqYzyvWlWJM9wWiev03HWL4XyuElbp o1w7FPBoSsTQbrzuqwwj7x/Gmjwql+8Tg0KcdLoiXd07GB7NfjXCOhJm1NwK7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725464738; 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=9ugbHlU9xFuCTVLuOPK2N/tPsnqta10PKsAq/BlWbzc=; b=H6BzrWzLcEWHEfKnDSX7P0EnRvTwfkKllLBowmTVqe1GomGfuuKm2SPn8Vty6GwYhISp/D H0js3OiuKCprL8pW8viAEr1yVdZbThJzfwy6zv5ckrffdeotVxqIoN+SSnrqWIEXj3iaEM 7gmt+O2Ut3kE/ZZf/NVFU+U4iB7cy41Vv+wVHn3CBPB2ZXk5ifSYBiCwV4e6SnDXjMn5PG 83xdYLtqkwWv+GETsh/+H2RmzG5oXp9gq6gjEZMaofCaY9DVRyfLwNL/aSOt4gqGzc1GGQ kFSFbYQR8zcG8nY2KKOIDUr7cTIuOohpFE5nR/PJRUqdGtGay6iZprtH4c1kZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WzRfB2n5ZzW92; Wed, 4 Sep 2024 15:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484FjcS2003099; Wed, 4 Sep 2024 15:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484FjcQJ003096; Wed, 4 Sep 2024 15:45:38 GMT (envelope-from git) Date: Wed, 4 Sep 2024 15:45:38 GMT Message-Id: <202409041545.484FjcQJ003096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5920b7e6eea1 - stable/13 - bhyve: fix off by one error in pci_xhci 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5920b7e6eea1e1c46b78656ef75944fc0709e887 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5920b7e6eea1e1c46b78656ef75944fc0709e887 commit 5920b7e6eea1e1c46b78656ef75944fc0709e887 Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 15:44:59 +0000 bhyve: fix off by one error in pci_xhci The function pci_xhci_find_stream validates that the streamid is valid but the bound check accepts up to ep_MaxPStreams included. The bug results in an out-of-bounds write on the heap with controlled data. Reported by: Synacktiv Reviewed by: jhb Security: FreeBSD-SA-24:12.bhyve Security: CVE-2024-32668 Security: HYP-04 Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45994 (cherry picked from commit 5c9308a4130858598c76f3ae6e3e3dfb41ccfe68) (cherry picked from commit 90af1336ed5e3c8556147325c4841c68639c4b63) --- usr.sbin/bhyve/pci_xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 58f2d53eb9b5..93161affd732 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -659,7 +659,7 @@ pci_xhci_init_ep(struct pci_xhci_dev_emu *dev, int epid) devep = &dev->eps[epid]; pstreams = XHCI_EPCTX_0_MAXP_STREAMS_GET(ep_ctx->dwEpCtx0); if (pstreams > 0) { - DPRINTF(("init_ep %d with pstreams %d", epid, pstreams)); + DPRINTF(("init_ep %d with pstreams %u", epid, pstreams)); assert(devep->ep_sctx_trbs == NULL); devep->ep_sctx = XHCI_GADDR(dev->xsc, ep_ctx->qwEpCtx2 & @@ -1201,7 +1201,7 @@ pci_xhci_find_stream(struct pci_xhci_softc *sc, struct xhci_endp_ctx *ep, } /* only support primary stream */ - if (streamid > devep->ep_MaxPStreams) + if (streamid >= devep->ep_MaxPStreams) return (XHCI_TRB_ERROR_STREAM_TYPE); sctx = (struct xhci_stream_ctx *)XHCI_GADDR(sc, ep->qwEpCtx2 & ~0xFUL) +