-----Original Message----- From: Daniel Veillard [mailto:veillard@redhat.com] Sent: Thursday, September 26, 2013 4:42 PM To: Chen Hanxiao Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] [PATCH]LXC: free dst before lxcDomainAttachDeviceDiskLive return On Thu, Sep 26, 2013 at 02:01:52PM +0800, Chen Hanxiao wrote: > From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com&gt; > > free dst before lxcDomainAttachDeviceDiskLive return > > Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com&gt; > virDomainAuditDisk(vm, NULL, def->src, "attach", ret == 0); > if (dst && created && ret < 0) > unlink(dst); > + VIR_FREE(dst); > return ret; > } Hum, it is a bit complex as the allocated dst is saved in the definition a few lines earlier: /* Labelling normally operates on src, but we need * to actally label the dst here, so hack the config */ def->src = dst; and then in cleanup it's overriden again with the value saved at the start of the function: cleanup: def->src = tmpsrc; virDomainAuditDisk(vm, NULL, def->src, "attach", ret == 0); the leak is real and that free certainly need to be added but maybe there is a bit of cleanup needed rather than just adding the VIR_FREE()

I will let someone with more knowledge of that code part decide :-)

Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

On 09/26/2013 08:01 AM, Chen Hanxiao wrote: > From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com&gt; > > free dst before lxcDomainAttachDeviceDiskLive return > > Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com&gt; > --- > src/lxc/lxc_driver.c | 1 + > 1 file changed, 1 insertion(+) ACK and pushed. Jan -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list