From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com,
vsementsov@virtuozzo.com,
Peter Maydell <peter.maydell@linaro.org>
Subject: [PATCH 2/6] block: bdrv_reopen_multiple(): fix leak of tran object
Date: Mon, 3 May 2021 14:33:58 +0300 [thread overview]
Message-ID: <20210503113402.185852-3-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210503113402.185852-1-vsementsov@virtuozzo.com>
We have one path, where tran object is created, but we don't touch and
don't free it in any way: "goto cleanup" in first loop with calls to
bdrv_flush().
Fix it simply moving tran_new() call below that loop.
Reported-by: Coverity (CID 1452772)
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: 72373e40fbc7e4218061a8211384db362d3e7348
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 728aa34b2f..c4023ab4f4 100644
--- a/block.c
+++ b/block.c
@@ -4047,7 +4047,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)
{
int ret = -1;
BlockReopenQueueEntry *bs_entry, *next;
- Transaction *tran = tran_new();
+ Transaction *tran;
g_autoptr(GHashTable) found = NULL;
g_autoptr(GSList) refresh_list = NULL;
@@ -4061,6 +4061,8 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)
}
}
+ tran = tran_new();
+
QTAILQ_FOREACH(bs_entry, bs_queue, entry) {
assert(bs_entry->state.bs->quiesce_counter > 0);
ret = bdrv_reopen_prepare(&bs_entry->state, bs_queue, tran, errp);
--
2.29.2
next prev parent reply other threads:[~2021-05-03 11:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 11:33 [PATCH 0/6] block permission updated follow-up Vladimir Sementsov-Ogievskiy
2021-05-03 11:33 ` [PATCH 1/6] block: fix leak of tran in bdrv_root_attach_child Vladimir Sementsov-Ogievskiy
2021-05-03 15:51 ` Alberto Garcia
2021-05-04 6:56 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:33 ` Vladimir Sementsov-Ogievskiy [this message]
2021-05-03 15:52 ` [PATCH 2/6] block: bdrv_reopen_multiple(): fix leak of tran object Alberto Garcia
2021-05-04 6:57 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:33 ` [PATCH 3/6] block-backend: improve blk_root_get_parent_desc() Vladimir Sementsov-Ogievskiy
2021-05-03 15:54 ` Alberto Garcia
2021-05-03 11:34 ` [PATCH 4/6] block: improve bdrv_child_get_parent_desc() Vladimir Sementsov-Ogievskiy
2021-05-03 11:48 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:34 ` [PATCH 5/6] block: simplify bdrv_child_user_desc() Vladimir Sementsov-Ogievskiy
2021-05-03 16:05 ` Alberto Garcia
2021-05-04 6:57 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:34 ` [PATCH 6/6] block: improve permission conflict error message Vladimir Sementsov-Ogievskiy
2021-05-03 12:28 ` [PATCH 7/6] block: document child argument of bdrv_attach_child_common() Vladimir Sementsov-Ogievskiy
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=20210503113402.185852-3-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).