Changeset 100517 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Jul 11, 2023 2:54:11 PM (17 months ago)

Author:

vboxsync

Message:

VUSB: Explicitly ignore any high bits of a USB address which is a 7-bit quantity (see bugref:10433).

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (2 diffs)
• VUSBInternal.h (modified) (1 diff)

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

@@ -513 +513 @@
         LogFlow(("vusbDevStdReqSetAddress: error: %s: invalid device state %d !!!\n", pDev->pUsbIns->pszName, enmState));
         return false;
+    }
+
+    /*
+     * If wValue has any bits set beyond 0-6, throw them away.
+     */
+    if ((pSetup->wValue & VUSB_ADDRESS_MASK) != pSetup->wValue) {
+        LogRelMax(10, ("VUSB: %s: Warning: Ignoring high bits of requested address (wLength=0x%X), using only lower 7 bits.\n",
+                       pDev->pUsbIns->pszName, pSetup->wValue));
+
+        pSetup->wValue &= VUSB_ADDRESS_MASK;
     }
 
@@ -1030 +1040 @@
     }
 
+    /* Paranoia. */
+    Assert((u8Address & VUSB_ADDRESS_MASK) == u8Address);
+    u8Address &= VUSB_ADDRESS_MASK;
+
     /*
      * Ok, get on with it.

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -78 +78 @@
 #define VUSB_DEFAULT_ADDRESS        0
 #define VUSB_INVALID_ADDRESS        UINT8_C(0xff)
+#define VUSB_ADDRESS_MASK           UINT8_C(0x7f)
 /** @} */