]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
vhost: add missing __user annotations
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 6 Dec 2016 04:01:41 +0000 (06:01 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 15 Dec 2016 04:59:18 +0000 (06:59 +0200)
Several vhost functions were missing __user annotations
on pointers, causing sparse warnings. Fix this up.

sparse also warns about vhost_process_iotlb_msg which
is local and should be static. Fix that up as well.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
drivers/vhost/vhost.c

index e4825222eb0637500223d2151337d75e9cc8d72c..2f58181b918d350968951c8b18f35b106887cb84 100644 (file)
@@ -719,7 +719,7 @@ static int memory_access_ok(struct vhost_dev *d, struct vhost_umem *umem,
 static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len,
                          struct iovec iov[], int iov_size, int access);
 
-static int vhost_copy_to_user(struct vhost_virtqueue *vq, void *to,
+static int vhost_copy_to_user(struct vhost_virtqueue *vq, void __user *to,
                              const void *from, unsigned size)
 {
        int ret;
@@ -749,7 +749,7 @@ out:
 }
 
 static int vhost_copy_from_user(struct vhost_virtqueue *vq, void *to,
-                               void *from, unsigned size)
+                               void __user *from, unsigned size)
 {
        int ret;
 
@@ -783,7 +783,7 @@ out:
 }
 
 static void __user *__vhost_get_user(struct vhost_virtqueue *vq,
-                                    void *addr, unsigned size)
+                                    void __user *addr, unsigned size)
 {
        int ret;
 
@@ -934,8 +934,8 @@ static int umem_access_ok(u64 uaddr, u64 size, int access)
        return 0;
 }
 
-int vhost_process_iotlb_msg(struct vhost_dev *dev,
-                           struct vhost_iotlb_msg *msg)
+static int vhost_process_iotlb_msg(struct vhost_dev *dev,
+                                  struct vhost_iotlb_msg *msg)
 {
        int ret = 0;