| Message ID | 20210329150129.121182-3-sgarzare@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block/rbd: fix memory leaks | expand |
Stefano Garzarella <sgarzare@redhat.com> writes: > 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> > --- > 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"); Reviewed-by: Markus Armbruster <armbru@redhat.com>
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");
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> --- block/rbd.c | 1 + 1 file changed, 1 insertion(+)