Commit f85efa9b authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Michael S. Tsirkin
Browse files

vringh: fix range used in iotlb_translate() 



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

In iotlb_translate() 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: 9ad9c49c ("vringh: IOTLB support")
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Message-Id: <20221109102503.18816-2-sgarzare@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7a4efe18

drivers/vhost/vringh.c

+2 −3
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ static int iotlb_translate(const struct vringh *vrh, 
	struct vhost_iotlb_map *map;

	struct vhost_iotlb *iotlb = vrh->iotlb;

	int ret = 0;

	u64 s = 0;

	u64 s = 0, last = addr + len - 1;



	spin_lock(vrh->iotlb_lock);
@@ -1114,8 +1114,7 @@ static int iotlb_translate(const struct vringh *vrh, 
			break;

		}



		map = vhost_iotlb_itree_first(iotlb, addr,

					      addr + len - 1);

		map = vhost_iotlb_itree_first(iotlb, addr, last);

		if (!map || map->start > addr) {

			ret = -EINVAL;

			break;