git: b1bc16002edd - stable/13 - bhyve: Fix an apparent pointer arithmetic bug in the xhci emulation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Nov 2022 12:53:26 UTC
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bc16002edd4918135f3bb03230791ddaf1cf2c commit b1bc16002edd4918135f3bb03230791ddaf1cf2c Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2022-10-27 14:46:53 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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];