Changeset 107080 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Nov 21, 2024 11:20:08 AM (6 months ago)

Author:

vboxsync

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

166036

Message:

Host Drivers: Linux: vboxdrv: Fix UBSAN warnings, bugref:10585.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -278 +278 @@
  */
 #define SUP_IOCTL_QUERY_FUNCS(cFuncs)                   SUP_CTL_CODE_BIG(2)
-#define SUP_IOCTL_QUERY_FUNCS_SIZE(cFuncs)              RT_UOFFSETOF_DYN(SUPQUERYFUNCS, u.Out.aFunctions[(cFuncs)])
+#define SUP_IOCTL_QUERY_FUNCS_SIZE(cFuncs)              (RT_UOFFSETOF_DYN(SUPQUERYFUNCS, u.Out.aFunctions) + \
+                                                        RT_SIZEOFMEMB(SUPQUERYFUNCS, u.Out.aFunctions) * (cFuncs))
 #define SUP_IOCTL_QUERY_FUNCS_SIZE_IN                   sizeof(SUPREQHDR)
 #define SUP_IOCTL_QUERY_FUNCS_SIZE_OUT(cFuncs)          SUP_IOCTL_QUERY_FUNCS_SIZE(cFuncs)
@@ -361 +362 @@
  */
 #define SUP_IOCTL_LDR_LOAD                              SUP_CTL_CODE_BIG(4)
-#define SUP_IOCTL_LDR_LOAD_SIZE(cbImage)                RT_MAX(RT_UOFFSETOF_DYN(SUPLDRLOAD, u.In.abImage[cbImage]), SUP_IOCTL_LDR_LOAD_SIZE_OUT)
-#define SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage)             RT_UOFFSETOF_DYN(SUPLDRLOAD, u.In.abImage[cbImage])
+#define SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage)             (RT_UOFFSETOF_DYN(SUPLDRLOAD, u.In.abImage) + \
+                                                        RT_SIZEOFMEMB(SUPLDRLOAD, u.In.abImage) * (cbImage))
 #define SUP_IOCTL_LDR_LOAD_SIZE_OUT                     (RT_UOFFSETOF(SUPLDRLOAD, u.Out.szError) + RT_SIZEOFMEMB(SUPLDRLOAD, u.Out.szError))
+#define SUP_IOCTL_LDR_LOAD_SIZE(cbImage)                RT_MAX(SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage), SUP_IOCTL_LDR_LOAD_SIZE_OUT)
 
 /**
@@ -614 +616 @@
     } u;
     /** The VMMR0Entry request packet. */
-    uint8_t                 abReqPkt[1];
+    RT_FLEXIBLE_ARRAY_EXTENSION
+    uint8_t                 abReqPkt[RT_FLEXIBLE_ARRAY];
 } SUPCALLVMMR0, *PSUPCALLVMMR0;
 /** @} */
@@ -635 +638 @@
  */
 #define SUP_IOCTL_LOW_ALLOC                             SUP_CTL_CODE_BIG(8)
-#define SUP_IOCTL_LOW_ALLOC_SIZE(cPages)                ((uint32_t)RT_UOFFSETOF_DYN(SUPLOWALLOC, u.Out.aPages[cPages]))
+#define SUP_IOCTL_LOW_ALLOC_SIZE(cPages)                ((uint32_t)(RT_UOFFSETOF_DYN(SUPLOWALLOC, u.Out.aPages) + \
+                                                        RT_SIZEOFMEMB(SUPLOWALLOC, u.Out.aPages) * (cPages)))
 #define SUP_IOCTL_LOW_ALLOC_SIZE_IN                     (sizeof(SUPREQHDR) + RT_SIZEOFMEMB(SUPLOWALLOC, u.In))
 #define SUP_IOCTL_LOW_ALLOC_SIZE_OUT(cPages)            SUP_IOCTL_LOW_ALLOC_SIZE(cPages)
@@ -697 +701 @@
  */
 #define SUP_IOCTL_PAGE_ALLOC_EX                         SUP_CTL_CODE_BIG(10)
-#define SUP_IOCTL_PAGE_ALLOC_EX_SIZE(cPages)            RT_UOFFSETOF_DYN(SUPPAGEALLOCEX, u.Out.aPages[cPages])
+#define SUP_IOCTL_PAGE_ALLOC_EX_SIZE(cPages)            (RT_UOFFSETOF_DYN(SUPPAGEALLOCEX, u.Out.aPages) + \
+                                                        RT_SIZEOFMEMB(SUPPAGEALLOCEX, u.Out.aPages) * (cPages))
 #define SUP_IOCTL_PAGE_ALLOC_EX_SIZE_IN                 (sizeof(SUPREQHDR) + RT_SIZEOFMEMB(SUPPAGEALLOCEX, u.In))
 #define SUP_IOCTL_PAGE_ALLOC_EX_SIZE_OUT(cPages)        SUP_IOCTL_PAGE_ALLOC_EX_SIZE(cPages)