Commit b19ca188 authored by Gonglei's avatar Gonglei Committed by Peter Maydell
Browse files

vhost: Fix vhostfd leak in error branch 



Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-id: 1417166789-1960-1-git-send-email-arei.gonglei@huawei.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent db12451d

hw/scsi/vhost-scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }

hw/virtio/vhost.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }