tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio fix from Michael Tsirkin:
"A last minute revert

The 32-bit build got broken by the latest defence in depth patch.
Revert and we'll try again in the next cycle"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
Revert "vhost: block speculation of translated descriptors"

Linus Torvalds 1f9c632c b03c036e

+2 -4
+2 -4
drivers/vhost/vhost.c
··· 2071 2071 _iov = iov + ret; 2072 2072 size = node->size - addr + node->start; 2073 2073 _iov->iov_len = min((u64)len - s, size); 2074 - _iov->iov_base = (void __user *) 2075 - ((unsigned long)node->userspace_addr + 2076 - array_index_nospec((unsigned long)(addr - node->start), 2077 - node->size)); 2074 + _iov->iov_base = (void __user *)(unsigned long) 2075 + (node->userspace_addr + addr - node->start); 2078 2076 s += size; 2079 2077 addr += size; 2080 2078 ++ret;