drm/i915/gt: Carefully order virtual_submission_tasklet

[linux-2.6-microblaze.git] / fs / userfaultfd.c

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 6e878d2..e39fdec 100644 (file)
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -1495,14 +1495,24 @@ out_unlock:
        up_write(&mm->mmap_sem);
        mmput(mm);
        if (!ret) {
+               __u64 ioctls_out;
+
+               ioctls_out = basic_ioctls ? UFFD_API_RANGE_IOCTLS_BASIC :
+                   UFFD_API_RANGE_IOCTLS;
+
+               /*
+                * Declare the WP ioctl only if the WP mode is
+                * specified and all checks passed with the range
+                */
+               if (!(uffdio_register.mode & UFFDIO_REGISTER_MODE_WP))
+                       ioctls_out &= ~((__u64)1 << _UFFDIO_WRITEPROTECT);
+
                /*
                 * Now that we scanned all vmas we can already tell
                 * userland which ioctls methods are guaranteed to
                 * succeed on this range.
                 */
-               if (put_user(basic_ioctls ? UFFD_API_RANGE_IOCTLS_BASIC :
-                            UFFD_API_RANGE_IOCTLS,
-                            &user_uffdio_register->ioctls))
+               if (put_user(ioctls_out, &user_uffdio_register->ioctls))
                        ret = -EFAULT;
        }
 out: