From nobody Wed Sep 04 21:07:34 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 4WzZnf6tymz5VNvd; Wed, 04 Sep 2024 21:07:34 +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 4WzZnf5VY5z4Vlh; Wed, 4 Sep 2024 21:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725484054; 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=QCtgKR5H2k8U5AB6Pc1Z7lqQG7ZWRWNH/K4pKLcEz2c=; b=mcNL2BbC0LnAiHqyiyQhLdvsvBS2JmVHZXKAkjhDYbPvyKm3FZ3BpzSt3vMIeWkUnIkhbx FLr4WiVfplvblVK0jpwE2BLi+wVL4F5WuM54hXnvzca+KhrEUyKzQrS+QBeSSjnIPc7XYH W50l7i08eqBai4jyNpeip2e2LB2/JKIx0qfsFzEK+eilAOxslLWOCMEOGAjFedozO6wvBQ Nfqo5xHhP8+Sr+oIg0XmRXeuHWwtWejtk5tDvq4gKG6p3/ItBr8auBtDg31ZEsi1bfSn6T RUh2Z2aPpdLdBlbPpiQMlX/XXovsOXSFs0SWXpA/2nwRx6E22r3QGBkdvSkzWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725484054; a=rsa-sha256; cv=none; b=Kv80Qtzhh3fVs6xpGthsOQbnVZ52M2VoWm6yjL5MqLbnvt9Dc4eTgzAmUf9CR9oLoIR+Jh pSS4Y/o3zwZZ9Ws/PVHT3v29SowJZxNFcJ4h2LnEruThWrbT6NMVbvDtdr9eBdSWf4O9U3 Zs5/m1itLQ2pL+OvfXqUMRmGZ3I9G7n/Khs+u1jLsDmL+n6GyN9+kXkFKYdo87oNK/XRge OsB/X6dr7+kaWUGJjTEvENAMV3Tp13PGqTpcv3oT/Uw8q+dsTdM04+TIlqoV+GpQg2K/j8 Xo3zqbc2uMxr2qyWaUdc6+SX9uq9hlmmxV9ag7TiTKj18oox3RKTv/RRE9yoqw== 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=1725484054; 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=QCtgKR5H2k8U5AB6Pc1Z7lqQG7ZWRWNH/K4pKLcEz2c=; b=cicVbeY1gkgy1YvV11YuXXX4dfRbueui1dRjZYfp7c/cY+2VBqXQGwLTTD+cnn56t3kByi sRCKwEijlWTVuyiHvYywUKXSib/8XRrgfhgc6+e+sxlv4Pq1LA4Yyt/SX7ljC5WZMywbhG uT5Fo/W8fZXtbbhoaUOAAo1uNsTgIu2rfgSJCJUKNW6mJ1/ohxFR3AtcSN/TUfcSXOoyNG cLUMndiY7aLHBrQ71s0LiOMK7pk0uQzb5hGZwLXxkv0BmCTf5OBb91JW4USz0CGxRJKS0C pqIZkT78Y4rDvdeaCbGooBTxlBnz7Mff5eJP0jW1CrBR9BykzfkyA8fdMq75ug== 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 4WzZnf4rHHzgq0; Wed, 4 Sep 2024 21:07:34 +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 484L7Yqm053398; Wed, 4 Sep 2024 21:07:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484L7Yxb053395; Wed, 4 Sep 2024 21:07:34 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:07:34 GMT Message-Id: <202409042107.484L7Yxb053395@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: bb245c142075 - releng/14.1 - 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: bb245c1420753a68f9a17c1ee78ab84ddaf30b61 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bb245c1420753a68f9a17c1ee78ab84ddaf30b61 commit bb245c1420753a68f9a17c1ee78ab84ddaf30b61 Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:46:54 +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) Approved by: so --- 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 99c1d20b3378..791c56a45f0b 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -660,7 +660,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 & @@ -1202,7 +1202,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) +