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, 15 insertions, 15 deletions

diff --git a/net/compat.c b/net/compat.c
index c3a2f868e8af..959d1c51826d 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -358,7 +358,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
 
         if (optlen < sizeof(*up))
                 return -EINVAL;
-        if (!access_ok(VERIFY_READ, up, sizeof(*up)) ||
+        if (!access_ok(up, sizeof(*up)) ||
             __get_user(ktime.tv_sec, &up->tv_sec) ||
             __get_user(ktime.tv_usec, &up->tv_usec))
                 return -EFAULT;
@@ -438,7 +438,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
 
         if (!err) {
                 if (put_user(sizeof(*up), optlen) ||
-                    !access_ok(VERIFY_WRITE, up, sizeof(*up)) ||
+                    !access_ok(up, sizeof(*up)) ||
                     __put_user(ktime.tv_sec, &up->tv_sec) ||
                     __put_user(ktime.tv_usec, &up->tv_usec))
                         err = -EFAULT;
@@ -590,8 +590,8 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
                         compat_alloc_user_space(sizeof(struct group_req));
                 u32 interface;
 
-                if (!access_ok(VERIFY_READ, gr32, sizeof(*gr32)) ||
-                    !access_ok(VERIFY_WRITE, kgr, sizeof(struct group_req)) ||
+                if (!access_ok(gr32, sizeof(*gr32)) ||
+                    !access_ok(kgr, sizeof(struct group_req)) ||
                     __get_user(interface, &gr32->gr_interface) ||
                     __put_user(interface, &kgr->gr_interface) ||
                     copy_in_user(&kgr->gr_group, &gr32->gr_group,
@@ -611,8 +611,8 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
                         sizeof(struct group_source_req));
                 u32 interface;
 
-                if (!access_ok(VERIFY_READ, gsr32, sizeof(*gsr32)) ||
-                    !access_ok(VERIFY_WRITE, kgsr,
+                if (!access_ok(gsr32, sizeof(*gsr32)) ||
+                    !access_ok(kgsr,
                         sizeof(struct group_source_req)) ||
                     __get_user(interface, &gsr32->gsr_interface) ||
                     __put_user(interface, &kgsr->gsr_interface) ||
@@ -631,7 +631,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
                 struct group_filter __user *kgf;
                 u32 interface, fmode, numsrc;
 
-                if (!access_ok(VERIFY_READ, gf32, __COMPAT_GF0_SIZE) ||
+                if (!access_ok(gf32, __COMPAT_GF0_SIZE) ||
                     __get_user(interface, &gf32->gf_interface) ||
                     __get_user(fmode, &gf32->gf_fmode) ||
                     __get_user(numsrc, &gf32->gf_numsrc))
@@ -641,7 +641,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
                 if (koptlen < GROUP_FILTER_SIZE(numsrc))
                         return -EINVAL;
                 kgf = compat_alloc_user_space(koptlen);
-                if (!access_ok(VERIFY_WRITE, kgf, koptlen) ||
+                if (!access_ok(kgf, koptlen) ||
                     __put_user(interface, &kgf->gf_interface) ||
                     __put_user(fmode, &kgf->gf_fmode) ||
                     __put_user(numsrc, &kgf->gf_numsrc) ||
@@ -675,7 +675,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
                 return getsockopt(sock, level, optname, optval, optlen);
 
         koptlen = compat_alloc_user_space(sizeof(*koptlen));
-        if (!access_ok(VERIFY_READ, optlen, sizeof(*optlen)) ||
+        if (!access_ok(optlen, sizeof(*optlen)) ||
             __get_user(ulen, optlen))
                 return -EFAULT;
 
@@ -685,14 +685,14 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
         if (klen < GROUP_FILTER_SIZE(0))
                 return -EINVAL;
 
-        if (!access_ok(VERIFY_WRITE, koptlen, sizeof(*koptlen)) ||
+        if (!access_ok(koptlen, sizeof(*koptlen)) ||
             __put_user(klen, koptlen))
                 return -EFAULT;
 
         /* have to allow space for previous compat_alloc_user_space, too */
         kgf = compat_alloc_user_space(klen+sizeof(*optlen));
 
-        if (!access_ok(VERIFY_READ, gf32, __COMPAT_GF0_SIZE) ||
+        if (!access_ok(gf32, __COMPAT_GF0_SIZE) ||
             __get_user(interface, &gf32->gf_interface) ||
             __get_user(fmode, &gf32->gf_fmode) ||
             __get_user(numsrc, &gf32->gf_numsrc) ||
@@ -706,18 +706,18 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
         if (err)
                 return err;
 
-        if (!access_ok(VERIFY_READ, koptlen, sizeof(*koptlen)) ||
+        if (!access_ok(koptlen, sizeof(*koptlen)) ||
             __get_user(klen, koptlen))
                 return -EFAULT;
 
         ulen = klen - (sizeof(*kgf)-sizeof(*gf32));
 
-        if (!access_ok(VERIFY_WRITE, optlen, sizeof(*optlen)) ||
+        if (!access_ok(optlen, sizeof(*optlen)) ||
             __put_user(ulen, optlen))
                 return -EFAULT;
 
-        if (!access_ok(VERIFY_READ, kgf, klen) ||
-            !access_ok(VERIFY_WRITE, gf32, ulen) ||
+        if (!access_ok(kgf, klen) ||
+            !access_ok(gf32, ulen) ||
             __get_user(interface, &kgf->gf_interface) ||
             __get_user(fmode, &kgf->gf_fmode) ||
             __get_user(numsrc, &kgf->gf_numsrc) ||