| Message ID | 1481038106-24899-7-git-send-email-mst@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016年12月06日 23:40, Michael S. Tsirkin wrote: > Several vhost functions were missing __user annotations > on pointers, causing sparse warnings. Fix this up. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/vhost/vhost.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 7331ef3..ba7db68 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -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 @@ static int vhost_copy_to_user(struct vhost_virtqueue *vq, void *to, > } > > 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 @@ static int vhost_copy_from_user(struct vhost_virtqueue *vq, void *to, > } > > 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; > Patch looks good but this looks like another static conversion not __user annotations. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 7331ef3..ba7db68 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -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 @@ static int vhost_copy_to_user(struct vhost_virtqueue *vq, void *to, } 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 @@ static int vhost_copy_from_user(struct vhost_virtqueue *vq, void *to, } 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;
Several vhost functions were missing __user annotations on pointers, causing sparse warnings. Fix this up. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- drivers/vhost/vhost.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)