49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
--- usr.sbin/bhyve/pci_xhci.c.orig
|
|
+++ usr.sbin/bhyve/pci_xhci.c
|
|
@@ -1900,6 +1900,11 @@
|
|
return;
|
|
}
|
|
|
|
+ if (epid == 0 || epid >= XHCI_MAX_ENDPOINTS) {
|
|
+ DPRINTF(("pci_xhci: invalid endpoint %u\r\n", epid));
|
|
+ return;
|
|
+ }
|
|
+
|
|
dev = XHCI_SLOTDEV_PTR(sc, slot);
|
|
devep = &dev->eps[epid];
|
|
dev_ctx = pci_xhci_get_dev_ctx(sc, slot);
|
|
@@ -1925,6 +1930,23 @@
|
|
|
|
/* get next trb work item */
|
|
if (XHCI_EPCTX_0_MAXP_STREAMS_GET(ep_ctx->dwEpCtx0) != 0) {
|
|
+ struct xhci_stream_ctx *sctx;
|
|
+
|
|
+ /*
|
|
+ * Stream IDs of 0, 65535 (any stream), and 65534
|
|
+ * (prime) are invalid.
|
|
+ */
|
|
+ if (streamid == 0 || streamid == 65534 || streamid == 65535) {
|
|
+ DPRINTF(("pci_xhci: invalid stream %u\r\n", streamid));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ sctx = NULL;
|
|
+ pci_xhci_find_stream(sc, ep_ctx, streamid, &sctx);
|
|
+ if (sctx == NULL) {
|
|
+ DPRINTF(("pci_xhci: invalid stream %u\r\n", streamid));
|
|
+ return;
|
|
+ }
|
|
sctx_tr = &devep->ep_sctx_trbs[streamid];
|
|
ringaddr = sctx_tr->ringaddr;
|
|
ccs = sctx_tr->ccs;
|
|
@@ -1933,6 +1955,10 @@
|
|
streamid, ep_ctx->qwEpCtx2 & XHCI_TRB_3_CYCLE_BIT,
|
|
trb->dwTrb3 & XHCI_TRB_3_CYCLE_BIT));
|
|
} else {
|
|
+ if (streamid != 0) {
|
|
+ DPRINTF(("pci_xhci: invalid stream %u\r\n", streamid));
|
|
+ return;
|
|
+ }
|
|
ringaddr = devep->ep_ringaddr;
|
|
ccs = devep->ep_ccs;
|
|
trb = devep->ep_tr;
|