Changeset 87053 in vbox for trunk/src/VBox/Additions/linux/sharedfolders

Timestamp:

Dec 8, 2020 1:52:53 PM (4 years ago)

Author:

vboxsync

Message:

linser/vboxsf: Adjustment for linux 5.10 - TASK_SIZE_MAX replaces USER_DS.seg. bugref:9879

File:

• trunk/src/VBox/Additions/linux/sharedfolders/regops.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -148 +148 @@
         if (paIov->iov_len > 0) {
             if (access_ok(VERIFY_READ, paIov->iov_base, paIov->iov_len))
+#if RTLNX_VER_MIN(5,10,0)
+                return (uintptr_t)paIov->iov_base >= TASK_SIZE_MAX ? ITER_KVEC : 0;
+#else
                 return (uintptr_t)paIov->iov_base >= USER_DS.seg ? ITER_KVEC : 0;
+#endif
             AssertMsgFailed(("%p LB %#zx\n", paIov->iov_base, paIov->iov_len));
             break;
@@ -1402 +1406 @@
      * Check that this is valid user memory that is actually in the kernel range.
      */
-#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
+#if RTLNX_VER_MIN(5,10,0)
+    if (   access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
+        && uPtrFrom >= TASK_SIZE_MAX)
+#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
     if (   access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
         && uPtrFrom >= USER_DS.seg)