Remove 'type' argument from access_ok() function

Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.

It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access.  But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.

A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model.  And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.

This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.

There were a couple of notable cases:

 - csky still had the old "verify_area()" name as an alias.

 - the iter_iov code had magical hardcoded knowledge of the actual
   values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
   really used it)

 - microblaze used the type argument for a debug printout

but other than those oddities this should be a total no-op patch.

I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something.  Any missed conversion should be trivially fixable, though.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 55e5aa662ad5..9f7942cbcbb2 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -655,7 +655,7 @@ static bool log_access_ok(void __user *log_base, u64 addr, unsigned long sz)
             a + (unsigned long)log_base > ULONG_MAX)
                 return false;
 
-        return access_ok(VERIFY_WRITE, log_base + a,
+        return access_ok(log_base + a,
                          (sz + VHOST_PAGE_SIZE * 8 - 1) / VHOST_PAGE_SIZE / 8);
 }
 
@@ -681,7 +681,7 @@ static bool vq_memory_access_ok(void __user *log_base, struct vhost_umem *umem,
                         return false;
 
 
-                if (!access_ok(VERIFY_WRITE, (void __user *)a,
+                if (!access_ok((void __user *)a,
                                     node->size))
                         return false;
                 else if (log_all && !log_access_ok(log_base,
@@ -973,10 +973,10 @@ static bool umem_access_ok(u64 uaddr, u64 size, int access)
                 return false;
 
         if ((access & VHOST_ACCESS_RO) &&
-            !access_ok(VERIFY_READ, (void __user *)a, size))
+            !access_ok((void __user *)a, size))
                 return false;
         if ((access & VHOST_ACCESS_WO) &&
-            !access_ok(VERIFY_WRITE, (void __user *)a, size))
+            !access_ok((void __user *)a, size))
                 return false;
         return true;
 }
@@ -1185,10 +1185,10 @@ static bool vq_access_ok(struct vhost_virtqueue *vq, unsigned int num,
 {
         size_t s = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
 
-        return access_ok(VERIFY_READ, desc, num * sizeof *desc) &&
-               access_ok(VERIFY_READ, avail,
+        return access_ok(desc, num * sizeof *desc) &&
+               access_ok(avail,
                          sizeof *avail + num * sizeof *avail->ring + s) &&
-               access_ok(VERIFY_WRITE, used,
+               access_ok(used,
                         sizeof *used + num * sizeof *used->ring + s);
 }
 
@@ -1814,7 +1814,7 @@ int vhost_vq_init_access(struct vhost_virtqueue *vq)
                 goto err;
         vq->signalled_used_valid = false;
         if (!vq->iotlb &&
-            !access_ok(VERIFY_READ, &vq->used->idx, sizeof vq->used->idx)) {
+            !access_ok(&vq->used->idx, sizeof vq->used->idx)) {
                 r = -EFAULT;
                 goto err;
         }