From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com,
qemu-devel@nongnu.org, mreitz@redhat.com
Subject: [PATCH 2/2] block: Fix Transaction leak in bdrv_reopen_multiple()
Date: Mon, 3 May 2021 13:05:55 +0200 [thread overview]
Message-ID: <20210503110555.24001-3-kwolf@redhat.com> (raw)
In-Reply-To: <20210503110555.24001-1-kwolf@redhat.com>
Like other error paths, this one needs to call tran_finalize() and clean
up the BlockReopenQueue, too.
Fixes: CID 1452772
Fixes: 72373e40fbc7e4218061a8211384db362d3e7348
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 5c0ced6238..69615fabd1 100644
--- a/block.c
+++ b/block.c
@@ -4052,7 +4052,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)
ret = bdrv_flush(bs_entry->state.bs);
if (ret < 0) {
error_setg_errno(errp, -ret, "Error flushing drive");
- goto cleanup;
+ goto abort;
}
}
--
2.30.2
next prev parent reply other threads:[~2021-05-03 11:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 11:05 [PATCH 0/2] block: Fix Transaction leaks Kevin Wolf
2021-05-03 11:05 ` [PATCH 1/2] block: Fix Transaction leak in bdrv_root_attach_child() Kevin Wolf
2021-05-03 11:43 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:49 ` Max Reitz
2021-05-03 11:51 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:53 ` Max Reitz
2021-05-03 12:14 ` Vladimir Sementsov-Ogievskiy
2021-05-03 12:31 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:05 ` Kevin Wolf [this message]
2021-05-03 11:40 ` [PATCH 2/2] block: Fix Transaction leak in bdrv_reopen_multiple() Vladimir Sementsov-Ogievskiy
2021-05-03 12:41 ` Kevin Wolf
2021-05-03 13:09 ` Vladimir Sementsov-Ogievskiy
2021-05-03 14:33 ` Kevin Wolf
2021-05-04 6:52 ` Vladimir Sementsov-Ogievskiy
2021-05-04 6:51 ` Vladimir Sementsov-Ogievskiy
2021-05-04 6:56 ` [PATCH 0/2] block: Fix Transaction leaks Vladimir Sementsov-Ogievskiy
2021-05-05 10:25 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503110555.24001-3-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).