block: fix bdrv_root_attach_child forget to unref child_bs

[PATCH for 5.0] block: fix bdrv_root_attach_child forget to unref child_bs

Vladimir Sementsov-Ogievskiy posted 1 patch 4 years, 1 month ago

Download mbox

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Test checkpatch passed

Test FreeBSD passed

Test asan passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200324155921.23822-1-vsementsov@virtuozzo.com

Maintainers: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>

block.c | 1 +
1 file changed, 1 insertion(+)

Expand all Fold all

[PATCH for 5.0] block: fix bdrv_root_attach_child forget to unref child_bs

Posted by Vladimir Sementsov-Ogievskiy 4 years, 1 month ago

bdrv_root_attach_child promises to drop child_bs reference on failure.
It does it on first handled failure path, but not on the second. Fix
that.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block.c b/block.c
index a2542c977b..6713db773d 100644
--- a/block.c
+++ b/block.c
@@ -2612,6 +2612,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
             error_propagate(errp, local_err);
             g_free(child);
             bdrv_abort_perm_update(child_bs);
+            bdrv_unref(child_bs);
             return NULL;
         }
     }
-- 
2.21.0

Re: [PATCH for 5.0] block: fix bdrv_root_attach_child forget to unref child_bs

Posted by Kevin Wolf 4 years, 1 month ago

Am 24.03.2020 um 16:59 hat Vladimir Sementsov-Ogievskiy geschrieben:
> bdrv_root_attach_child promises to drop child_bs reference on failure.
> It does it on first handled failure path, but not on the second. Fix
> that.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Thanks, applied to the block branch.

Kevin