diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-28 20:58:52 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-28 20:58:52 +0100 |
commit | d06c942efea40e1701ade200477a7449008d9f24 (patch) | |
tree | d29aeabd61322207c3b289cbb2f131e4579f2028 /net | |
parent | Merge tag 'x86-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | vdpa_sim: avoid putting an uninitialized iova_domain (diff) | |
download | linux-d06c942efea40e1701ade200477a7449008d9f24.tar.xz linux-d06c942efea40e1701ade200477a7449008d9f24.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull vhost,virtio,vdpa bugfixes from Michael Tsirkin:
"Misc fixes all over the place.
Revert of virtio used length validation series: the approach taken
does not seem to work, breaking too many guests in the process. We'll
need to do length validation using some other approach"
[ This merge also ends up reverting commit f7a36b03a732 ("vsock/virtio:
suppress used length validation"), which came in through the
networking tree in the meantime, and was part of that whole used
length validation series - Linus ]
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vdpa_sim: avoid putting an uninitialized iova_domain
vhost-vdpa: clean irqs before reseting vdpa device
virtio-blk: modify the value type of num in virtio_queue_rq()
vhost/vsock: cleanup removing `len` variable
vhost/vsock: fix incorrect used length reported to the guest
Revert "virtio_ring: validate used buffer length"
Revert "virtio-net: don't let virtio core to validate used length"
Revert "virtio-blk: don't let virtio core to validate used length"
Revert "virtio-scsi: don't let virtio core to validate used buffer length"
Diffstat (limited to 'net')
-rw-r--r-- | net/vmw_vsock/virtio_transport.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 3f82b2f1e6dd..4f7c99dfd16c 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -731,7 +731,6 @@ static unsigned int features[] = { static struct virtio_driver virtio_vsock_driver = { .feature_table = features, .feature_table_size = ARRAY_SIZE(features), - .suppress_used_validation = true, .driver.name = KBUILD_MODNAME, .driver.owner = THIS_MODULE, .id_table = id_table, |