Changeset 103685 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (3 diffs)

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;