From nobody Wed Sep 04 15:42:30 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 4WzRZZ662yz5V79v; Wed, 04 Sep 2024 15:42:30 +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 4WzRZZ5bXKz4R4Q; Wed, 4 Sep 2024 15:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725464550; 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=QhjcpMkJtMNGBUgHMca6Ri3V0LsihJ+HUJqvouh1ahg=; b=ayB89W+v4qpEMPrgwy+u75KIbBjppXWDPjuKcdA8LT83BwXtcxac79ek2OkglKJvoAXgd6 6QfK0zHJVT5tSE/Ia08Nf+UghIkr96FvS46PVD1pRvJJPANfE8F2L035kS0GaM31K0S8fR +FW1RLVGoIufWp54+mx7gb7cjsKMoR2cDFOLZxr6P5RCU6SplZxDpmFAYCTxQxkdoecC9o heHDLxME/EJYgXp5zEC9ESvtXSe/vDnQo7TUwwE5vPpCDYIGt6xPIRrwPIQkGIDpgcTQ0E AABxL+uzmxBmrArQfcO0vzPaIs1Byl9kpZWAaQvnIhyo9cxuonuRnJ/KIsmbEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725464550; a=rsa-sha256; cv=none; b=AZBt5JeElMlzBw/Sk/LhN7bSjB9O88AL7e0WCIu9paFDZ8+Ok08J+9xTeG/mkXf3bILd+0 KL5o7hHGJ3/Uf2o3b1FRazJpXkgAxRJgJEJggcF3LvTbSEUmAW8n5DccZQ2S52aNU48CX1 uKBoPwLz40yvtbll9aJOdJSJTEP5EQodYXDHpLbEsKYepvMczgYQa9PZRpt+OUD3fUYN78 gjxbtkSBp5nxkB5Z1+VdRYgdSN9Rho1sgftKbUzzlF8Qcxix/faoVTJJ3lyVL18Ma0O7rH i3gdV9P7eQ6QhtQ1YdZKwq0e8XHsS2E+s607QwGJ08kMnQmcId+ywODerdhUXA== 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=1725464550; 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=QhjcpMkJtMNGBUgHMca6Ri3V0LsihJ+HUJqvouh1ahg=; b=wtgvfbi2+1NfYzhPzdp+uYB7cqPsLyfXlhC17+Qw2J30DfNmOpct74sE8DEF9rM51dDHR8 tNu3/Cm+F+ykCUQurH1NIX2xF89ZeKZctDAEgtCiah6JPyZjWav0aiMoCvH2B1iOhY70tH pmveFRZEXveljXs8J0OjqKzRud2wQRaPyB22KmEm9LaV8Vz5BQYNvoGPlt81rGMGlIprxK 4Rqi1AB5f6m3bDHc48Sd7dBKpcuo4OlXFMORTATz/7EhspimJ9btPYdu02S5uT0djpSAGl 8KFkxKje9HbY3iQxny+9buViOPPnT//Fv5D5I46gxpK66UNfR1HTc0thbkytxA== 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 4WzRZZ5BqHzWMn; Wed, 4 Sep 2024 15:42:30 +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 484FgURV002514; Wed, 4 Sep 2024 15:42:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484FgUOO002511; Wed, 4 Sep 2024 15:42:30 GMT (envelope-from git) Date: Wed, 4 Sep 2024 15:42:30 GMT Message-Id: <202409041542.484FgUOO002511@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: 90af1336ed5e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 90af1336ed5e3c8556147325c4841c68639c4b63 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90af1336ed5e3c8556147325c4841c68639c4b63 commit 90af1336ed5e3c8556147325c4841c68639c4b63 Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 14:59:35 +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) --- 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) +