Changeset 103685 in vbox

Timestamp:

Mar 5, 2024 3:46:54 PM (7 months ago)

Author:

vboxsync

Message:

Backed out r161312 (no longer needed): iprt: Prevent array-index-out-of-bounds UBSAN warnings on Linux, bugref:10585.

Location:

trunk/src/VBox/Runtime

Files:

• common/log/log.cpp (modified) (4 diffs)
• r0drv/linux/memobj-r0drv-linux.c (modified) (3 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -549 +549 @@
         uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
         if (   iGroup != UINT16_MAX
-            && (   (*(pLoggerInt->afGroups + (iGroup < pLoggerInt->cGroups ? iGroup : 0)) & (fFlags | RTLOGGRPFLAGS_ENABLED))
+            && (   (pLoggerInt->afGroups[iGroup < pLoggerInt->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
                 != (fFlags | RTLOGGRPFLAGS_ENABLED)))
             pLoggerInt = NULL;
@@ -1556 +1556 @@
     iGroup = pLoggerInt->cGroups;
     while (iGroup-- > 0)
-        *(pLoggerInt->afGroups + iGroup) = 0;
+        pLoggerInt->afGroups[iGroup] = 0;
 
     /*
@@ -1789 +1789 @@
             {
                 if (fEnabled)
-                    *(pLoggerInt->afGroups + i) |= fFlags;
+                    pLoggerInt->afGroups[i] |= fFlags;
                 else
-                    *(pLoggerInt->afGroups + i) &= ~fFlags;
+                    pLoggerInt->afGroups[i] &= ~fFlags;
             }
         }
@@ -4159 +4159 @@
         return VINF_LOG_DISABLED;
     if (    iGroup != ~0U
-        &&  (*(pLoggerInt->afGroups + iGroup) & (fFlags | RTLOGGRPFLAGS_ENABLED)) != (fFlags | RTLOGGRPFLAGS_ENABLED))
+        &&  (pLoggerInt->afGroups[iGroup] & (fFlags | RTLOGGRPFLAGS_ENABLED)) != (fFlags | RTLOGGRPFLAGS_ENABLED))
         return VINF_LOG_DISABLED;
 

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -439 +439 @@
             fContiguous = true;
             for (iPage = 0; iPage < cPages; iPage++)
-                *(pMemLnx->apPages + iPage) = &paPages[iPage];
+                pMemLnx->apPages[iPage] = &paPages[iPage];
         }
         else if (fContiguous)
@@ -455 +455 @@
         for (iPage = 0; iPage < cPages; iPage++)
         {
-            *(pMemLnx->apPages + iPage) = alloc_page(fFlagsLnx | __GFP_NOWARN);
-            if (RT_UNLIKELY(!*(pMemLnx->apPages + iPage)))
+            pMemLnx->apPages[iPage] = alloc_page(fFlagsLnx | __GFP_NOWARN);
+            if (RT_UNLIKELY(!pMemLnx->apPages[iPage]))
             {
                 while (iPage-- > 0)
-                    __free_page(*(pMemLnx->apPages + iPage));
+                    __free_page(pMemLnx->apPages[iPage]);
                 rtR0MemObjDelete(&pMemLnx->Core);
                 return rcNoMem;
@@ -636 +636 @@
         size_t iPage = pMemLnx->cPages;
         while (iPage-- > 0)
-            if (PageHighMem(*(pMemLnx->apPages + iPage)))
+            if (PageHighMem(pMemLnx->apPages[iPage]))
             {
                 fMustMap = true;