Changeset 103168 in vbox for trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

Timestamp:

Feb 1, 2024 5:24:16 PM (13 months ago)

Author:

vboxsync

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

161425

Message:

iprt: r0drv: Linux: Prevent mk_pte warning introduced in kernel 6.6, bugref:10524.

Update RTMEM_PROT_* to Linux PAGE_* mapping and use existing macro
to define protection mask.

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (1 diff)

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

@@ -245 +245 @@
             if (fKernel)
             {
+# if RTLNX_VER_MIN(6,6,0)
+                /* In kernel 6.6 mk_pte() macro was fortified with additional
+                 * check which does not allow to use our custom mask anymore
+                 * (see kernel commit ae1f05a617dcbc0a732fbeba0893786cd009536c).
+                 * For this particular mapping case, an existing mask PAGE_KERNEL_ROX
+                 * can be used instead. PAGE_KERNEL_ROX was introduced in
+                 * kernel 5.8, however, lets apply it for kernels 6.6 and newer
+                 * to be on a safe side.
+                 */
+                return PAGE_KERNEL_ROX;
+# else
                 pgprot_t fPg = MY_PAGE_KERNEL_EXEC;
                 pgprot_val(fPg) &= ~_PAGE_RW;
                 return fPg;
+# endif
             }
             return PAGE_READONLY_EXEC;