From: Fam Zheng <famz@redhat.com>
Date: Thu, 15 Mar 2018 03:51:57 +0000 (+0800)
Subject: block: Fix leak of ignore_children in error path
X-Git-Tag: qemu-xen-4.12.0-rc1~369^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2c860e797ab2af7393c767cdd9e27aa1eecfc812;p=qemu-xen.git

block: Fix leak of ignore_children in error path

Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block.c b/block.c
index e02d83b027..f7f9d8eca7 100644
--- a/block.c
+++ b/block.c
@@ -3679,12 +3679,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, &local_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) {