Changeset 100475 in vbox for trunk/src/VBox

Timestamp:

Jul 10, 2023 3:59:33 PM (17 months ago)

Author:

vboxsync

Message:

Linux: fix NULL pointer dereference introduced in r158175 (kernel 6.5 support), bugref:10482.

File:

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

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

@@ -1342 +1342 @@
     const int cPages = cb >> PAGE_SHIFT;
     struct task_struct *pTask = rtR0ProcessToLinuxTask(R0Process);
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
     struct vm_area_struct **papVMAs;
+# endif
     PRTR0MEMOBJLNX  pMemLnx;
     int             rc      = VERR_NO_MEMORY;
@@ -1370 +1372 @@
     if (papVMAs)
     {
-# else
-        RT_NOREF(papVMAs);
 # endif
         LNX_MM_DOWN_READ(pTask->mm);
@@ -1465 +1465 @@
             {
                 flush_dcache_page(pMemLnx->apPages[rc]);
-#if RTLNX_VER_MIN(6,3,0)
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+#  if RTLNX_VER_MIN(6,3,0)
                 vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
-#elif GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+#  else
                 papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
-#endif
+#  endif
+# endif
             }