vhost: fix range used in translate_desc()

[ Upstream commit 98047313cdb46828093894d0ac8b1183b8b317f9 ]

vhost_iotlb_itree_first() requires `start` and `last` parameters
to search for a mapping that overlaps the range.

In translate_desc() we cyclically call vhost_iotlb_itree_first(),
incrementing `addr` by the amount already translated, so rightly
we move the `start` parameter passed to vhost_iotlb_itree_first(),
but we should hold the `last` parameter constant.

Let's fix it by saving the `last` parameter value before incrementing
`addr` in the loop.

Fixes: a79c3d5aaa30 ("vhost: convert pre sorted vhost memory array to interval tree")
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20221109102503.18816-3-sgarzare@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 97be299f0a8dc0a76edb43d2c8b7d4bb57adb273..fdfa399700fe990d091bff97712d271bcb20e94c 100644 (file)
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -2050,7 +2050,7 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len,
        struct vhost_dev *dev = vq->dev;
        struct vhost_umem *umem = dev->iotlb ? dev->iotlb : dev->umem;
        struct iovec *_iov;
-       u64 s = 0;
+       u64 s = 0, last = addr + len - 1;
        int ret = 0;
 
        while ((u64)len > s) {
@@ -2061,7 +2061,7 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len,
                }
 
                node = vhost_umem_interval_tree_iter_first(&umem->umem_tree,
-                                                       addr, addr + len - 1);
+                                                       addr, last);
                if (node == NULL || node->start > addr) {
                        if (umem != dev->iotlb) {
                                ret = -EFAULT;