mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-26 12:26:11 +00:00
vringh: fix range used in iotlb_translate()
[ Upstream commitf85efa9b0f
] 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:9ad9c49cfe
("vringh: IOTLB support") Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Message-Id: <20221109102503.18816-2-sgarzare@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
527c35a0aa
commit
104914b43a
1 changed files with 2 additions and 3 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue