From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-block@nongnu.org,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Max Reitz" <mreitz@redhat.com>
Subject: [PATCH 2/4] block/vvfat: Fix leak of BDRVVVFATState::used_clusters
Date: Fri, 30 Apr 2021 18:25:17 +0200 [thread overview]
Message-ID: <20210430162519.271607-3-philmd@redhat.com> (raw)
In-Reply-To: <20210430162519.271607-1-philmd@redhat.com>
used_clusters is allocated in enable_write_target(), called by
vvfat_open(), but never free'd.
Allocate it using GLib API, and free it in vvfat_close().
This fixes (QEMU built with --enable-sanitizers):
Direct leak of 64508 byte(s) in 1 object(s) allocated from:
#0 0x55d7a36378f7 in calloc (qemu-system-x86_64+0x1dab8f7)
#1 0x55d7a5e14246 in enable_write_target block/vvfat.c:3145:24
#2 0x55d7a5e123aa in vvfat_open block/vvfat.c:1236:19
#3 0x55d7a5a5363f in bdrv_open_driver block.c:1526:15
#4 0x55d7a5a9d369 in bdrv_open_common block.c:1802:11
#5 0x55d7a5a609f1 in bdrv_open_inherit block.c:3444:11
#6 0x55d7a5a65411 in bdrv_open_child_bs block.c:3079:10
#7 0x55d7a5a60079 in bdrv_open_inherit block.c:3391:19
#8 0x55d7a5a65da3 in bdrv_open block.c:3537:12
#9 0x55d7a5b33f6a in blk_new_open block/block-backend.c:421:10
#10 0x55d7a5a0a33e in blockdev_init blockdev.c:610:15
#11 0x55d7a5a088e7 in drive_new blockdev.c:994:11
#12 0x55d7a51b10c4 in drive_init_func softmmu/vl.c:636:12
#13 0x55d7a620e148 in qemu_opts_foreach util/qemu-option.c:1167:14
#14 0x55d7a51b0e20 in configure_blockdev softmmu/vl.c:695:9
#15 0x55d7a51a70b5 in qemu_create_early_backends softmmu/vl.c:1895:5
#16 0x55d7a519bf87 in qemu_init softmmu/vl.c:3551:5
#17 0x55d7a366f619 in main softmmu/main.c:49:5
Fixes: a046433a161 ("Major overhaul of the virtual FAT driver for read/write support")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/vvfat.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 5a4a7915220..2cc21787600 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3142,7 +3142,7 @@ static int enable_write_target(BlockDriverState *bs, Error **errp)
int size = sector2cluster(s, s->sector_count);
QDict *options;
- s->used_clusters = calloc(size, 1);
+ s->used_clusters = g_malloc0(size);
array_init(&(s->commits), sizeof(commit_t));
@@ -3233,6 +3233,7 @@ static void vvfat_close(BlockDriverState *bs)
array_free(&(s->directory));
array_free(&(s->mapping));
g_free(s->cluster_buffer);
+ g_free(s->used_clusters);
g_free(s->qcow_filename);
if (s->qcow) {
--
2.26.3
next prev parent reply other threads:[~2021-04-30 16:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 16:25 [PATCH 0/4] block/vvfat: Fix leaks and out of bounds writes Philippe Mathieu-Daudé
2021-04-30 16:25 ` [PATCH 1/4] block/vvfat: Fix leak of BDRVVVFATState::qcow_filename Philippe Mathieu-Daudé
2021-05-03 13:14 ` Stefano Garzarella
2021-04-30 16:25 ` Philippe Mathieu-Daudé [this message]
2021-05-03 13:24 ` [PATCH 2/4] block/vvfat: Fix leak of BDRVVVFATState::used_clusters Stefano Garzarella
2021-04-30 16:25 ` [PATCH 3/4] block/vvfat: Fix leak of mapping_t::path Philippe Mathieu-Daudé
2021-05-07 16:17 ` Max Reitz
2021-04-30 16:25 ` [PATCH 4/4] block/vvfat: Avoid out of bounds write in create_long_filename() Philippe Mathieu-Daudé
2021-05-05 13:46 ` Eric Blake
2021-05-05 13:11 ` [PATCH 0/4] block/vvfat: Fix leaks and out of bounds writes Johannes Schindelin
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=20210430162519.271607-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=johannes.schindelin@gmx.de \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--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).