git: a309ad7bd123 - main - bhyve: Fix an apparent pointer arithmetic bug in the xhci emulation

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a309ad7bd1230353da3d7c98afd850c1e9427944

commit a309ad7bd1230353da3d7c98afd850c1e9427944
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2022-10-27 14:46:53 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2022-10-27 14:48:55 +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.
    
    MFC after:      1 week
    Reviewed by:    jhb
    Differential Revision:  https://reviews.freebsd.org/D37118
---
 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 5f12762dfeb1..8eff332099df 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -1183,8 +1183,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;
 
@@ -1203,12 +1202,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);
 }
 
@@ -1263,12 +1261,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;
@@ -1910,6 +1904,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));
@@ -1949,8 +1944,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.
@@ -1960,10 +1953,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];