From nobody Wed Sep 4 19:58:26 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 4WzYFt408rz5VHMd; Wed, 04 Sep 2024 19:58:26 +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 4WzYFt3BpJz49Wb; Wed, 4 Sep 2024 19:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725479906; 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=Uzx4tLJk+Z58gx1+3HeblBYSzRjrUgtqfabIh2viwHY=; b=MtPrUjQxQb0Or0v+/NC0HBz9lz8blNQncth8hHWZehBZmtRQRlyTIZYbcL0OKZiDFUtB9J vuM7p5QBsFEzLgFXgkNxjoSv39jhxs72JTeJsav8oaImT6JOiOtdIf+picLTLRCSJYAivX VblqOp07R1Ro/wzdkhhkFSO9wZkyuLmk8G5R/gijoK9N1Iqu/cYA++pATW4ckOK7g8UxmH TQ3uMB18WMpUNW3JQbHhSwhIHQfVDNCXaGPLFDPNUtRmFchdjFun2/W/JWbFYhuhKLkz0U OIxN23SbJVOx+qUbTiKvty+a3vbYaj/Xb85YaMeGPAZdHm0j+nwVLfSLZnW8jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479906; a=rsa-sha256; cv=none; b=Ra8ovySopXRF7vSWeiXEZkdzGQGG4DZ5aptFVoXjGiSyIzk6nhPxsoNnyYpaanG+V4gSdd 6UL18msmp0pQJUBHwJ++qOv3guRkFhYdoUBABv/z2CkbpRnCwxlauG8CRItHNrYn1k2Hol FQqoN7G0ZmIriPH38CGEAhGlMS0TKL1xloY/bEFPZ1TBN1NrYl/0XRM8SIcRTj8X7xG423 vn6ZBlSZtwCoW7bTZ3xVU99Axa0T7KQrns8aGOh8O6Ihf0RoAFIUkIdkBGzeJDD0LquAH6 wBPYDyX77tykfl69lYwbWOmUdpzzMTiNI3kwcxp3C98Lqfcv//LLEYBrHHSjSw== 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=1725479906; 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=Uzx4tLJk+Z58gx1+3HeblBYSzRjrUgtqfabIh2viwHY=; b=ntvevI0tuuOSOoHY4kYt/XgJLLix79YFM96cTptvK+3jK02ofx1Wfnyb1outkhyUQZ/c/S QaFMToqhBTycAb6QkZjBcQ7aMC1cRSJm8uGwjurEMADxETRq02IHHIjoIwwzSeri/6HALK yRGhIkIvYJKkKMUOsP1OhjKyahghlZWRhV7CCqVhokaDgqLv29DtoZUdw07H071QrX3ase 4bTys6YEJ6ewmLlK/WrFC602U8aFWKcWHSRxRl7Mjo2keDuEvqqfOX8QfsJcJeUTLuzbYb nqTCUnmJXm4HA9VtySRTlzHQOBWUTpmzBiitqPPdlx76G9/9zU40DLMmB+Xl6g== 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 4WzYFt2hLkzf2v; Wed, 4 Sep 2024 19:58:26 +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 484JwQuS030094; Wed, 4 Sep 2024 19:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484JwQHv030091; Wed, 4 Sep 2024 19:58:26 GMT (envelope-from git) Date: Wed, 4 Sep 2024 19:58:26 GMT Message-Id: <202409041958.484JwQHv030091@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: b3f0e555781c - releng/13.4 - 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/13.4 X-Git-Reftype: branch X-Git-Commit: b3f0e555781cd9bc94ba4194a5bd82b6d347e3ec Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b3f0e555781cd9bc94ba4194a5bd82b6d347e3ec commit b3f0e555781cd9bc94ba4194a5bd82b6d347e3ec Author: Pierre Pronchery AuthorDate: 2024-09-04 14:38:11 +0000 Commit: Ed Maste CommitDate: 2024-09-04 19:14: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) (cherry picked from commit 90af1336ed5e3c8556147325c4841c68639c4b63) (cherry picked from commit 5920b7e6eea1e1c46b78656ef75944fc0709e887) Approved by: so Approved by: re (cperciva) --- 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) +