Commit b101880b authored Nov 09, 2022 by Stefano Garzarella Committed by zhaoxiaoqiang11 Aug 14, 2023

vringh: fix range used in iotlb_translate()

stable inclusion
from stable-v5.10.163
commit 264fb6dcbfde48e0686158dcebde89598685ba01
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7PJ9N

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=264fb6dcbfde48e0686158dcebde89598685ba01



----------------------------------------------------

[ Upstream commit f85efa9b ]

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: 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>
Signed-off-by: zhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>

parent c2c378b6

drivers/vhost/vringh.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1077,7 +1077,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;

		while (len > s) {
		u64 size, pa, pfn;
		@@ -1087,8 +1087,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;