Changeset 107605 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 9, 2025 5:32:38 PM (2 months ago)

Author:

vboxsync

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

166685

Message:

Additions: Linux: vboxvideo: Additional fix for UBSAN warnings, bugref:10585.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxVideo/HGSMIBase.cpp (modified) (1 diff)
• common/VBoxVideo/VBVABase.cpp (modified) (2 diffs)
• linux/drm/Makefile.module.kms (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -233 +233 @@
     if (cbPixels)
         /* Copy the actual pointer data. */
-        memcpy (p->au8Data, pPixels, cbPixels);
+        RT_BCOPY_UNFORTIFIED(p->au8Data, pPixels, cbPixels);
     /* No need to check that the buffer is valid as we have just allocated it. */
     VBoxHGSMIBufferSubmit(pCtx, p);

trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

@@ -253 +253 @@
     VBVABUFFER *pVBVA = pCtx->pVBVA;
     uint32_t u32BytesTillBoundary = pVBVA->cbData - offset;
-    uint8_t  *dst                 = &pVBVA->au8Data[offset];
+    uint8_t  *dst                 = &pVBVA->au8Data[0] + offset;
     int32_t i32Diff               = cb - u32BytesTillBoundary;
 
@@ -259 +259 @@
     {
         /* Chunk will not cross buffer boundary. */
-        memcpy (dst, p, cb);
+        RT_BCOPY_UNFORTIFIED(dst, p, cb);
     }
     else
     {
         /* Chunk crosses buffer boundary. */
-        memcpy (dst, p, u32BytesTillBoundary);
-        memcpy (&pVBVA->au8Data[0], (uint8_t *)p + u32BytesTillBoundary, i32Diff);
+        RT_BCOPY_UNFORTIFIED(dst, p, u32BytesTillBoundary);
+        RT_BCOPY_UNFORTIFIED(&pVBVA->au8Data[0], (uint8_t *)p + u32BytesTillBoundary, i32Diff);
     }
 }

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -45 +45 @@
 
 VBOXMOD_NAME = vboxvideo
+VBOXMOD_CFLAGS = -DRT_OS_LINUX
 VBOXMOD_OBJS = \
         hgsmi_base.o \