From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:54400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLP2V-0002AH-2a for qemu-devel@nongnu.org; Tue, 30 Apr 2019 05:27:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLP2U-0003OV-1i for qemu-devel@nongnu.org; Tue, 30 Apr 2019 05:27:03 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:2062 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLP2T-0003MU-Ns for qemu-devel@nongnu.org; Tue, 30 Apr 2019 05:27:02 -0400 From: Jie Wang Date: Tue, 30 Apr 2019 15:15:00 +0800 Message-ID: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] vhost: fix memory leak in vhost_user_scsi_realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, wangjie88@huawei.com, wu.wubin@huawei.com fix memory leak in vhost_user_scsi_realize Signed-off-by: Jie Wang --- hw/scsi/vhost-user-scsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 8b1e6876db..a9fd8ea305 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -69,6 +69,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev); VHostUserSCSI *s = VHOST_USER_SCSI(dev); VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s); + struct vhost_virtqueue *vqs = NULL; Error *err = NULL; int ret; @@ -93,6 +94,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs); vsc->dev.vq_index = 0; vsc->dev.backend_features = 0; + vqs = vsc->dev.vqs; ret = vhost_dev_init(&vsc->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0); @@ -100,6 +102,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s", strerror(-ret)); vhost_user_cleanup(&s->vhost_user); + g_free(vqs); return; } -- 2.16.2.windows.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C95E7C43219 for ; Tue, 30 Apr 2019 09:28:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 989C820835 for ; Tue, 30 Apr 2019 09:28:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 989C820835 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:42099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLP3l-0002mJ-RR for qemu-devel@archiver.kernel.org; Tue, 30 Apr 2019 05:28:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLP2V-0002AH-2a for qemu-devel@nongnu.org; Tue, 30 Apr 2019 05:27:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLP2U-0003OV-1i for qemu-devel@nongnu.org; Tue, 30 Apr 2019 05:27:03 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:2062 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLP2T-0003MU-Ns for qemu-devel@nongnu.org; Tue, 30 Apr 2019 05:27:02 -0400 Received: from DGGEML402-HUB.china.huawei.com (unknown [172.30.72.55]) by Forcepoint Email with ESMTP id 79E759F0EBA8A7623BB4; Tue, 30 Apr 2019 17:26:57 +0800 (CST) Received: from localhost.localdomain (10.175.104.211) by DGGEML402-HUB.china.huawei.com (10.3.17.38) with Microsoft SMTP Server id 14.3.439.0; Tue, 30 Apr 2019 17:26:48 +0800 From: Jie Wang To: Date: Tue, 30 Apr 2019 15:15:00 +0800 Message-ID: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Originating-IP: [10.175.104.211] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.189 Subject: [Qemu-devel] [PATCH] vhost: fix memory leak in vhost_user_scsi_realize 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: wangjie88@huawei.com, wu.wubin@huawei.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190430071500.Moo4oUiCpUOxKOwlSK3PAItqEmHqt3xzXziSDvBB_UE@z> fix memory leak in vhost_user_scsi_realize Signed-off-by: Jie Wang --- hw/scsi/vhost-user-scsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 8b1e6876db..a9fd8ea305 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -69,6 +69,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev); VHostUserSCSI *s = VHOST_USER_SCSI(dev); VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s); + struct vhost_virtqueue *vqs = NULL; Error *err = NULL; int ret; @@ -93,6 +94,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs); vsc->dev.vq_index = 0; vsc->dev.backend_features = 0; + vqs = vsc->dev.vqs; ret = vhost_dev_init(&vsc->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0); @@ -100,6 +102,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s", strerror(-ret)); vhost_user_cleanup(&s->vhost_user); + g_free(vqs); return; } -- 2.16.2.windows.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 970B6C28CC0 for ; Wed, 29 May 2019 16:42:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FB1523DFC for ; Wed, 29 May 2019 16:42:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FB1523DFC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:57865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hW1ex-0004Ot-Nj for qemu-devel@archiver.kernel.org; Wed, 29 May 2019 12:42:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hW1a6-0000Bz-Jt for qemu-devel@nongnu.org; Wed, 29 May 2019 12:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hW1a5-0002uJ-MY for qemu-devel@nongnu.org; Wed, 29 May 2019 12:37:38 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:44298) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hW1a5-0002tz-IX for qemu-devel@nongnu.org; Wed, 29 May 2019 12:37:37 -0400 Received: by mail-qt1-f182.google.com with SMTP id m2so3358247qtp.11 for ; Wed, 29 May 2019 09:37:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=oWUawf31eMQD6ACHrKCfMWf9y12ShHT6G47Hktpyv9Q=; b=FO7ngOtVL8ZztA43D88g9kpqTmOMPZIzmD0wDy6w1jJdQJQgeVmr6lbAVi2//VXoks JqPFBzWmc6su20kLZFN1cOi8NwASEI9s633Ro+Rtz8aHfltcYV8RtGgvpQ5MpLwGQCtW 936Pvy5r59NoPEYIw7H1zFC+mxHYUr1jQ6/CyrRN0MfqGpEC+sR+fgLTp5CsFkgvd1JS 8lfjQMCwKaxNDuW919lE9FXK7Z3TNfWgT8bnE6mT59D3jDZMcKVF0nwYFddKJ7Jb9OGb /YVWsF5rlV8uyy/4IOMdDDCDEz/Y+/DqOIfRaFMClfVVTUK70YDmurU5OKrnPZuUgeMU GtsA== X-Gm-Message-State: APjAAAUr0P9GXZoBcOpzKzaP7bOlQpwJqLB2zpdeCGCSEMd4bqgTLF4S 7+LY48cuwRsiMrL3WLdTGRUbK1M4TnU= X-Google-Smtp-Source: APXvYqwKGiEmCOovN367gIQaWKlj38MpHm6b6G8uYqL8ztgDatB/JGNARa/JMW35eljR2eBkAW4ebQ== X-Received: by 2002:a0c:af51:: with SMTP id j17mr77292207qvc.34.1559147856882; Wed, 29 May 2019 09:37:36 -0700 (PDT) Received: from redhat.com (pool-100-0-197-103.bstnma.fios.verizon.net. [100.0.197.103]) by smtp.gmail.com with ESMTPSA id q9sm4810735qtr.83.2019.05.29.09.37.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 29 May 2019 09:37:36 -0700 (PDT) Date: Wed, 29 May 2019 12:37:34 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> References: <20190529163604.18560-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190529163604.18560-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.182 Subject: [Qemu-devel] [PULL 10/10] vhost: fix memory leak in vhost_user_scsi_realize 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: Fam Zheng , Peter Maydell , Paolo Bonzini , Stefan Hajnoczi , Jie Wang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190529163734.7pgtJGs0VXYqZaVpUNnTVWxvURGpe4A7PttFrUcghMc@z> From: Jie Wang fix memory leak in vhost_user_scsi_realize Signed-off-by: Jie Wang Message-Id: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- hw/scsi/vhost-user-scsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 8b1e6876db..a9fd8ea305 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -69,6 +69,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev); VHostUserSCSI *s = VHOST_USER_SCSI(dev); VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s); + struct vhost_virtqueue *vqs = NULL; Error *err = NULL; int ret; @@ -93,6 +94,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs); vsc->dev.vq_index = 0; vsc->dev.backend_features = 0; + vqs = vsc->dev.vqs; ret = vhost_dev_init(&vsc->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0); @@ -100,6 +102,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s", strerror(-ret)); vhost_user_cleanup(&s->vhost_user); + g_free(vqs); return; } -- MST From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 680F7C04AB5 for ; Mon, 3 Jun 2019 18:14:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43354262CF for ; Mon, 3 Jun 2019 18:14:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43354262CF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:39014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXrU0-0006V2-FE for qemu-devel@archiver.kernel.org; Mon, 03 Jun 2019 14:14:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXrOJ-00028m-Sj for qemu-devel@nongnu.org; Mon, 03 Jun 2019 14:09:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXrOI-0000as-PM for qemu-devel@nongnu.org; Mon, 03 Jun 2019 14:09:03 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:40613) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hXrOI-0000TL-KS for qemu-devel@nongnu.org; Mon, 03 Jun 2019 14:09:02 -0400 Received: by mail-qt1-f170.google.com with SMTP id a15so10512418qtn.7 for ; Mon, 03 Jun 2019 11:09:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=oWUawf31eMQD6ACHrKCfMWf9y12ShHT6G47Hktpyv9Q=; b=fFgQ+5AltzSkzKaZ/Nyd6OxFjBF62Vr6SvSRWqAz+wzYCk0GcgBArVsE+0Mq8qW+go wnJOBWYghbWUvmA9tO/5e9XdGg023GuE8wGRHhz9m1I8ovA6a8udF72n5xkkJCtJdbh2 okm/TzGJ0iWdTm2EujK8WIkLCXvRQC0fqxBV+OB3bd7/bKrFTEg8K1mkK0/pzTEStmTP gWjXTFae9k+I/MuoBgcNEoGZoEZMxseqK2km7El2XOfriPpEk6dXzP+WawTclyI6bZTQ fqmKpKZI2E27H+uBKKoCnFqkFta+lK/J1IuANgabH06WclsozKbhyT8m6W1exio/Ls+J VQCw== X-Gm-Message-State: APjAAAXLTe6kQeKNHJNC+lPJwBGz42yApIgGp7ZMHOftf3kFLAyq5Bog 8FdsK10K6ZcZcUP5Syojr67YxacTf2Q= X-Google-Smtp-Source: APXvYqz0bOHR6h2RsuWFntDlUtlZjEXvnU9S+ZoYUXMLCVMdjKbw7GfgybQlSGVouclS5jdXdAa0ww== X-Received: by 2002:aed:22b2:: with SMTP id p47mr23821980qtc.228.1559585339380; Mon, 03 Jun 2019 11:08:59 -0700 (PDT) Received: from redhat.com (pool-100-0-197-103.bstnma.fios.verizon.net. [100.0.197.103]) by smtp.gmail.com with ESMTPSA id u2sm7901934qtq.45.2019.06.03.11.08.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 03 Jun 2019 11:08:58 -0700 (PDT) Date: Mon, 3 Jun 2019 14:08:57 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> References: <20190603180807.16140-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190603180807.16140-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.170 Subject: [Qemu-devel] [PULL v2 09/14] vhost: fix memory leak in vhost_user_scsi_realize 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: Fam Zheng , Peter Maydell , Paolo Bonzini , Stefan Hajnoczi , Jie Wang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190603180857.pcIqx6CeOZXaTWZLDzBrPoEObyddDgaqcR3SljsNqpc@z> From: Jie Wang fix memory leak in vhost_user_scsi_realize Signed-off-by: Jie Wang Message-Id: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- hw/scsi/vhost-user-scsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 8b1e6876db..a9fd8ea305 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -69,6 +69,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev); VHostUserSCSI *s = VHOST_USER_SCSI(dev); VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s); + struct vhost_virtqueue *vqs = NULL; Error *err = NULL; int ret; @@ -93,6 +94,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs); vsc->dev.vq_index = 0; vsc->dev.backend_features = 0; + vqs = vsc->dev.vqs; ret = vhost_dev_init(&vsc->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0); @@ -100,6 +102,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s", strerror(-ret)); vhost_user_cleanup(&s->vhost_user); + g_free(vqs); return; } -- MST From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AD8AC28CC5 for ; Wed, 5 Jun 2019 20:07:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 790DF206BB for ; Wed, 5 Jun 2019 20:07:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 790DF206BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:49153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYcBw-00086H-OZ for qemu-devel@archiver.kernel.org; Wed, 05 Jun 2019 16:07:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYc5P-00034E-2H for qemu-devel@nongnu.org; Wed, 05 Jun 2019 16:00:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYc5K-0005YF-HA for qemu-devel@nongnu.org; Wed, 05 Jun 2019 16:00:38 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:38984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYc5K-0005S6-8Y for qemu-devel@nongnu.org; Wed, 05 Jun 2019 16:00:34 -0400 Received: by mail-qk1-f177.google.com with SMTP id i125so14544qkd.6 for ; Wed, 05 Jun 2019 13:00:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=oWUawf31eMQD6ACHrKCfMWf9y12ShHT6G47Hktpyv9Q=; b=q5llxD4egr0h949w0XzpdmTG20Wk69qKCDK8z56JuBeMmx0lwbo/9nF2kt8eJXwpDX eAhNFTfyEDE/uoCAdGAbRREFl3VONGJxbSYiEExfNV9sTpHrt+5ug0RRn3MnPhelYV2Q DWcaRzDoC/szW3AbTWTC/6U5K+rq2sEEnAdX0QidpbaOCVBqmaX4gIPeuZruASDqnuPJ 2oTaVlhom5R1l02Iu0rxbMBe2/i4pW8zVDJ4SpNf17nDCFGzFYvXtfFHKkxS0dsyyhFZ SrCx4f28Zu+nMqyXHrgK6MokNo5GjJ4BsYID3/aHueGafBU0qvPQUEeSnQCzRUE5hm23 Syqg== X-Gm-Message-State: APjAAAUAFYooT4bridVwEXzBtDmGLJatEfW99oBlzUNsCI4RgEqK8L+a Ibop0SGe0EuigHCRAKfqAQkn3y9imsg= X-Google-Smtp-Source: APXvYqy5gBBDtyELR+odhBlxh6XC34KxFSvbHoFD4dB1BFp2UlRz3v+AWendTGyfjGJ2PvB/hV9u9Q== X-Received: by 2002:a37:4152:: with SMTP id o79mr6863827qka.276.1559764830950; Wed, 05 Jun 2019 13:00:30 -0700 (PDT) Received: from redhat.com (pool-100-0-197-103.bstnma.fios.verizon.net. [100.0.197.103]) by smtp.gmail.com with ESMTPSA id k6sm1280188qkd.21.2019.06.05.13.00.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 05 Jun 2019 13:00:30 -0700 (PDT) Date: Wed, 5 Jun 2019 16:00:29 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> References: <20190605195913.12243-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190605195913.12243-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.222.177 Subject: [Qemu-devel] [PULL v3 09/17] vhost: fix memory leak in vhost_user_scsi_realize 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: Fam Zheng , Peter Maydell , Paolo Bonzini , Stefan Hajnoczi , Jie Wang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190605200029.ibDij7PYTENvvxP7gbNrzsES26G3x7c9NI772HArG8E@z> From: Jie Wang fix memory leak in vhost_user_scsi_realize Signed-off-by: Jie Wang Message-Id: <1556608500-12183-1-git-send-email-wangjie88@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- hw/scsi/vhost-user-scsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 8b1e6876db..a9fd8ea305 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -69,6 +69,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev); VHostUserSCSI *s = VHOST_USER_SCSI(dev); VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s); + struct vhost_virtqueue *vqs = NULL; Error *err = NULL; int ret; @@ -93,6 +94,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs); vsc->dev.vq_index = 0; vsc->dev.backend_features = 0; + vqs = vsc->dev.vqs; ret = vhost_dev_init(&vsc->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0); @@ -100,6 +102,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s", strerror(-ret)); vhost_user_cleanup(&s->vhost_user); + g_free(vqs); return; } -- MST