From patchwork Tue Jun 21 10:02:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9190189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D65D06075E for ; Tue, 21 Jun 2016 10:15:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C56E328113 for ; Tue, 21 Jun 2016 10:15:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA7402813A; Tue, 21 Jun 2016 10:15:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6171328113 for ; Tue, 21 Jun 2016 10:15:45 +0000 (UTC) Received: from localhost ([::1]:50428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIie-0000ua-I6 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 06:15:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWX-0005Ca-RV for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFIWV-0000JZ-PI for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWV-0000JR-KQ for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:11 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2EB907D0EF; Tue, 21 Jun 2016 10:03:11 +0000 (UTC) Received: from localhost ([10.41.1.246]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5LA3Asp029806; Tue, 21 Jun 2016 06:03:10 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 12:02:41 +0200 Message-Id: <1466503372-28334-14-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1466503372-28334-1-git-send-email-marcandre.lureau@redhat.com> References: <1466503372-28334-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 21 Jun 2016 10:03:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 13/24] vhost-net: always call vhost_dev_cleanup() on failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yuanhan.liu@linux.intel.com, victork@redhat.com, mst@redhat.com, jonshin@cisco.com, mukawa@igel.co.jp, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau vhost_dev_init() may need to be cleaned up on failure too. Just call vhost_dev_cleanup() in all cases. But first zero-alloc the struct to avoid the garbage. Signed-off-by: Marc-André Lureau --- 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 3f1fecc..1da05d0 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -140,7 +140,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) { int r; bool backend_kernel = options->backend_type == VHOST_BACKEND_TYPE_KERNEL; - struct vhost_net *net = g_malloc(sizeof *net); + struct vhost_net *net = g_new0(struct vhost_net, 1); uint64_t features = 0; if (!options->net_backend) { @@ -185,7 +185,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) fprintf(stderr, "vhost lacks feature mask %" PRIu64 " for backend\n", (uint64_t)(~net->dev.features & net->dev.backend_features)); - vhost_dev_cleanup(&net->dev); goto fail; } } @@ -197,7 +196,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) 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 *options) vhost_net_ack_features(net, features); return net; + fail: + vhost_dev_cleanup(&net->dev); g_free(net); return NULL; }