From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:34127)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1RSvEb-0003Y4-9E
	for qemu-devel@nongnu.org; Tue, 22 Nov 2011 13:38:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1RSvEa-0007P5-51
	for qemu-devel@nongnu.org; Tue, 22 Nov 2011 13:38:21 -0500
Received: from v220110690675601.yourvserver.net ([78.47.199.172]:48902)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1RSvEZ-0007Nw-U8
	for qemu-devel@nongnu.org; Tue, 22 Nov 2011 13:38:20 -0500
Message-ID: <4ECBEBE8.1000709@weilnetz.de>
Date: Tue, 22 Nov 2011 19:37:28 +0100
From: Stefan Weil <sw@weilnetz.de>
MIME-Version: 1.0
References: <1321978604-4858-1-git-send-email-kwolf@redhat.com>
In-Reply-To: <1321978604-4858-1-git-send-email-kwolf@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] vdi: Fix memory leak
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: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-devel@nongnu.org

Am 22.11.2011 17:16, schrieb Kevin Wolf:
> The block map is allocated in vdi_open, but was never freed.
>
> Signed-off-by: Kevin Wolf<kwolf@redhat.com>
> ---
> Applies on top if the migration blocker series.
>
>   block/vdi.c |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/block/vdi.c b/block/vdi.c
> index 7dda522..02da6b4 100644
> --- a/block/vdi.c
> +++ b/block/vdi.c
> @@ -949,6 +949,9 @@ static int vdi_create(const char *filename, QEMUOptionParameter *options)
>   static void vdi_close(BlockDriverState *bs)
>   {
>       BDRVVdiState *s = bs->opaque;
> +
> +    g_free(s->bmap);
> +
>       migrate_del_blocker(s->migration_blocker);
>       error_free(s->migration_blocker);
>   }

If vdi_close is called after a jump to label fail_free_bmap,
g_free(s->bmap) will be called twice.

Setting s->bmap = NULL after g_free in fail_free_bmap
would be safer.

Otherwise your patch is fine. If you send an update, you
can add

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Regards,
Stefan Weil