diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2021-05-03 13:05:54 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-05-18 11:08:13 +0200 |
| commit | e878bb1293d2cd0082550b320c3ccf245d0a69d4 (patch) | |
| tree | 63b198f443afdcb7da527d1508836f50f5ee8a31 /block.c | |
| parent | 38b440964736a5fca2c95606ce3efaa35381fa9d (diff) | |
| download | focaccia-qemu-e878bb1293d2cd0082550b320c3ccf245d0a69d4.tar.gz focaccia-qemu-e878bb1293d2cd0082550b320c3ccf245d0a69d4.zip | |
block: Fix Transaction leak in bdrv_root_attach_child()
The error path needs to call tran_finalize(), too. Fixes: CID 1452773 Fixes: 548a74c0dbc858edd1a7ee3045b5f2fe710bd8b1 Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20210503110555.24001-2-kwolf@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block.c b/block.c index 75a82af641..6dbe9af2cd 100644 --- a/block.c +++ b/block.c @@ -2916,13 +2916,14 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, child_role, perm, shared_perm, opaque, &child, tran, errp); if (ret < 0) { - bdrv_unref(child_bs); - return NULL; + assert(child == NULL); + goto out; } ret = bdrv_refresh_perms(child_bs, errp); - tran_finalize(tran, ret); +out: + tran_finalize(tran, ret); bdrv_unref(child_bs); return child; } |