From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvKSb-0001Pf-Hv for qemu-devel@nongnu.org; Mon, 01 Dec 2014 01:27:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvKSW-0002PU-MV for qemu-devel@nongnu.org; Mon, 01 Dec 2014 01:27:49 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:52378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvKSW-0002Is-3S for qemu-devel@nongnu.org; Mon, 01 Dec 2014 01:27:44 -0500 Message-ID: <547C0A3E.9070106@huawei.com> Date: Mon, 1 Dec 2014 14:27:10 +0800 From: Gonglei MIME-Version: 1.0 References: <1417166789-1960-1-git-send-email-arei.gonglei@huawei.com> <1417410209.4969.0@smtp.corp.redhat.com> In-Reply-To: <1417410209.4969.0@smtp.corp.redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] vhost: Fix vhostfd leak in error branch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: "pbonzini@redhat.com" , "mst@redhat.com" , "qemu-devel@nongnu.org" , "Huangpeng (Peter)" On 2014/12/1 13:03, Jason Wang wrote: > > > On Fri, Nov 28, 2014 at 5:26 PM, arei.gonglei@huawei.com wrote: >> From: Gonglei >> >> Signed-off-by: Gonglei >> --- >> 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). > Hi, Jason Actually, vhost_backend_init() can not fail for both vhost-usr and vhost-backend-type-kernel at present. Besides, vhost-usr' s vhost_backend_cleanup() just set dev->opaque to 0, don't purge queues. Regards, -Gonglei