From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41196)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1YY357-0000gL-So
	for qemu-devel@nongnu.org; Tue, 17 Mar 2015 21:47:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1YY356-0008Qt-Oe
	for qemu-devel@nongnu.org; Tue, 17 Mar 2015 21:47:37 -0400
Date: Wed, 18 Mar 2015 09:47:33 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20150318014733.GJ15098@ad.nay.redhat.com>
References: <1426671732-80213-1-git-send-email-subo7@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1426671732-80213-1-git-send-email-subo7@huawei.com>
Subject: Re: [Qemu-devel] [PATCH] virtio-scsi-dataplane: fix memory leak in
 virtio_scsi_vring_init
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Bo Su <subo7@huawei.com>
Cc: qemu-devel@nongnu.org, qemu-stable@nongnu.org

On Wed, 03/18 09:42, Bo Su wrote:
> if k->set_host_notifier failed, VirtIOSCSIVring *r will leak
> 
> Signed-off-by: Bo Su <subo7@huawei.com>
> ---
>  hw/scsi/virtio-scsi-dataplane.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
> index 3f40ff0..c069cd7 100644
> --- a/hw/scsi/virtio-scsi-dataplane.c
> +++ b/hw/scsi/virtio-scsi-dataplane.c
> @@ -45,7 +45,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s,
>  {
>      BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(s)));
>      VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> -    VirtIOSCSIVring *r = g_slice_new(VirtIOSCSIVring);
> +    VirtIOSCSIVring *r;
>      int rc;
>  
>      /* Set up virtqueue notify */
> @@ -56,6 +56,8 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s,
>          s->dataplane_fenced = true;
>          return NULL;
>      }
> +
> +    r = g_slice_new(VirtIOSCSIVring);
>      r->host_notifier = *virtio_queue_get_host_notifier(vq);
>      r->guest_notifier = *virtio_queue_get_guest_notifier(vq);
>      aio_set_event_notifier(s->ctx, &r->host_notifier, handler);
> -- 
> 1.8.5
> 
> 

Reviewed-by: Fam Zheng <famz@redhat.com>