Changeset 78549 in vbox for trunk/src

Timestamp:

May 16, 2019 2:38:19 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130596

Message:

OHCI: Interpret the OHCI spec a bit more literally when processing a general TD (see bugref:9429).

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (15 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -2095 +2095 @@
  * Sets up a OHCI transport buffer.
  *
- * @returns Flags whether the buffer could be initialised successfully.
- * @param   pThis   The OHCI instance.
- * @param   pBuf    Ohci buffer.
+ * @param   pBuf    OHCI buffer.
  * @param   cbp     Current buffer pointer. 32-bit physical address.
  * @param   be      Last byte in buffer (BufferEnd). 32-bit physical address.
  */
-static bool ohciR3BufInit(POHCI pThis, POHCIBUF pBuf, uint32_t cbp, uint32_t be)
-{
-    if (RT_UNLIKELY(be < cbp))
-    {
-        LogRelMax(10, ("OHCI#%d: cbp=%#010x be=%#010x\n", pThis->pDevInsR3->iInstance, cbp, be));
-        return false;
-    }
-
+static void ohciR3BufInit(POHCIBUF pBuf, uint32_t cbp, uint32_t be)
+{
     if (!cbp || !be)
     {
@@ -2115 +2107 @@
         Log2(("ohci: cbp=%#010x be=%#010x cbTotal=0 EMPTY\n", cbp, be));
     }
-    else if ((cbp & ~0xfff) == (be & ~0xfff))
+    else if ((cbp & ~0xfff) == (be & ~0xfff) && (cbp <= be))
     {
         pBuf->aVecs[0].Addr = cbp;
@@ -2133 +2125 @@
         Log2(("ohci: cbp=%#010x be=%#010x cbTotal=%u PAGE FLIP\n", cbp, be, pBuf->cbTotal));
     }
-
-    return true;
 }
 
@@ -2684 +2674 @@
          */
         OHCIBUF Buf;
-        if (!ohciR3BufInit(pThis, &Buf, pTd->cbp, pTd->be))
-        {
-            ohciR3RaiseUnrecoverableError(pThis, 1);
-            return;
-        }
+        ohciR3BufInit(&Buf, pTd->cbp, pTd->be);
         uint32_t NewCbp;
         if (cbLeft >= Buf.cbTotal)
@@ -2717 +2703 @@
                     && Buf.aVecs[1].cb > (cbLeft - Buf.aVecs[0].cb)))
             {
-                ohciR3RaiseUnrecoverableError(pThis, 2);
+                ohciR3RaiseUnrecoverableError(pThis, 1);
                 return;
             }
@@ -2979 +2965 @@
     ohciR3ReadTd(pThis, TdAddr, &Td);
     OHCIBUF Buf;
-    if (!ohciR3BufInit(pThis, &Buf, Td.cbp, Td.be))
-    {
-        ohciR3RaiseUnrecoverableError(pThis, 3);
-        return false;
-    }
+    ohciR3BufInit(&Buf, Td.cbp, Td.be);
 
     *pNextTdAddr = Td.NextTD & ED_PTR_MASK;
@@ -3003 +2985 @@
                 default:
                     Log(("ohciR3ServiceTd: Invalid direction!!!! Td.hwinfo=%#x Ed.hwdinfo=%#x\n", Td.hwinfo, pEd->hwinfo));
-                    ohciR3RaiseUnrecoverableError(pThis, 4);
+                    ohciR3RaiseUnrecoverableError(pThis, 2);
                     return false;
             }
@@ -3041 +3023 @@
                 && Buf.aVecs[1].cb > (pUrb->cbData - Buf.aVecs[0].cb)))
         {
-            ohciR3RaiseUnrecoverableError(pThis, 5);
+            ohciR3RaiseUnrecoverableError(pThis, 3);
             VUSBIRhFreeUrb(pThis->RootHub.pIRhConn, pUrb);
             return false;
@@ -3120 +3102 @@
     /* read the head */
     ohciR3ReadTd(pThis, TdAddr, &Head.Td);
-    if (!ohciR3BufInit(pThis, &Head.Buf, Head.Td.cbp, Head.Td.be))
-    {
-        ohciR3RaiseUnrecoverableError(pThis, 6);
-        return false;
-    }
+    ohciR3BufInit(&Head.Buf, Head.Td.cbp, Head.Td.be);
     Head.TdAddr = TdAddr;
     Head.pNext = NULL;
@@ -3142 +3120 @@
         pCur->TdAddr = pTail->Td.NextTD & ED_PTR_MASK;
         ohciR3ReadTd(pThis, pCur->TdAddr, &pCur->Td);
-        if (!ohciR3BufInit(pThis, &pCur->Buf, pCur->Td.cbp, pCur->Td.be))
-        {
-            ohciR3RaiseUnrecoverableError(pThis, 7);
-            return false;
-        }
+        ohciR3BufInit(&pCur->Buf, pCur->Td.cbp, pCur->Td.be);
 
         /* Don't combine if the direction doesn't match up. There can't actually be
@@ -3180 +3154 @@
                 default:
                     Log(("ohciR3ServiceTdMultiple: Invalid direction!!!! Head.Td.hwinfo=%#x Ed.hwdinfo=%#x\n", Head.Td.hwinfo, pEd->hwinfo));
-                    ohciR3RaiseUnrecoverableError(pThis, 8);
+                    ohciR3RaiseUnrecoverableError(pThis, 4);
                     return false;
             }
@@ -3359 +3333 @@
         default:
             Log(("ohciR3ServiceIsochronousTd: Invalid direction!!!! Ed.hwdinfo=%#x\n", pEd->hwinfo));
-            ohciR3RaiseUnrecoverableError(pThis, 9);
+            ohciR3RaiseUnrecoverableError(pThis, 5);
             return false;
     }
@@ -3392 +3366 @@
         {
             Log(("ITdAddr=%RX32 PSW%d.offset=%#x < offPrev=%#x!\n", ITdAddr, iR, off, offPrev)); /* => Unrecoverable Error*/
-            ohciR3RaiseUnrecoverableError(pThis, 10);
+            ohciR3RaiseUnrecoverableError(pThis, 6);
             return false;
         }
@@ -3398 +3372 @@
         {
             Log(("ITdAddr=%RX32 PSW%d.CC=%#x < 'Not Accessed'!\n", ITdAddr, iR, PSW >> ITD_PSW_CC_SHIFT)); /* => Unrecoverable Error*/
-            ohciR3RaiseUnrecoverableError(pThis, 11);
+            ohciR3RaiseUnrecoverableError(pThis, 7);
             return false;
         }
@@ -3411 +3385 @@
     {
         Log(("ITdAddr=%RX32 offEnd=%#x < offPrev=%#x!\n", ITdAddr, offEnd, offPrev)); /* => Unrecoverable Error*/
-        ohciR3RaiseUnrecoverableError(pThis, 12);
+        ohciR3RaiseUnrecoverableError(pThis, 8);
         return false;
     }