From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53716)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <chenliang88@huawei.com>) id 1Wriz6-00028Z-PW
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 03:18:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <chenliang88@huawei.com>) id 1Wriz1-0003g4-Vw
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 03:18:12 -0400
Message-ID: <538D768D.5050904@huawei.com>
Date: Tue, 3 Jun 2014 15:17:33 +0800
From: ChenLiang <chenliang88@huawei.com>
MIME-Version: 1.0
References: <538C6B37.2030400@gmail.com>
In-Reply-To: <538C6B37.2030400@gmail.com>
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH-trivial] arch_init.c: Free 'cache' in
 cache_fini() to avoid 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: Chen Gang <gang.chen.5i5j@gmail.com>
Cc: quintela@redhat.com, QEMU Trivial <qemu-trivial@nongnu.org>, Michael Tokarev <mjt@tls.msk.ru>, dgilbert@redhat.com, QEMU Developers <qemu-devel@nongnu.org>, owasserm@redhat.com, arei.gonglei@huawei.com

On 2014/6/2 20:16, Chen Gang wrote:

> Call g_free() after cache_fini() in migration_end(), but do not call
> g_free() after call cache_fini() in xbzrle_cache_resize() which will
> cause memory leak.
> 
> cache_init() and cache_fini() are pair, so need let cache_fini() call
> g_free(cache) to match cache_init(), then fix current issue too.
> 
> 
> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
> ---
>  arch_init.c  | 1 -
>  page_cache.c | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch_init.c b/arch_init.c
> index 9f1a174..23044c1 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -739,7 +739,6 @@ static void migration_end(void)
>      XBZRLE_cache_lock();
>      if (XBZRLE.cache) {
>          cache_fini(XBZRLE.cache);
> -        g_free(XBZRLE.cache);
>          g_free(XBZRLE.encoded_buf);
>          g_free(XBZRLE.current_buf);
>          XBZRLE.cache = NULL;
> diff --git a/page_cache.c b/page_cache.c
> index b033681..89bb1ec 100644
> --- a/page_cache.c
> +++ b/page_cache.c
> @@ -109,6 +109,7 @@ void cache_fini(PageCache *cache)
>  
>      g_free(cache->page_cache);
>      cache->page_cache = NULL;
> +    g_free(cache);
>  }
>  
>  static size_t cache_get_cache_pos(const PageCache *cache,


Reviewed-by: ChenLiang <chenliang88@huawei.com>