Changeset 76859 in vbox for trunk/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c

Timestamp:

Jan 17, 2019 1:53:59 PM (6 years ago)

Author:

vboxsync

Message:

drivers/linux: adjust for new access_ok signature.
bugref:4567: Linux kernel driver maintenance.
The API for the access_ok() macro has changed in 5.0 to remove the first
argument. Contributed by Kyle Laker under the terms of the MIT licence.
Verified by Valdis Kletnieks. Thank you.

File:

• trunk/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c (modified) (2 diffs)

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

@@ -67 +67 @@
 {
     IPRT_LINUX_SAVE_EFL_AC();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
+    bool fRc = access_ok((void *)R3Ptr, 1);
+#else
     bool fRc = access_ok(VERIFY_READ, (void *)R3Ptr, 1);
+#endif
     IPRT_LINUX_RESTORE_EFL_AC();
     return fRc;
@@ -83 +87 @@
 #else
 # error "PORT ME"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
+    return !access_ok(pv, 1);
+#else
     return !access_ok(VERIFY_READ, pv, 1);
+#endif /* LINUX_VERSION_CODE */
 #endif
 }