Changeset 96719 in vbox for trunk

Timestamp:

Sep 13, 2022 12:35:45 PM (2 years ago)

Author:

vboxsync

Message:

USBProxyDevice-linux.cpp: Put struct usbdevfs_urb KUrb in a union with padding for the necessary length to make it work better with Linux 6.0 flexible array changes. bugref:10279

File:

• trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

@@ -101 +101 @@
 # pragma GCC diagnostic ignored "-Wpedantic"
 #endif
-    struct usbdevfs_urb             KUrb;
+    union
+    {
+        struct usbdevfs_urb         KUrb;
+        /** Make sure we've got sufficient space for isochronous packets. */
+        uint8_t                     abKUrbPadding[  RT_UOFFSETOF(struct usbdevfs_urb, iso_frame_desc)
+                                                  + sizeof(struct usbdevfs_iso_packet_desc) * 8];
+    };
 #if RT_GNUC_PREREQ(6, 0)
 # pragma GCC diagnostic pop
 #endif
-    /** Space filler for the isochronous packets. */
-    struct usbdevfs_iso_packet_desc aIsocPktsDonUseTheseUseTheOnesInKUrb[8];
     /** Node to link the URB in of the existing lists. */
     RTLISTNODE                      NodeList;
@@ -1574 +1578 @@
             if (pUrb->enmType == VUSBXFERTYPE_ISOC)
             {
+                AssertCompile(   sizeof(pUrbLnx->abKUrbPadding)
+                              >=   RT_UOFFSETOF(struct usbdevfs_urb, iso_frame_desc)
+                                 + sizeof(struct usbdevfs_iso_packet_desc) * RT_ELEMENTS(pUrb->aIsocPkts));
                 unsigned i, off;
                 for (i = 0, off = 0; i < pUrb->cIsocPkts; i++)