qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 02/10] block/rbd: fix memory leak in qemu_rbd_co_create_opts()
Date: Fri,  9 Apr 2021 18:15:40 +0200	[thread overview]
Message-ID: <20210409161548.341297-3-kwolf@redhat.com> (raw)
In-Reply-To: <20210409161548.341297-1-kwolf@redhat.com>

From: Stefano Garzarella <sgarzare@redhat.com>

When we allocate 'q_namespace', we forgot to set 'has_q_namespace'
to true. This can cause several issues, including a memory leak,
since qapi_free_BlockdevCreateOptions() does not deallocate that
memory, as reported by valgrind:

  13 bytes in 1 blocks are definitely lost in loss record 7 of 96
     at 0x4839809: malloc (vg_replace_malloc.c:307)
     by 0x48CEBB8: g_malloc (in /usr/lib64/libglib-2.0.so.0.6600.8)
     by 0x48E3FE3: g_strdup (in /usr/lib64/libglib-2.0.so.0.6600.8)
     by 0x180010: qemu_rbd_co_create_opts (rbd.c:446)
     by 0x1AE72C: bdrv_create_co_entry (block.c:492)
     by 0x241902: coroutine_trampoline (coroutine-ucontext.c:173)
     by 0x57530AF: ??? (in /usr/lib64/libc-2.32.so)
     by 0x1FFEFFFA6F: ???

Fix setting 'has_q_namespace' to true when we allocate 'q_namespace'.

Fixes: 19ae9ae014 ("block/rbd: Add support for ceph namespaces")
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20210329150129.121182-3-sgarzare@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/rbd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block/rbd.c b/block/rbd.c
index 24cefcd0dc..f098a89c7b 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -444,6 +444,7 @@ static int coroutine_fn qemu_rbd_co_create_opts(BlockDriver *drv,
     loc->user        = g_strdup(qdict_get_try_str(options, "user"));
     loc->has_user    = !!loc->user;
     loc->q_namespace = g_strdup(qdict_get_try_str(options, "namespace"));
+    loc->has_q_namespace = !!loc->q_namespace;
     loc->image       = g_strdup(qdict_get_try_str(options, "image"));
     keypairs         = qdict_get_try_str(options, "=keyvalue-pairs");
 
-- 
2.30.2



  parent reply	other threads:[~2021-04-09 16:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-09 16:15 [PULL 00/10] Block layer fixes for 6.0-rc3 Kevin Wolf
2021-04-09 16:15 ` [PULL 01/10] block/rbd: fix memory leak in qemu_rbd_connect() Kevin Wolf
2021-04-09 16:15 ` Kevin Wolf [this message]
2021-04-09 16:15 ` [PULL 03/10] iotests/qsd-jobs: Filter events in the first test Kevin Wolf
2021-04-09 16:15 ` [PULL 04/10] iotests: add test for removing persistent bitmap from backing file Kevin Wolf
2021-04-09 16:15 ` [PULL 05/10] iotests: Test mirror-top filter permissions Kevin Wolf
2021-04-09 16:15 ` [PULL 06/10] hw/block/fdc: Fix 'fallback' property on sysbus floppy disk controllers Kevin Wolf
2021-04-09 16:15 ` [PULL 07/10] mirror: Move open_backing_file to exit_common Kevin Wolf
2021-04-09 16:15 ` [PULL 08/10] mirror: Do not enter a paused job on completion Kevin Wolf
2021-04-09 16:15 ` [PULL 09/10] job: Allow complete for jobs on standby Kevin Wolf
2021-04-09 16:15 ` [PULL 10/10] test-blockjob: Test job_wait_unpaused() Kevin Wolf
2021-04-10 15:58 ` [PULL 00/10] Block layer fixes for 6.0-rc3 Peter Maydell

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=20210409161548.341297-3-kwolf@redhat.com \
    --to=kwolf@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).