From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35251)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1XvJ9c-00086b-Fr
	for qemu-devel@nongnu.org; Mon, 01 Dec 2014 00:04:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1XvJ9X-0004k4-LW
	for qemu-devel@nongnu.org; Mon, 01 Dec 2014 00:04:08 -0500
Received: from mx1.redhat.com ([209.132.183.28]:56525)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1XvJ9X-0004jx-EX
	for qemu-devel@nongnu.org; Mon, 01 Dec 2014 00:04:03 -0500
Date: Mon, 01 Dec 2014 05:11:29 +0008
From: Jason Wang <jasowang@redhat.com>
Message-Id: <1417410209.4969.0@smtp.corp.redhat.com>
In-Reply-To: <1417166789-1960-1-git-send-email-arei.gonglei@huawei.com>
References: <1417166789-1960-1-git-send-email-arei.gonglei@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Subject: Re: [Qemu-devel] [PATCH] vhost: Fix vhostfd leak in error branch
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: arei.gonglei@huawei.com
Cc: pbonzini@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, peter.huangpeng@huawei.com



On Fri, Nov 28, 2014 at 5:26 PM, arei.gonglei@huawei.com wrote:
> From: Gonglei <arei.gonglei@huawei.com>
> 
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
>  hw/scsi/vhost-scsi.c | 1 +
>  hw/virtio/vhost.c    | 2 ++
>  2 files changed, 3 insertions(+)
> 
> diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
> index 308b393..dcb2bc5 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 5d7c40a..5a12861 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;
>      }
>  

Patch looks fine.

I wonder whether setting errno and goto fail would be better here?
This will let vhost_backend_cleanup() to do the cleanup, e.g closeing
fd or purging queue (for vhost uesr).