From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHX-0005l2-Na for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyHW-0002vc-PK for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHW-0002vY-Jp for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:14 -0400 Date: Fri, 29 Jul 2016 06:16:10 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-20-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 19/41] vhost-net: always call vhost_dev_cleanup() on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Jason Wang From: Marc-Andr=E9 Lureau vhost_dev_init(), calling vhost backend initialization, should be cleaned up after failure too. Call vhost_dev_cleanup() in all failure cases. First, it needs to zero-alloc the struct to avoid the initial garbage. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/vhost_net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 3677a82..c11f69c 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -140,7 +140,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *opt= ions) { int r; bool backend_kernel =3D options->backend_type =3D=3D VHOST_BACKEND_T= YPE_KERNEL; - struct vhost_net *net =3D g_malloc(sizeof *net); + struct vhost_net *net =3D g_new0(struct vhost_net, 1); uint64_t features =3D 0; =20 if (!options->net_backend) { @@ -185,7 +185,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *opt= ions) fprintf(stderr, "vhost lacks feature mask %" PRIu64 " for backend\n", (uint64_t)(~net->dev.features & net->dev.backend_feat= ures)); - vhost_dev_cleanup(&net->dev); goto fail; } } @@ -197,7 +196,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *opt= ions) fprintf(stderr, "vhost lacks feature mask %" PRIu64 " for backend\n", (uint64_t)(~net->dev.features & features)); - vhost_dev_cleanup(&net->dev); goto fail; } } @@ -205,7 +203,9 @@ struct vhost_net *vhost_net_init(VhostNetOptions *opt= ions) vhost_net_ack_features(net, features); =20 return net; + fail: + vhost_dev_cleanup(&net->dev); g_free(net); return NULL; } --=20 MST