mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
Revert "vhost: block speculation of translated descriptors"
This reverts commit a89db445fb
.
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: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
060423bfde
commit
0d4a3f2abb
1 changed files with 2 additions and 4 deletions
|
@ -2071,10 +2071,8 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len,
|
||||||
_iov = iov + ret;
|
_iov = iov + ret;
|
||||||
size = node->size - addr + node->start;
|
size = node->size - addr + node->start;
|
||||||
_iov->iov_len = min((u64)len - s, size);
|
_iov->iov_len = min((u64)len - s, size);
|
||||||
_iov->iov_base = (void __user *)
|
_iov->iov_base = (void __user *)(unsigned long)
|
||||||
((unsigned long)node->userspace_addr +
|
(node->userspace_addr + addr - node->start);
|
||||||
array_index_nospec((unsigned long)(addr - node->start),
|
|
||||||
node->size));
|
|
||||||
s += size;
|
s += size;
|
||||||
addr += size;
|
addr += size;
|
||||||
++ret;
|
++ret;
|
||||||
|
|
Loading…
Reference in a new issue