Re: [Qemu-devel] [PATCH] block: Fix leak of ignore_children in error path

2018-03-15 Thread Kevin Wolf
Am 15.03.2018 um 04:51 hat Fam Zheng geschrieben:
> Reported-by: Max Reitz 
> Signed-off-by: Fam Zheng 

Thanks, applied to the block branch.

Kevin



Re: [Qemu-devel] [PATCH] block: Fix leak of ignore_children in error path

2018-03-15 Thread Eric Blake

On 03/14/2018 10:51 PM, Fam Zheng wrote:

Reported-by: Max Reitz 
Signed-off-by: Fam Zheng 
---
  block.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)


Reviewed-by: Eric Blake 



diff --git a/block.c b/block.c
index 75a9fd49de..c1fda9fd57 100644
--- a/block.c
+++ b/block.c
@@ -3671,12 +3671,12 @@ int bdrv_drop_intermediate(BlockDriverState *top, 
BlockDriverState *base,
  GSList *ignore_children = g_slist_prepend(NULL, c);
  bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm,
 ignore_children, _err);
+g_slist_free(ignore_children);
  if (local_err) {
  ret = -EPERM;
  error_report_err(local_err);
  goto exit;
  }
-g_slist_free(ignore_children);
  
  /* If so, update the backing file path in the image file */

  if (c->role->update_filename) {



--
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3266
Virtualization:  qemu.org | libvirt.org



[Qemu-devel] [PATCH] block: Fix leak of ignore_children in error path

2018-03-14 Thread Fam Zheng
Reported-by: Max Reitz 
Signed-off-by: Fam Zheng 
---
 block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block.c b/block.c
index 75a9fd49de..c1fda9fd57 100644
--- a/block.c
+++ b/block.c
@@ -3671,12 +3671,12 @@ int bdrv_drop_intermediate(BlockDriverState *top, 
BlockDriverState *base,
 GSList *ignore_children = g_slist_prepend(NULL, c);
 bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm,
ignore_children, _err);
+g_slist_free(ignore_children);
 if (local_err) {
 ret = -EPERM;
 error_report_err(local_err);
 goto exit;
 }
-g_slist_free(ignore_children);
 
 /* If so, update the backing file path in the image file */
 if (c->role->update_filename) {
-- 
2.14.3