From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9oH-000098-SA for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:58:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQ9oF-0007Od-Um for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:58:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9oF-0007OX-PP for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:58:23 -0400 From: marcandre.lureau@redhat.com Date: Thu, 21 Jul 2016 12:57:28 +0400 Message-Id: <20160721085750.30008-10-marcandre.lureau@redhat.com> In-Reply-To: <20160721085750.30008-1-marcandre.lureau@redhat.com> References: <20160721085750.30008-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 09/31] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mukawa@igel.co.jp, yuanhan.liu@linux.intel.com, victork@redhat.com, jonshin@cisco.com, mst@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau vhost_net_init() calls vhost_dev_init() and in case of failure, calls vhost_dev_cleanup() directly. However, the structure is already partially cleaned on error. Calling vhost_dev_cleanup() again will call vhost_virtqueue_cleanup() on already clean queues, and causing potential double-close. Instead, adjust dev->nvqs and simplify vhost_dev_init() code to not call vhost_virtqueue_cleanup() but vhost_dev_cleanup() instead. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/vhost.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 9400b47..c61302a 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1047,7 +1047,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *op= aque, for (i =3D 0; i < hdev->nvqs; ++i) { r =3D vhost_virtqueue_init(hdev, hdev->vqs + i, hdev->vq_index += i); if (r < 0) { - goto fail_vq; + hdev->nvqs =3D i; + goto fail; } } =20 @@ -1104,19 +1105,13 @@ int vhost_dev_init(struct vhost_dev *hdev, void *= opaque, memory_listener_register(&hdev->memory_listener, &address_space_memo= ry); QLIST_INSERT_HEAD(&vhost_devices, hdev, entry); return 0; + fail_busyloop: while (--i >=3D 0) { vhost_virtqueue_set_busyloop_timeout(hdev, hdev->vq_index + i, 0= ); } - i =3D hdev->nvqs; -fail_vq: - while (--i >=3D 0) { - vhost_virtqueue_cleanup(hdev->vqs + i); - } fail: - r =3D -errno; - hdev->vhost_ops->vhost_backend_cleanup(hdev); - QLIST_REMOVE(hdev, entry); + vhost_dev_cleanup(hdev); return r; } =20 --=20 2.9.0