From nobody Thu Nov 03 12:53:26 2022 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 4N33bB58t4z4gwxv; Thu, 3 Nov 2022 12:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N33bB4YPrz3WCS; Thu, 3 Nov 2022 12:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667480006; 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=IcSFKk3DOcdT4AsB8P6R27vKfw0jp5esxONE3+sG2Vc=; b=Atc+yt2XwUVB3admq1kSU/uD+3wWNqW+vRmpz2nMiZ037fCCWV5o3LQ5ELwE1AivM69M21 drOM5f5S1Mg6YVjEsAQkt/yPY0WIelxsMNK6wg33XcesSSXZM6UxQrSdSkwqio+nr5KZrc Y5amjd1Ar0Cy4sPwFwyCw2c0rsFOK0/tq5uqCHmXu7sjQ2M6UIBSsMe/pHBVrSKPbvs6vY YOZq+2tEL0B1i6DXi4LSlq0I8td42IR9OErTlk46FeGCKcgrWBPcCgEQQrkzNmF30J7rwX 9X8/kkm8gwaZjLhhLndtsQrf8XIKXYImcnQLk7PkTrqL5eq1G511tTXBBdl9aA== 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 4N33bB3fDJzcZP; Thu, 3 Nov 2022 12:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A3CrQFI046989; Thu, 3 Nov 2022 12:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3CrQKv046988; Thu, 3 Nov 2022 12:53:26 GMT (envelope-from git) Date: Thu, 3 Nov 2022 12:53:26 GMT Message-Id: <202211031253.2A3CrQKv046988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b1bc16002edd - stable/13 - bhyve: Fix an apparent pointer arithmetic bug in the xhci emulation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: b1bc16002edd4918135f3bb03230791ddaf1cf2c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667480006; 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=IcSFKk3DOcdT4AsB8P6R27vKfw0jp5esxONE3+sG2Vc=; b=aj+HjDjT73i6961B9bbSCmqVBzWfEloiX5XTxfg94vSKooTbrQL3XeC2uKgCcDzdAGJ3Cp dxozq0vaGiAOajrnzLgs/OuCFQCtjDO/jKrFq0A0tvHeIXo7RqZC0rIiL2fygnXZNdkQB9 pKeUzdUlJvcUX2FMlInFVF/OJaB+XTD+zEtrQO50r12sS/zSj5ZpBHyQoZUitw2m1AaBuv NUUr2oWoeqIi38GXQ7YXcSrDyIrNQQnRX58D5/qFlwfMk6kif0osQEq8OczXvpwEVxgKdb Xb2/LDeNavb5ggUgMrZ03K5rBi/RzgZFCELIkzCGedZrFme96OYe8J86ybI2Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667480006; a=rsa-sha256; cv=none; b=YlPhYtb7e8VHDntizQIITwr+yAFBQnQFODFEJrGKyHgAQpLbiXqiDgXsC3XkTWJ4NMjhv4 V1oE1vtreGMAnCspwImktA4Oi1qr9BmJGirtJCTsSiEuLplAClbLnXfEk2XGEuZu8ff5ec ILGbU3hki3eQa/UX1bNzyoXjNtJCaWPv0tgf1f1Go9An+1AcbhRCkg+U1IMK8JcmstUDgw AvpQzOB+2YS7cc0mrS+tHwbqDRUpAUKLyJx8kLZ39tDlhHUuJH7VeHCTu0hByGKzAuqa/9 +8y/qfKunC4eL7zrJPFot1A9DVKPNopdVZlmRjRGlFIK9JcaAr2xM8pItcfSsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bc16002edd4918135f3bb03230791ddaf1cf2c commit b1bc16002edd4918135f3bb03230791ddaf1cf2c Author: Mark Johnston AuthorDate: 2022-10-27 14:46:53 +0000 Commit: Mark Johnston CommitDate: 2022-11-03 12:51:10 +0000 bhyve: Fix an apparent pointer arithmetic bug in the xhci emulation Also remove the out-parameter of pci_xhci_find_stream(), since it's unused by all callers. Reviewed by: jhb (cherry picked from commit a309ad7bd1230353da3d7c98afd850c1e9427944) --- usr.sbin/bhyve/pci_xhci.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 7548685fe41d..4bd0715d14ce 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -1184,8 +1184,7 @@ done: static uint32_t pci_xhci_find_stream(struct pci_xhci_softc *sc, struct xhci_endp_ctx *ep, - struct pci_xhci_dev_ep *devep, uint32_t streamid, - struct xhci_stream_ctx **osctx) + struct pci_xhci_dev_ep *devep, uint32_t streamid) { struct xhci_stream_ctx *sctx; @@ -1204,12 +1203,11 @@ pci_xhci_find_stream(struct pci_xhci_softc *sc, struct xhci_endp_ctx *ep, if (streamid > devep->ep_MaxPStreams) return (XHCI_TRB_ERROR_STREAM_TYPE); - sctx = XHCI_GADDR(sc, ep->qwEpCtx2 & ~0xFUL) + streamid; + sctx = (struct xhci_stream_ctx *)XHCI_GADDR(sc, ep->qwEpCtx2 & ~0xFUL) + + streamid; if (!XHCI_SCTX_0_SCT_GET(sctx->qwSctx0)) return (XHCI_TRB_ERROR_STREAM_TYPE); - *osctx = sctx; - return (XHCI_TRB_ERROR_SUCCESS); } @@ -1264,12 +1262,8 @@ pci_xhci_cmd_set_tr(struct pci_xhci_softc *sc, uint32_t slot, streamid = XHCI_TRB_2_STREAM_GET(trb->dwTrb2); if (devep->ep_MaxPStreams > 0) { - struct xhci_stream_ctx *sctx; - - sctx = NULL; - cmderr = pci_xhci_find_stream(sc, ep_ctx, devep, streamid, - &sctx); - if (sctx != NULL) { + cmderr = pci_xhci_find_stream(sc, ep_ctx, devep, streamid); + if (cmderr == XHCI_TRB_ERROR_SUCCESS) { assert(devep->ep_sctx != NULL); devep->ep_sctx[streamid].qwSctx0 = trb->qwTrb0; @@ -1911,6 +1905,7 @@ pci_xhci_device_doorbell(struct pci_xhci_softc *sc, uint32_t slot, struct xhci_trb *trb; uint64_t ringaddr; uint32_t ccs; + int error; DPRINTF(("pci_xhci doorbell slot %u epid %u stream %u", slot, epid, streamid)); @@ -1950,8 +1945,6 @@ pci_xhci_device_doorbell(struct pci_xhci_softc *sc, uint32_t slot, /* get next trb work item */ if (devep->ep_MaxPStreams != 0) { - struct xhci_stream_ctx *sctx; - /* * Stream IDs of 0, 65535 (any stream), and 65534 * (prime) are invalid. @@ -1961,10 +1954,10 @@ pci_xhci_device_doorbell(struct pci_xhci_softc *sc, uint32_t slot, return; } - sctx = NULL; - pci_xhci_find_stream(sc, ep_ctx, devep, streamid, &sctx); - if (sctx == NULL) { - DPRINTF(("pci_xhci: invalid stream %u", streamid)); + error = pci_xhci_find_stream(sc, ep_ctx, devep, streamid); + if (error != XHCI_TRB_ERROR_SUCCESS) { + DPRINTF(("pci_xhci: invalid stream %u: %d", + streamid, error)); return; } sctx_tr = &devep->ep_sctx_trbs[streamid];