]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
vme_user: don't use __copy_..._user()
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 29 Dec 2017 21:12:28 +0000 (16:12 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 29 Dec 2017 21:12:28 +0000 (16:12 -0500)
Saving access_ok() is not worth the trouble; yes, the callers of ->read()
and ->write() will have done the right checks, but it's much too long
(and varied) call chains to rely upon.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/staging/vme/devices/vme_user.c

index a3d4610fbdbe3ff5b9deb109301db5d347bf551a..4c8c6fa0a79feabe6efa0252a441df1c5bb30e01 100644 (file)
@@ -134,7 +134,7 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count,
        if (copied < 0)
                return (int)copied;
 
-       if (__copy_to_user(buf, image[minor].kern_buf, (unsigned long)copied))
+       if (copy_to_user(buf, image[minor].kern_buf, (unsigned long)copied))
                return -EFAULT;
 
        return copied;
@@ -146,7 +146,7 @@ static ssize_t resource_from_user(unsigned int minor, const char __user *buf,
        if (count > image[minor].size_buf)
                count = image[minor].size_buf;
 
-       if (__copy_from_user(image[minor].kern_buf, buf, (unsigned long)count))
+       if (copy_from_user(image[minor].kern_buf, buf, (unsigned long)count))
                return -EFAULT;
 
        return vme_master_write(image[minor].resource, image[minor].kern_buf,
@@ -159,7 +159,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
        void *image_ptr;
 
        image_ptr = image[minor].kern_buf + *ppos;
-       if (__copy_to_user(buf, image_ptr, (unsigned long)count))
+       if (copy_to_user(buf, image_ptr, (unsigned long)count))
                return -EFAULT;
 
        return count;
@@ -171,7 +171,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf,
        void *image_ptr;
 
        image_ptr = image[minor].kern_buf + *ppos;
-       if (__copy_from_user(image_ptr, buf, (unsigned long)count))
+       if (copy_from_user(image_ptr, buf, (unsigned long)count))
                return -EFAULT;
 
        return count;