Changeset 96720 in vbox for trunk/src/VBox/Devices/USB/linux

Timestamp:

Sep 13, 2022 1:04:56 PM (3 years ago)

Author:

vboxsync

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

153605

Message:

USBProxyDevice-linux.cpp: Put struct usbdevfs_urb KUrb at the end of USBPROXYURBLNX as GCC 10 & 11 are still too stupid to accept 'flexible array' in a union. This is a bit more risky, but I could only spot one place converting a struct usbdevfs_urb pointer to PUSBPROXYURBLNX. bugref:10279

File:

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

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

@@ -95 +95 @@
 typedef struct USBPROXYURBLNX
 {
-    /** The kernel URB data. */
-#if RT_GNUC_PREREQ(6, 0)
-    /* gcc 6.2 complains about the [] member of KUrb */
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-    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
     /** Node to link the URB in of the existing lists. */
     RTLISTNODE                      NodeList;
     /** If we've split the VUSBURB up into multiple linux URBs, this is points to the head. */
-    struct USBPROXYURBLNX           *pSplitHead;
+    struct USBPROXYURBLNX          *pSplitHead;
     /** The next linux URB if split up. */
-    struct USBPROXYURBLNX           *pSplitNext;
+    struct USBPROXYURBLNX          *pSplitNext;
     /** Don't report these back. */
     bool                            fCanceledBySubmit;
@@ -125 +109 @@
     /** Size to transfer in remaining fragments of a split URB */
     uint32_t                        cbSplitRemaining;
+
+#if RT_GNUC_PREREQ(6, 0) /* gcc 6.2 complains about the [] member of KUrb */
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic"
+#endif
+    /** The kernel URB data (variable size array included). */
+    struct usbdevfs_urb             KUrb;
+#if RT_GNUC_PREREQ(6, 0)
+# pragma GCC diagnostic pop
+#endif
 } USBPROXYURBLNX, *PUSBPROXYURBLNX;
 
@@ -278 +272 @@
 }
 
+
 /**
  * Unlinks the given URB from the in flight list.
+ *
  * @returns nothing.
  * @param   pDevLnx         The proxy device instance - Linux specific data.
@@ -299 +295 @@
 }
 
+
 /**
  * Allocates a linux URB request structure.
+ *
  * @returns Pointer to an active URB request.
  * @returns NULL on failure.
@@ -327 +325 @@
     {
         RTCritSectLeave(&pDevLnx->CritSect);
-        pUrbLnx = (PUSBPROXYURBLNX)RTMemAlloc(sizeof(*pUrbLnx));
+        PVUSBURB pVUrbDummy; RT_NOREF(pVUrbDummy);
+        pUrbLnx = (PUSBPROXYURBLNX)RTMemAlloc(RT_UOFFSETOF_DYN(USBPROXYURBLNX,
+                                                               KUrb.iso_frame_desc[RT_ELEMENTS(pVUrbDummy->aIsocPkts)]));
         if (!pUrbLnx)
             return NULL;
@@ -996 +996 @@
  * Clean up after a failed URB submit.
  */
-static void usbProxyLinuxCleanupFailedSubmit(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pUrbLnx, PUSBPROXYURBLNX pCur, PVUSBURB pUrb, bool *pfUnplugged)
+static void usbProxyLinuxCleanupFailedSubmit(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pUrbLnx, PUSBPROXYURBLNX pCur,
+                                             PVUSBURB pUrb, bool *pfUnplugged)
 {
     if (pUrb->enmType == VUSBXFERTYPE_MSG)
@@ -1503 +1504 @@
                 return NULL;
             }
-        pUrbLnx = (PUSBPROXYURBLNX)pKUrb;
+        pUrbLnx = RT_FROM_MEMBER(pKUrb, USBPROXYURBLNX, KUrb);
 
         /* split list: Is the entire split list done yet? */
@@ -1578 +1579 @@
             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++)