ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhost: fix calling vhost_dev_cleanup() after vhost_dev_init() 

vhost_net_init() calls vhost_dev_init() and in case of failure, calls
vhost_dev_cleanup() directly. However, the structure is already
partially cleaned on error. Calling vhost_dev_cleanup() again will call
vhost_virtqueue_cleanup() on already clean queues, and causing potential
double-close. Instead, adjust dev->nvqs and simplify vhost_dev_init()
code to not call vhost_virtqueue_cleanup() but vhost_dev_cleanup()
instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-27 01:15:04 +04:00 committed by Michael S. Tsirkin
parent f1a0365b68
commit a06db3ec72
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/virtio/vhost.c
View File

@ -1015,7 +1015,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
VhostBackendType backend_type, uint32_t busyloop_timeout) VhostBackendType backend_type, uint32_t busyloop_timeout)
{ {
uint64_t features; uint64_t features;
int i, r; int i, r, n_initialized_vqs = 0;
hdev->migration_blocker = NULL; hdev->migration_blocker = NULL;
@ -1044,10 +1044,10 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
goto fail; goto fail;
} }
for (i = 0; i < hdev->nvqs; ++i) { for (i = 0; i < hdev->nvqs; ++i, ++n_initialized_vqs) {
r = vhost_virtqueue_init(hdev, hdev->vqs + i, hdev->vq_index + i); r = vhost_virtqueue_init(hdev, hdev->vqs + i, hdev->vq_index + i);
if (r < 0) { if (r < 0) {
goto fail_vq; goto fail;
} }
} }
@ -1104,19 +1104,14 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
memory_listener_register(&hdev->memory_listener, &address_space_memory); memory_listener_register(&hdev->memory_listener, &address_space_memory);
QLIST_INSERT_HEAD(&vhost_devices, hdev, entry); QLIST_INSERT_HEAD(&vhost_devices, hdev, entry);
return 0; return 0;
fail_busyloop: fail_busyloop:
while (--i >= 0) { while (--i >= 0) {
vhost_virtqueue_set_busyloop_timeout(hdev, hdev->vq_index + i, 0); vhost_virtqueue_set_busyloop_timeout(hdev, hdev->vq_index + i, 0);
} }
i = hdev->nvqs;
fail_vq:
while (--i >= 0) {
vhost_virtqueue_cleanup(hdev->vqs + i);
}
fail: fail:
r = -errno; hdev->nvqs = n_initialized_vqs;
hdev->vhost_ops->vhost_backend_cleanup(hdev); vhost_dev_cleanup(hdev);
QLIST_REMOVE(hdev, entry);
return r; return r;
} }