diff options
| author | Gonglei <arei.gonglei@huawei.com> | 2014-11-28 17:26:29 +0800 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-12-01 12:29:35 +0000 |
| commit | b19ca188022d720e6cdf87c43c27cb68bac32f6a (patch) | |
| tree | a25ca2275c555f96376039b23487f0c450732b2f | |
| parent | db12451decf7dfe0f083564183e135f2095228b9 (diff) | |
vhost: Fix vhostfd leak in error branch
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1417166789-1960-1-git-send-email-arei.gonglei@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/scsi/vhost-scsi.c | 1 | ||||
| -rw-r--r-- | hw/virtio/vhost.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 308b393f96..dcb2bc5a6e 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -233,6 +233,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp) vhost_dummy_handle_output); if (err != NULL) { error_propagate(errp, err); + close(vhostfd); return; } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 5d7c40ac04..5a128613bb 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -817,10 +817,12 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque, int i, r; if (vhost_set_backend_type(hdev, backend_type) < 0) { + close((uintptr_t)opaque); return -1; } if (hdev->vhost_ops->vhost_backend_init(hdev, opaque) < 0) { + close((uintptr_t)opaque); return -errno; } |