[PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()

[PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()

[Andrew Cooper]

# HG changeset patch
# User Andrew Cooper <andrew.cooper3@citrix.com>
# Date 1371832526 -3600
# Node ID cec58839d6eff0ac27de3827af8fc969db554172
# Parent  803ad8977a817263ea826bac1bb68c0dd57fac9c
tools/libxc: Fix memory leaks in xc_domain_restore()

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

---

George: I believe these qualify under #2 for inclusion into 4.3

Ian: These should be backported to 4.2 and 4.1

I will have a patch against xc_domain_save() soon, but it is proving more
difficult and I am not certain I will have time to finish it soon.

diff -r 803ad8977a81 -r cec58839d6ef tools/libxc/xc_domain_restore.c
--- a/tools/libxc/xc_domain_restore.c
+++ b/tools/libxc/xc_domain_restore.c
@@ -2335,6 +2335,9 @@ int xc_domain_restore(xc_interface *xch,
     free(mmu);
     free(ctx->p2m);
     free(pfn_type);
+    free(region_mfn);
+    free(ctx->p2m_batch);
+    pagebuf_free(&pagebuf);
     tailbuf_free(&tailbuf);
 
     /* discard cache for save file  */

Re: [PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()

[Ian Jackson]

Andrew Cooper writes ("[PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()"):
> tools/libxc: Fix memory leaks in xc_domain_restore()

> +    free(region_mfn);
...
> +    pagebuf_free(&pagebuf);

These look correct to me.

But as regards

> +    free(ctx->p2m_batch);

It's not clear to me where that's initialised.  It needs to be
initialised to NULL I think.

Ian.

Re: [PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()

[Andrew Cooper]

On 21/06/13 18:27, Ian Jackson wrote:
> Andrew Cooper writes ("[PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()"):
>> tools/libxc: Fix memory leaks in xc_domain_restore()
>> +    free(region_mfn);
> ...
>> +    pagebuf_free(&pagebuf);
> These look correct to me.
>
> But as regards
>
>> +    free(ctx->p2m_batch);
> It's not clear to me where that's initialised.  It needs to be
> initialised to NULL I think.
>
> Ian.

It is initialised in memset(ctx, 0, sizeof(*ctx)) at the top of the
function.

~Andrew

Re: [PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()

[George Dunlap]

On Fri, Jun 21, 2013 at 5:36 PM, Andrew Cooper
<andrew.cooper3@citrix.com> wrote:
> # HG changeset patch
> # User Andrew Cooper <andrew.cooper3@citrix.com>
> # Date 1371832526 -3600
> # Node ID cec58839d6eff0ac27de3827af8fc969db554172
> # Parent  803ad8977a817263ea826bac1bb68c0dd57fac9c
> tools/libxc: Fix memory leaks in xc_domain_restore()
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> ---
>
> George: I believe these qualify under #2 for inclusion into 4.3

Yes, looks good:

Re the release:

Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

>
> Ian: These should be backported to 4.2 and 4.1
>
> I will have a patch against xc_domain_save() soon, but it is proving more
> difficult and I am not certain I will have time to finish it soon.
>
> diff -r 803ad8977a81 -r cec58839d6ef tools/libxc/xc_domain_restore.c
> --- a/tools/libxc/xc_domain_restore.c
> +++ b/tools/libxc/xc_domain_restore.c
> @@ -2335,6 +2335,9 @@ int xc_domain_restore(xc_interface *xch,
>      free(mmu);
>      free(ctx->p2m);
>      free(pfn_type);
> +    free(region_mfn);
> +    free(ctx->p2m_batch);
> +    pagebuf_free(&pagebuf);
>      tailbuf_free(&tailbuf);
>
>      /* discard cache for save file  */
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH] tools/libxc: Fix memory leaks in xc_domain_restore() [and 1 more messages]

[Ian Jackson]

Andrew Cooper writes ("Re: [PATCH] tools/libxc: Fix memory leaks in xc_domain_restore()"):
> On 21/06/13 18:27, Ian Jackson wrote:
> > It's not clear to me where that's initialised.  It needs to be
> > initialised to NULL I think.
...
> It is initialised in memset(ctx, 0, sizeof(*ctx)) at the top of the
> function.

Oh, yes.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

George Dunlap writes ("Re: [Xen-devel] [PATCH] tools/libxc: Fix memory leaks in> Re the release:
> 
> Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

Thanks, committed.

Ian.