]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
vhost: Fix vhost_copy_to_user()
authorEric Auger <eric.auger@redhat.com>
Wed, 11 Apr 2018 13:30:38 +0000 (15:30 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 22 May 2018 14:18:15 +0000 (16:18 +0200)
BugLink: http://bugs.launchpad.net/bugs/1769723
[ Upstream commit 7ced6c98c7ab7a1f6743931e28671b833af79b1e ]

vhost_copy_to_user is used to copy vring used elements to userspace.
We should use VHOST_ADDR_USED instead of VHOST_ADDR_DESC.

Fixes: f88949138058 ("vhost: introduce O(1) vq metadata cache")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/vhost/vhost.c

index 7f828cc5941f9644666a3373b84e2cb49430fde3..31bdfd296ced1f47b31f41ec948f5db49789bb0d 100644 (file)
@@ -756,7 +756,7 @@ static int vhost_copy_to_user(struct vhost_virtqueue *vq, void __user *to,
                struct iov_iter t;
                void __user *uaddr = vhost_vq_meta_fetch(vq,
                                     (u64)(uintptr_t)to, size,
-                                    VHOST_ADDR_DESC);
+                                    VHOST_ADDR_USED);
 
                if (uaddr)
                        return __copy_to_user(uaddr, from, size);