[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/10] vhost-vsock: fix double close() in the realize() error path
From: |
Michael S. Tsirkin |
Subject: |
[PULL 10/10] vhost-vsock: fix double close() in the realize() error path |
Date: |
Tue, 31 Mar 2020 10:57:24 -0400 |
From: Stefano Garzarella <address@hidden>
vhost_dev_cleanup() closes the vhostfd parameter passed to
vhost_dev_init(), so this patch avoids closing it twice in
the vhost_vsock_device_realize() error path.
Signed-off-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
hw/virtio/vhost-vsock.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c
index 9f9093e196..09b6b07f94 100644
--- a/hw/virtio/vhost-vsock.c
+++ b/hw/virtio/vhost-vsock.c
@@ -364,12 +364,16 @@ static void vhost_vsock_device_realize(DeviceState *dev,
Error **errp)
err_vhost_dev:
vhost_dev_cleanup(&vsock->vhost_dev);
+ /* vhost_dev_cleanup() closes the vhostfd passed to vhost_dev_init() */
+ vhostfd = -1;
err_virtio:
virtio_delete_queue(vsock->recv_vq);
virtio_delete_queue(vsock->trans_vq);
virtio_delete_queue(vsock->event_vq);
virtio_cleanup(vdev);
- close(vhostfd);
+ if (vhostfd >= 0) {
+ close(vhostfd);
+ }
return;
}
--
MST
- [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers, Michael S. Tsirkin, 2020/03/31
- [PULL 01/10] checkpatch: enforce process for expected files, Michael S. Tsirkin, 2020/03/31
- [PULL 02/10] MAINTAINERS: Add myself as virtio-balloon co-maintainer, Michael S. Tsirkin, 2020/03/31
- [PULL 03/10] virtio-serial-bus: Plug memory leak on realize() error paths, Michael S. Tsirkin, 2020/03/31
- [PULL 04/10] acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot(), Michael S. Tsirkin, 2020/03/31
- [PULL 06/10] virtio-iommu: avoid memleak in the unrealize, Michael S. Tsirkin, 2020/03/31
- [PULL 08/10] fix vhost_user_blk_watch crash, Michael S. Tsirkin, 2020/03/31
- [PULL 07/10] hw/i386/amd_iommu.c: Fix corruption of log events passed to guest, Michael S. Tsirkin, 2020/03/31
- [PULL 10/10] vhost-vsock: fix double close() in the realize() error path,
Michael S. Tsirkin <=
- [PULL 05/10] virtio-blk: delete vqs on the error path in realize(), Michael S. Tsirkin, 2020/03/31
- [PULL 09/10] acpi: add acpi=OnOffAuto machine property to x86 and arm virt, Michael S. Tsirkin, 2020/03/31
- Re: [PULL 00/10] virtio, pci, pc: bugfixes, checkpatch, maintainers, Peter Maydell, 2020/03/31