[PATCH v3] libxc: fix leak of t_info in xc_tbuf_get_size()

[PATCH v3] libxc: fix leak of t_info in xc_tbuf_get_size()

[Harmandeep Kaur]

Avoid leaking the memory mapping of the trace buffer

Coverity ID 1351228

Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>
---
v2: call to unmapping function reduced to one from two
v3: passed correct argument sysctl.u.tbuf_op.size in 
    xenforeignmemory_unmap()
---
 tools/libxc/xc_tbuf.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/libxc/xc_tbuf.c b/tools/libxc/xc_tbuf.c
index 695939a..283fbd1 100644
--- a/tools/libxc/xc_tbuf.c
+++ b/tools/libxc/xc_tbuf.c
@@ -70,11 +70,13 @@ int xc_tbuf_get_size(xc_interface *xch, unsigned long *size)
                     sysctl.u.tbuf_op.buffer_mfn);
 
     if ( t_info == NULL || t_info->tbuf_size == 0 )
-        return -1;
+        rc = -1;
+    else
+	*size = t_info->tbuf_size;
 
-    *size = t_info->tbuf_size;
+    xenforeignmemory_unmap(xch->fmem, t_info, sysctl.u.tbuf_op.size);
 
-    return 0;
+    return rc;
 }
 
 int xc_tbuf_enable(xc_interface *xch, unsigned long pages, unsigned long *mfn,
-- 
2.5.0

Re: [PATCH v3] libxc: fix leak of t_info in xc_tbuf_get_size()

[Wei Liu]

On Fri, Feb 12, 2016 at 04:38:32PM +0530, Harmandeep Kaur wrote:
> Avoid leaking the memory mapping of the trace buffer
> 
> Coverity ID 1351228
> 
> Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
> Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

Thanks

Re: [PATCH v3] libxc: fix leak of t_info in xc_tbuf_get_size()

[Ian Campbell]

On Fri, 2016-02-12 at 12:34 +0000, Wei Liu wrote:
> On Fri, Feb 12, 2016 at 04:38:32PM +0530, Harmandeep Kaur wrote:
> > Avoid leaking the memory mapping of the trace buffer
> > 
> > Coverity ID 1351228
> > 
> > Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
> > Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>

Applied, thanks.

Ian.