aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()

A cleanup of rw_copy_check_uvector and compat_rw_copy_check_uvector after
changes made to support CMA in an earlier patch.

Rather than having an additional check_access parameter to these
functions, the first paramater type is overloaded to allow the caller to
specify CHECK_IOVEC_ONLY which means check that the contents of the iovec
are valid, but do not check the memory that they point to.  This is used
by process_vm_readv/writev where we need to validate that a iovec passed
to the syscall is valid but do not want to check the memory that it points
to at this point because it refers to an address space in another process.

Signed-off-by: Chris Yeoh <yeohc@au1.ibm.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index c20ff48994c2..926b46649749 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -371,15 +371,15 @@ static ssize_t process_vm_rw(pid_t pid,
         /* Check iovecs */
         if (vm_write)
                 rc = rw_copy_check_uvector(WRITE, lvec, liovcnt, UIO_FASTIOV,
-                                           iovstack_l, &iov_l, 1);
+                                           iovstack_l, &iov_l);
         else
                 rc = rw_copy_check_uvector(READ, lvec, liovcnt, UIO_FASTIOV,
-                                           iovstack_l, &iov_l, 1);
+                                           iovstack_l, &iov_l);
         if (rc <= 0)
                 goto free_iovecs;
 
-        rc = rw_copy_check_uvector(READ, rvec, riovcnt, UIO_FASTIOV,
-                                   iovstack_r, &iov_r, 0);
+        rc = rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt, UIO_FASTIOV,
+                                   iovstack_r, &iov_r);
         if (rc <= 0)
                 goto free_iovecs;
 
@@ -438,16 +438,16 @@ compat_process_vm_rw(compat_pid_t pid,
         if (vm_write)
                 rc = compat_rw_copy_check_uvector(WRITE, lvec, liovcnt,
                                                   UIO_FASTIOV, iovstack_l,
-                                                  &iov_l, 1);
+                                                  &iov_l);
         else
                 rc = compat_rw_copy_check_uvector(READ, lvec, liovcnt,
                                                   UIO_FASTIOV, iovstack_l,
-                                                  &iov_l, 1);
+                                                  &iov_l);
         if (rc <= 0)
                 goto free_iovecs;
-        rc = compat_rw_copy_check_uvector(READ, rvec, riovcnt,
+        rc = compat_rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt,
                                           UIO_FASTIOV, iovstack_r,
-                                          &iov_r, 0);
+                                          &iov_r);
         if (rc <= 0)
                 goto free_iovecs;