TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vringh: fix range used in iotlb_translate()

Browse Source 
[ Upstream commit f85efa9b0f ]

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:
Stefano Garzarella
2022-11-09 11:25:02 +01:00
committed by Greg Kroah-Hartman
parent eabb3ceb04
commit 264fb6dcbf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/vhost/vringh.c
+2 -3
View File
@@ -1077,7 +1077,7 @@ static int iotlb_translate(const struct vringh *vrh,
struct vhost_iotlb_map *map; struct vhost_iotlb_map *map;
struct vhost_iotlb *iotlb = vrh->iotlb; struct vhost_iotlb *iotlb = vrh->iotlb;
int ret = 0; int ret = 0;
u64 s = 0; u64 s = 0, last = addr + len - 1;
while (len > s) { while (len > s) {
u64 size, pa, pfn; u64 size, pa, pfn;
@@ -1087,8 +1087,7 @@ static int iotlb_translate(const struct vringh *vrh,
break; break;
} }
map = vhost_iotlb_itree_first(iotlb, addr, map = vhost_iotlb_itree_first(iotlb, addr, last);
addr + len - 1);
if (!map || map->start > addr) { if (!map || map->start > addr) {
ret = -EINVAL; ret = -EINVAL;
break; break;