From 361a18f405faefde1038ac20167995adbefa7f06 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 14 Jun 2021 17:14:13 +0200 Subject: [PATCH] virStorageBackendRBDGetVolNames: Fix memory leak in 'rbd_list2' version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'rbd_image_spec_t' struct has two string members 'id' and 'name'. We only stole the 'name' members thus the 'id's as well as the whole list would be leaked on success. Restructure the code so that we copy out the image names and call rbd_image_spec_list_cleanup on success rather than on error. The error path is then handled by using g_autofree for 'images'. Since we no longer have a error path after allocating the returned string list we can completely remove its cleanup. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/storage/storage_backend_rbd.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ce3ab11dd6..371ebfaf1b 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -579,9 +579,8 @@ static char ** virStorageBackendRBDGetVolNames(virStorageBackendRBDState *ptr) { char **names = NULL; - size_t nnames = 0; int rc; - rbd_image_spec_t *images = NULL; + g_autofree rbd_image_spec_t *images = NULL; size_t nimages = 16; size_t i; @@ -593,23 +592,18 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDState *ptr) break; if (rc != -ERANGE) { virReportSystemError(errno, "%s", _("Unable to list RBD images")); - goto error; + return NULL; } } names = g_new0(char *, nimages + 1); - nnames = nimages; for (i = 0; i < nimages; i++) - names[i] = g_steal_pointer(&images[i].name); + names[i] = g_strdup(images[i].name); + + rbd_image_spec_list_cleanup(images, nimages); return names; - - error: - virStringListFreeCount(names, nnames); - rbd_image_spec_list_cleanup(images, nimages); - VIR_FREE(images); - return NULL; } #else /* ! WITH_RBD_LIST2 */