Commit 0d4a3f2a authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Revert "vhost: block speculation of translated descriptors" 



This reverts commit a89db445.

I was hasty to include this patch, and it breaks the build on 32 bit.
Defence in depth is good but let's do it properly.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 060423bf

drivers/vhost/vhost.c

+2 −4
Original line number Diff line number Diff line
@@ -2071,10 +2071,8 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len, 
		_iov = iov + ret;

		size = node->size - addr + node->start;

		_iov->iov_len = min((u64)len - s, size);

		_iov->iov_base = (void __user *)

			((unsigned long)node->userspace_addr +

			 array_index_nospec((unsigned long)(addr - node->start),

					    node->size));

		_iov->iov_base = (void __user *)(unsigned long)

			(node->userspace_addr + addr - node->start);

		s += size;

		addr += size;

		++ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE